From 9ba17d642a724311c0c0c8a6c16a2213e7defb71 Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Tue, 30 Jul 2013 09:30:41 +0000
Subject: [PATCH 1/2] // CarrierWizard: English Strings reviewed and corrected

---
 .../carrier_wizard/helpers/form/form.tpl      |  4 +--
 .../controllers/carrier_wizard/summary.tpl    |  2 +-
 .../admin/AdminCarrierWizardController.php    | 32 +++++++++----------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
index eea8649a9..75af355e4 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
@@ -24,8 +24,8 @@
 *}
 {extends file="helpers/form/form.tpl"}
 {block name="script"}
-	var string_price = '{l s="Will be applied when the price will be:" js=1}';
-	var string_weight = '{l s="Will be applied when the weight will be:" js=1}';
+	var string_price = '{l s="Will be applied when the price is" js=1}';
+	var string_weight = '{l s="Will be applied when the weight is" js=1}';
 {/block}
 
 {block name="field"}
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
index 42cfd89af..4bc5317d8 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
@@ -26,7 +26,7 @@
 <script type="text/javascript">
 	var summary_translation_undefined = '{l s='[undefined]' js='1'}';
 	
-	var summary_translation_meta_informations = '{l s='This carrier is @s1 and display to the customers the following delay: @s2.' js='1'}';
+	var summary_translation_meta_informations = '{l s='This carrier is @s1 and the displayed delivery time is: @s2.' js=1}';
 	var summary_translation_free = '<strong>{l s='free' js='1'}</strong>';
 	var summary_translation_paid = '<strong>{l s='paid' js='1'}</strong>';
 	
diff --git a/controllers/admin/AdminCarrierWizardController.php b/controllers/admin/AdminCarrierWizardController.php
index 9081acad2..dab1dc4ce 100644
--- a/controllers/admin/AdminCarrierWizardController.php
+++ b/controllers/admin/AdminCarrierWizardController.php
@@ -61,20 +61,20 @@ class AdminCarrierWizardControllerCore extends AdminController
 			'name' => 'carrier_wizard',
 			'steps' => array(
 				array(
-					'title' => $this->l('General'),
-					'desc' => $this->l('General'),
+					'title' => $this->l('General settings'),
+					'desc' => $this->l('General settings'),
 				),
 				array(
-					'title' => $this->l('Where and how much ?'),
-					'desc' => $this->l('Where and how much ?'),
+					'title' => $this->l('Shipping locations and costs'),
+					'desc' => $this->l('Shipping locations and costs'),
 				),
 				array(
-					'title' => $this->l('What and to who ?'),
-					'desc' => $this->l('What and to who ?'),
+                    'title' => $this->l('Size, weight, and group access'),
+					'desc' => $this->l('Size, weight, and group access'),
 				),
 				array(
-					'title' => $this->l('Resume'),
-					'desc' => $this->l('Resume'),
+					'title' => $this->l('Summary'),
+					'desc' => $this->l('Summary'),
 				),
 
 			));
