diff --git a/admin-dev/themes/template/access/form.tpl b/admin-dev/themes/template/access/form.tpl
index 26bc551bc..2cd8b54d0 100644
--- a/admin-dev/themes/template/access/form.tpl
+++ b/admin-dev/themes/template/access/form.tpl
@@ -382,7 +382,7 @@
 				<div class="clear">&nbsp;</div>
 
 			{else}
-				{l s="Administrator permissions can't be modified."}
+				{l s='Administrator permissions can\'t be modified.'}
 			{/if}
 
 		</div>
diff --git a/admin-dev/themes/template/accounting_export/common_form.tpl b/admin-dev/themes/template/accounting_export/common_form.tpl
index 28324e4ee..25cab2def 100644
--- a/admin-dev/themes/template/accounting_export/common_form.tpl
+++ b/admin-dev/themes/template/accounting_export/common_form.tpl
@@ -41,11 +41,11 @@
 <label for="beginDate">{l s='Begin to:'}</label>
 <div class="margin-form">
 	<input class="datepicker" id="beginDate_{$type}" type="text" name="beginDate" value="{$begin_date}" />
-	<span class="input-error">{l s="The date has not the right format"}</span>
+	<span class="input-error">{l s='The date has not the right format'}</span>
 </div>
 
 <label for="endDate">{l s='End to:'}</label>
 <div class="margin-form">
 	<input class="datepicker" id="endDate_{$type}" type="text" name="endDate" value="{$end_date}" />
-	<span class="input-error">{l s="The date has not the right format"}</span>
+	<span class="input-error">{l s='The date has not the right format'}</span>
 </div>
diff --git a/admin-dev/themes/template/attachments/list_action_delete.tpl b/admin-dev/themes/template/attachments/list_action_delete.tpl
index 22aa1348f..76d283cbc 100644
--- a/admin-dev/themes/template/attachments/list_action_delete.tpl
+++ b/admin-dev/themes/template/attachments/list_action_delete.tpl
@@ -26,8 +26,9 @@
 <script>
 	function confirmProductAttached(productList)
 	{
+		var confirm_text = {l s='This attachment is used by the following products:'}
 		if (confirm('{$confirm}'))
-			return confirm('{l s="This attachment is used by the following products:"}' + {$product_list[$id]});
+			return confirm(confirm_text + {$product_list[$id]});
 		return false;
 	}
 </script>
diff --git a/admin-dev/themes/template/groups/form.tpl b/admin-dev/themes/template/groups/form.tpl
index 93c8958a7..26164315e 100644
--- a/admin-dev/themes/template/groups/form.tpl
+++ b/admin-dev/themes/template/groups/form.tpl
@@ -72,13 +72,13 @@
 			{
 				$(elt).addClass('unselect_all').removeClass('select_all');
 				$('ul#sortable_module_'+$(elt).attr('id')).find('input[type="checkbox"]').removeAttr('checked');
-				$(elt).html('{l s="Select all"}');
+				$(elt).html('{l s='Select all'}');
 			}
 			else
 			{
 				$(elt).addClass('select_all').removeClass('unselect_all');
 				$('ul#sortable_module_'+$(elt).attr('id')).find('input[type="checkbox"]').attr('checked', 'checked');
-				$(elt).html('{l s="Unselect all"}');
+				$(elt).html('{l s='Unselect all'}');
 			}
 		}
 		
@@ -258,12 +258,12 @@
 				<tfoot>
 					<tr>
 						<td style="text-align:center">
-							<button style="width:100%;margin-top:5px" id="authorize_list" onclick="toogleCheck(this);return false;" class="button">{l s="Select all"}</button>
-							<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="authorizeChecked();return false;" class="button">{l s="<< Unauthorize"}</button>
+							<button style="width:100%;margin-top:5px" id="authorize_list" onclick="toogleCheck(this);return false;" class="button">{l s='Select all'}</button>
+							<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="authorizeChecked();return false;" class="button">{l s='<< Unauthorize'}</button>
 						</td>
 						<td style="text-align:center">
-							<button style="width:100%;margin-top:5px"id="unauthorize_list" onclick="toogleCheck(this);return false;" class="button">{l s="Select all"}</button>
-							<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="unauthorizeChecked();return false;" class="button">{l s="<< Authorize"}</button>
+							<button style="width:100%;margin-top:5px"id="unauthorize_list" onclick="toogleCheck(this);return false;" class="button">{l s='Select all'}</button>
+							<button style="width:100%;margin-top:5px;margin-bottom:5px" onclick="unauthorizeChecked();return false;" class="button">{l s='<< Authorize'}</button>
 						</td>
 					</tr>
 				</tfoot>
