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] // 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',