@@ -159,7 +159,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 				'input' => array(
 					array(
 						'type' => 'text',
-						'label' => $this->l('Company:'),
+						'label' => $this->l('Carrier name:'),
 						'name' => 'name',
 						'size' => 25,
 						'required' => true,
@@ -181,7 +181,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 					),
 					array(
 						'type' => 'text',
-						'label' => $this->l('Speed Grade:'),
+						'label' => $this->l('Speed grade:'),
 						'name' => 'grade',
 						'required' => false,
 						'size' => 1,
@@ -189,7 +189,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 					),
 					array(
 						'type' => 'text',
-						'label' => $this->l('URL:'),
+						'label' => $this->l('Tracking URL:'),
 						'name' => 'url',
 						'size' => 40,
 						'desc' => $this->l('Delivery tracking URL: Type \'@\' where the tracking number should appear. It will then be automatically replaced by the tracking number.')
@@ -381,7 +381,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 							'id' => 'id',
 							'name' => 'name'
 						),
-						'desc' => $this->l('Out-of-range behavior occurs when none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
+						'desc' => $this->l('Out-of-range behavior occurs when no defined range matches the customer\'s cart (e.g. when the weight of the cart is greater than the highest weight limit defined by the weight ranges)')
 					),
 					array(
 						'type' => 'text',
@@ -389,7 +389,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 						'name' => 'max_height',
 						'required' => false,
 						'size' => 10,
-						'desc' => $this->l('Maximum height managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
+						'desc' => $this->l('Maximum height managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
 					),
 					array(
 						'type' => 'text',
@@ -397,7 +397,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 						'name' => 'max_width',
 						'required' => false,
 						'size' => 10,
-						'desc' => $this->l('Maximum width managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
+						'desc' => $this->l('Maximum width managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
 					),
 					array(
 						'type' => 'text',
@@ -405,7 +405,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 						'name' => 'max_depth',
 						'required' => false,
 						'size' => 10,
-						'desc' => $this->l('Maximum depth managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
+						'desc' => $this->l('Maximum depth managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
 					),
 					array(
 						'type' => 'text',
@@ -413,7 +413,7 @@ class AdminCarrierWizardControllerCore extends AdminController
 						'name' => 'max_weight',
 						'required' => false,
 						'size' => 10,
-						'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
+						'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0", or leave this field blank to ignore.')
 					),
 					array(
 						'type' => 'group',

From cba79bdcd61aff0ab53fab9589795aedfcf3b71b Mon Sep 17 00:00:00 2001
From: djfm <fm.de.jouvencel@gmail.com>
Date: Tue, 30 Jul 2013 09:47:02 +0000
Subject: [PATCH 2/2] // corrected quote problems in the translation files

---
 .../carrier_wizard/helpers/form/form.tpl           |  6 +++---
 .../carrier_wizard/helpers/form/form_ranges.tpl    |  4 ++--
 .../carrier_wizard/helpers/view/view.tpl           |  4 ++--
 .../template/controllers/carrier_wizard/logo.tpl   |  2 +-
 .../controllers/carrier_wizard/summary.tpl         | 14 +++++++-------
 .../default/template/controllers/products/pack.tpl |  4 ++--
 themes/live_edit.tpl                               |  2 +-
 7 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
index 75af355e4..fe581278d 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
@@ -24,15 +24,15 @@
 *}
 {extends file="helpers/form/form.tpl"}
 {block name="script"}
-	var string_price = '{l s="Will be applied when the price is" js=1}';
-	var string_weight = '{l s="Will be applied when the weight is" js=1}';
+	var string_price = '{l s='Will be applied when the price is' js=1}';
+	var string_weight = '{l s='Will be applied when the weight is' js=1}';
 {/block}
 
 {block name="field"}
 	{if $input.name == 'zones'}
 		{include file='controllers/carrier_wizard/helpers/form/form_ranges.tpl'}
 		<div class="new_range">
-			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s="Add new range"}<img src="../img/admin/add.gif"/></a>
+			<a href="#" onclick="add_new_range();return false;" class="button" id="add_new_range">{l s='Add new range'}<img src="../img/admin/add.gif"/></a>
 		</div>
 	{/if}
 	{$smarty.block.parent}
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
index bbb20176f..3810a3809 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
@@ -29,7 +29,7 @@
 					{foreachelse}
 						<td class="center border_top border_bottom">
 							<input style="display:none" type="text" />
-							<button class="button">{l s="Validate"}</button>
+							<button class="button">{l s='Validate'}</button>
 						</td>
 					{/foreach}
 				</tr>
@@ -49,7 +49,7 @@
 						{if $smarty.foreach.ranges.first}
 							<td class="center">&nbsp;</td>
 						{else}
-							<td class="center"><button class="button">{l s="Delete"}</button</td>
+							<td class="center"><button class="button">{l s='Delete'}</button</td>
 						{/if}
 					{/foreach}
 				</tr>
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
index 0be09cf90..aea0be3e4 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/view/view.tpl
@@ -29,8 +29,8 @@
 	var labelNext = '{$labels.next|addslashes}';
 	var labelPrevious = '{$labels.previous|addslashes}';
 	var	labelFinish = '{$labels.finish|addslashes}';
-	var	labelDelete = '{l s="Delete" js=1}';
-	var	labelValidate = '{l s="Validate" js=1}';
+	var	labelDelete = '{l s='Delete' js=1}';
+	var	labelValidate = '{l s='Validate' js=1}';
 	var validate_url = '{$validate_url|addslashes}';
 	var carrierlist_url = '{$carrierlist_url|addslashes}';
 	var nbr_steps = {$wizard_steps.steps|count};
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
index db611b901..d8e5c69b6 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/logo.tpl
@@ -37,7 +37,7 @@
 </div>
 
 <script type="text/javascript">
-	var carrier_translation_undefined = '{l s='undefined' js='1'}';
+	var carrier_translation_undefined = '{l s='undefined' js=1}';
 
 	function removeCarrierLogo()
 	{
diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
index 4bc5317d8..d566a4da0 100644
--- a/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
+++ b/admin-dev/themes/default/template/controllers/carrier_wizard/summary.tpl
@@ -24,17 +24,17 @@
 *}
 
 <script type="text/javascript">
-	var summary_translation_undefined = '{l s='[undefined]' js='1'}';
+	var summary_translation_undefined = '{l s='[undefined]' js=1}';
 	
 	var summary_translation_meta_informations = '{l s='This carrier is @s1 and the displayed delivery time is: @s2.' js=1}';
-	var summary_translation_free = '<strong>{l s='free' js='1'}</strong>';
-	var summary_translation_paid = '<strong>{l s='paid' js='1'}</strong>';
+	var summary_translation_free = '<strong>{l s='free' js=1}</strong>';
+	var summary_translation_paid = '<strong>{l s='paid' js=1}</strong>';
 	
-	var summary_translation_range = '{l s='This carrier can deliver orders from @s1 to @s2. If the order is out of range, the behavior is to @s3.' js='1'}';
+	var summary_translation_range = '{l s='This carrier can deliver orders from @s1 to @s2. If the order is out of range, the behavior is to @s3.' js=1}';
 	
-	var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 is applied.' js='1'}';
-	var summary_translation_price = '<strong>{l s='according to the price' js='1'}</strong>';
-	var summary_translation_weight = '<strong>{l s='according to the weight' js='1'}</strong>';
+	var summary_translation_shipping_cost = '{l s='The shipping cost is calculated @s1 and the tax rule @s2 is applied.' js=1}';
+	var summary_translation_price = '<strong>{l s='according to the price' js=1}</strong>';
+	var summary_translation_weight = '<strong>{l s='according to the weight' js=1}</strong>';
 </script>
 
 <fieldset>
diff --git a/admin-dev/themes/default/template/controllers/products/pack.tpl b/admin-dev/themes/default/template/controllers/products/pack.tpl
index f46bc77fe..72ed306db 100644
--- a/admin-dev/themes/default/template/controllers/products/pack.tpl
+++ b/admin-dev/themes/default/template/controllers/products/pack.tpl
@@ -24,8 +24,8 @@
 *}
 
 <script type="text/javascript">
-	var msg_select_one = "{l s="Please select at least one product." js=1}";
-	var msg_set_quantity = "{l s="Please set a quantity to add a product." js=1}";
+	var msg_select_one = "{l s='Please select at least one product.' js=1}";
+	var msg_set_quantity = "{l s='Please set a quantity to add a product.' js=1}";
 </script>
 <input type="hidden" name="submitted_tabs[]" value="Pack" />
 <h4>{l s='Pack'}</h4>
diff --git a/themes/live_edit.tpl b/themes/live_edit.tpl
index e9a7a5f94..52f28163b 100644
--- a/themes/live_edit.tpl
+++ b/themes/live_edit.tpl
@@ -28,7 +28,7 @@
 	{/if}
 	var lastMove = '';
 	var saveOK = '{l s='Module position saved' js=1}';
-	var confirmClose = "{l s="Are you sure? If you close this window, its position won't be saved"  js=1}";
+	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}';