diff --git a/admin-dev/themes/template/import/form.tpl b/admin-dev/themes/template/import/form.tpl
index 7c1ac1c71..71a57eb4e 100644
--- a/admin-dev/themes/template/import/form.tpl
+++ b/admin-dev/themes/template/import/form.tpl
@@ -60,7 +60,7 @@
 		$('#preview_import').submit(function() {
 			if ($('#truncate').get(0).checked)
 			{
-				if (confirm('{l s="Are you sure you want to delete"}' + ' ' + $('#entity > option:selected').text().toLowerCase() + '{l s="?"}'))
+				if (confirm('{l s='Are you sure you want to delete'}' + ' ' + $('#entity > option:selected').text().toLowerCase() + '{l s='?'}'))
 				{
 					this.submit();
 				}
diff --git a/admin-dev/themes/template/products/quantities.tpl b/admin-dev/themes/template/products/quantities.tpl
index c8a3b4c60..36c6b0e86 100644
--- a/admin-dev/themes/template/products/quantities.tpl
+++ b/admin-dev/themes/template/products/quantities.tpl
@@ -123,7 +123,7 @@
 		data.ajax = 1;
 		data.controller = "AdminProducts";
 		data.action = "productQuantity";
-		showAjaxMsg('{l s="Saving data..."}');
+		showAjaxMsg('{l s='Saving data...'}');
 		$.ajax({
 			type: "POST",
 			url: "ajax-tab.php",
@@ -134,14 +134,14 @@
 			{
 				if (msg.error)
 				{
-					showAjaxError('{l s="Error durring saving data"}');
+					showAjaxError('{l s='Error durring saving data'}');
 					return;
 				}
-				showAjaxSuccess('{l s="Data saved"}');
+				showAjaxSuccess('{l s='Data saved'}');
 			},
 			error: function(msg)
 			{
-				showAjaxError('{l s="Error durring saving data"}');
+				showAjaxError('{l s='Error durring saving data'}');
 			}
 		});
 	};
diff --git a/admin-dev/themes/template/supply_orders/form.tpl b/admin-dev/themes/template/supply_orders/form.tpl
index 47ad3e100..c63733fe2 100644
--- a/admin-dev/themes/template/supply_orders/form.tpl
+++ b/admin-dev/themes/template/supply_orders/form.tpl
@@ -150,7 +150,7 @@
 				'<td class="center"><input type="text" name="input_discount_rate_'+product_infos.id+'" value="0" size="5" />%</td>'+
 				'<td class="center"><input type="text" name="input_tax_rate_'+product_infos.id+'" value="0" size="5" />%</td>'+
 				'<td class="center"><a href="#" class="removeProductFromSupplyOrderLink" id="deletelink|'+product_infos.id+'">'+
-				'<img src="../img/admin/delete.gif" alt="{l s="Remove this product from the order"}" title="{l s="Remove this product from the order"}" />'+
+				'<img src="../img/admin/delete.gif" alt="{l s='Remove this product from the order'}" title="{l s='Remove this product from the order'}" />'+
 				'</a></td></tr>'
 			);
 
diff --git a/modules/sendtoafriend/sendtoafriend-extra.tpl b/modules/sendtoafriend/sendtoafriend-extra.tpl
index bb67d131e..c0dc5565b 100644
--- a/modules/sendtoafriend/sendtoafriend-extra.tpl
+++ b/modules/sendtoafriend/sendtoafriend-extra.tpl
@@ -58,7 +58,8 @@ $('document').ready(function(){
 		else
 		{
 			$('#send_friend_form_error').show();
-			$('#send_friend_form_error').text('{/literal}{l s="You did not fill required fields" mod=sendtoafriend}{literal}');
+			var error_text = {/literal}{l s='You did not fill required fields' mod=sendtoafriend}{literal}
+			$('#send_friend_form_error').text(error_text);
 		}
 	});
 });
diff --git a/modules/tntcarrier/tpl/shippingNumber.tpl b/modules/tntcarrier/tpl/shippingNumber.tpl
index 01ed53d5e..2ebd485a8 100644
--- a/modules/tntcarrier/tpl/shippingNumber.tpl
+++ b/modules/tntcarrier/tpl/shippingNumber.tpl
@@ -37,7 +37,7 @@
 			{/if}
 			{/foreach}
 			</div>
-			{$var.lang_sticker} : <a style="color:blue" href="{$var.sticker}">{l s="PDF File"}</a><br/>
+			{$var.lang_sticker} : <a style="color:blue" href="{$var.sticker}">{l s='PDF File'}</a><br/>
 			{$var.lang_expedition} : {$var.date}<br/>{$var.place}
 			{/if}
 </fieldset>
\ No newline at end of file
diff --git a/themes/prestashop/order-carrier.tpl b/themes/prestashop/order-carrier.tpl
index c9b234b2c..7689e93c3 100644
--- a/themes/prestashop/order-carrier.tpl
+++ b/themes/prestashop/order-carrier.tpl
@@ -140,13 +140,13 @@
 								<td>
 								{if $option.is_best_grade}
 									{if $option.is_best_price}
-									<div class="delivery_option_best delivery_option_icon">{l s="The best price and grade"}</div>
+									<div class="delivery_option_best delivery_option_icon">{l s='The best price and grade'}</div>
 									{else}
-									<div class="delivery_option_fast delivery_option_icon">{l s="The faster"}</div>
+									<div class="delivery_option_fast delivery_option_icon">{l s='The faster'}</div>
 									{/if}
 								{else}
 									{if $option.is_best_price}
-									<div class="delivery_option_best_price delivery_option_icon">{l s="The best price"}</div>
+									<div class="delivery_option_best_price delivery_option_icon">{l s='The best price'}</div>
 									{/if}
 								{/if}
 								</td>