{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can also refresh this index by clicking the button above. This process may take awhile, and it\'s only needed if you modified or added a referrer, or if you want changes to be retroactive.'}
+
{l s='There is a huge quantity of data, so each connection corresponding to a referrer is indexed. You can also refresh this index by clicking the "Refresh index" button. This process may take a while, and it\'s only needed if you modified or added a referrer, or if you want changes to be retroactive.'}
@@ -80,7 +80,7 @@
{l s='Cache'}
-
{l s='In order to sort and filter your data, it\'s cached. You can refresh the cache by clicking on the button above.'}
+
{l s='Your data is cached in order to sort it and filter it. You can refresh the cache by clicking on the "Refresh cache" button.'}
@@ -90,4 +90,4 @@
-
\ No newline at end of file
+
diff --git a/controllers/admin/AdminStockCoverController.php b/controllers/admin/AdminStockCoverController.php
index f65e14a96bc4a..493675d478aed 100644
--- a/controllers/admin/AdminStockCoverController.php
+++ b/controllers/admin/AdminStockCoverController.php
@@ -196,7 +196,7 @@ public function renderList()
);
$this->displayInformation($this->l('Considering the coverage period chosen and the quantity of products/combinations that you sold.'));
- $this->displayInformation($this->l('this interface gives you an idea of when a product will run out of stock.'));
+ $this->displayInformation($this->l('This interface gives you an idea of when a product will run out of stock.'));
return parent::renderList();
}
diff --git a/controllers/admin/AdminStockManagementController.php b/controllers/admin/AdminStockManagementController.php
index 39409961d8d87..8bcdac8b49121 100644
--- a/controllers/admin/AdminStockManagementController.php
+++ b/controllers/admin/AdminStockManagementController.php
@@ -120,8 +120,7 @@ public function renderList()
$this->displayInformation($this->l('Furthermore, you can alter product quantities between warehouses, or within one warehouse.').' ');
$this->displayInformation($this->l('If you want to increase quantities of multiple products at once, you can use the "Supply orders" page under the "Stock" menu.').' ');
$this->displayInformation($this->l('Finally, you need to provide the quantity that you\'ll be adding:'));
- $this->displayInformation($this->l('Usable for sale means that this quantity will be available in your shop(s),'));
- $this->displayInformation($this->l('otherwise it will be considered reserved (i.e. for other purposes).'));
+ $this->displayInformation($this->l('"Usable for sale" means that this quantity will be available in your shop(s), otherwise it will be considered reserved (i.e. for other purposes).'));
return parent::renderList();
}
@@ -198,37 +197,37 @@ public function renderForm()
),
array(
'type' => 'text',
- 'label' => $this->l('Product reference:'),
+ 'label' => $this->l('Product reference'),
'name' => 'reference',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('EAN13:'),
+ 'label' => $this->l('EAN13'),
'name' => 'ean13',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('UPC:'),
+ 'label' => $this->l('UPC'),
'name' => 'upc',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('Name:'),
+ 'label' => $this->l('Name'),
'name' => 'name',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('Quantity to add:'),
+ 'label' => $this->l('Quantity to add'),
'name' => 'quantity',
'maxlength' => 6,
'required' => true,
'hint' => array(
- $this->l('Physical quantity to add'),
- $this->l('Last physical quantity added : %s (%s)'),
+ $this->l('Indicate the physical quantity of this product that you want to add.'),
+ $this->l('Last physical quantity added: %s (%s).'),
($last_sm_quantity > 0 ? $last_sm_quantity : $this->l('N/A')),
($last_sm_quantity > 0 ? ($last_sm_quantity_is_usable >= 0 ? $this->l('Usable') : $this->l('Not usable')) : $this->l('N/A'))),
),
@@ -254,7 +253,7 @@ public function renderForm()
),
array(
'type' => 'select',
- 'label' => $this->l('Warehouse:'),
+ 'label' => $this->l('Warehouse'),
'name' => 'id_warehouse',
'required' => true,
'options' => array(
@@ -272,13 +271,13 @@ public function renderForm()
'size' => 10,
'maxlength' => 10,
'hint' => array(
- $this->l('Unit purchase price or unit manufacturing cost for this product (tax excl.)'),
- sprintf($this->l('Last unit price (tax excl.): %s'), $last_sm_unit_price_te),
+ $this->l('Unit purchase price or unit manufacturing cost for this product (tax excl.).'),
+ sprintf($this->l('Last unit price (tax excl.): %s.'), $last_sm_unit_price_te),
)
),
array(
'type' => 'select',
- 'label' => $this->l('Currency:'),
+ 'label' => $this->l('Currency'),
'name' => 'id_currency',
'required' => true,
'options' => array(
@@ -290,7 +289,7 @@ public function renderForm()
),
array(
'type' => 'select',
- 'label' => $this->l('Label:'),
+ 'label' => $this->l('Label'),
'name' => 'id_stock_mvt_reason',
'required' => true,
'options' => array(
@@ -300,7 +299,7 @@ public function renderForm()
'id' => 'id_stock_mvt_reason',
'name' => 'name'
),
- 'hint' => $this->l('Label used in stock movements'),
+ 'hint' => $this->l('Label used in stock movements.'),
),
),
'submit' => array(
@@ -335,33 +334,33 @@ public function renderForm()
),
array(
'type' => 'text',
- 'label' => $this->l('Product reference:'),
+ 'label' => $this->l('Product reference'),
'name' => 'reference',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('EAN13:'),
+ 'label' => $this->l('EAN13'),
'name' => 'ean13',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('Name:'),
+ 'label' => $this->l('Name'),
'name' => 'name',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('Quantity to remove:'),
+ 'label' => $this->l('Quantity to remove'),
'name' => 'quantity',
'maxlength' => 6,
'required' => true,
- 'hint' => $this->l('Physical quantity to remove'),
+ 'hint' => $this->l('Indicate the physical quantity of this product that you want to remove.'),
),
array(
'type' => 'switch',
- 'label' => $this->l('Usable for sale:'),
+ 'label' => $this->l('Usable for sale'),
'name' => 'usable',
'required' => true,
'is_bool' => true,
@@ -381,7 +380,7 @@ public function renderForm()
),
array(
'type' => 'select',
- 'label' => $this->l('Warehouse:'),
+ 'label' => $this->l('Warehouse'),
'name' => 'id_warehouse',
'required' => true,
'options' => array(
@@ -393,7 +392,7 @@ public function renderForm()
),
array(
'type' => 'select',
- 'label' => $this->l('Label:'),
+ 'label' => $this->l('Label'),
'name' => 'id_stock_mvt_reason',
'required' => true,
'options' => array(
@@ -403,7 +402,7 @@ public function renderForm()
'id' => 'id_stock_mvt_reason',
'name' => 'name'
),
- 'hint' => $this->l('Label used in stock movements'),
+ 'hint' => $this->l('Label used in stock movements.'),
),
),
'submit' => array(
@@ -437,33 +436,33 @@ public function renderForm()
),
array(
'type' => 'text',
- 'label' => $this->l('Product reference:'),
+ 'label' => $this->l('Product reference'),
'name' => 'reference',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('EAN13:'),
+ 'label' => $this->l('EAN13'),
'name' => 'ean13',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('Name:'),
+ 'label' => $this->l('Name'),
'name' => 'name',
'disabled' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('Quantity to transfer:'),
+ 'label' => $this->l('Quantity to transfer'),
'name' => 'quantity',
'maxlength' => 6,
'required' => true,
- 'hint' => $this->l('Quantity to transfer:')
+ 'hint' => $this->l('Indicate the physical quantity of this product that you want to transfer.')
),
array(
'type' => 'select',
- 'label' => $this->l('Source Warehouse:'),
+ 'label' => $this->l('Source warehouse'),
'name' => 'id_warehouse_from',
'required' => true,
'options' => array(
@@ -475,7 +474,7 @@ public function renderForm()
),
array(
'type' => 'switch',
- 'label' => $this->l('Is this product usable in your source warehouse?'),
+ 'label' => $this->l('Is this product usable for sale in your source warehouse?'),
'name' => 'usable_from',
'required' => true,
'is_bool' => true,
@@ -483,19 +482,19 @@ public function renderForm()
array(
'id' => 'active_on',
'value' => 1,
- 'label' => $this->l('Enabled')
+ 'label' => $this->l('Yes')
),
array(
'id' => 'active_off',
'value' => 0,
- 'label' => $this->l('Disabled')
+ 'label' => $this->l('No')
)
),
'hint' => $this->l('Is this the usable quantity for sale?')
),
array(
'type' => 'select',
- 'label' => $this->l('Destination warehouse:'),
+ 'label' => $this->l('Destination warehouse'),
'name' => 'id_warehouse_to',
'required' => true,
'options' => array(
@@ -507,7 +506,7 @@ public function renderForm()
),
array(
'type' => 'switch',
- 'label' => $this->l('Is this product for sale in your destination warehouse?'),
+ 'label' => $this->l('Is this product usable for sale in your destination warehouse?'),
'name' => 'usable_to',
'required' => true,
'class' => 't',
@@ -516,15 +515,15 @@ public function renderForm()
array(
'id' => 'active_on',
'value' => 1,
- 'label' => $this->l('Enabled')
+ 'label' => $this->l('Yes')
),
array(
'id' => 'active_off',
'value' => 0,
- 'label' => $this->l('Disabled')
+ 'label' => $this->l('No')
)
),
- 'hint' => $this->l('Do you want it to be for sale/useable?')
+ 'hint' => $this->l('Do you want it to be for sale/usable?')
),
),
'submit' => array(
diff --git a/controllers/admin/AdminWarehousesController.php b/controllers/admin/AdminWarehousesController.php
index 67fc520f487f0..1211d8db51319 100644
--- a/controllers/admin/AdminWarehousesController.php
+++ b/controllers/admin/AdminWarehousesController.php
@@ -118,9 +118,8 @@ public function renderList()
// display help informations
$this->displayInformation($this->l('This interface allows you to manage your warehouses.').' ');
$this->displayInformation($this->l('Before adding stock in your warehouses, you should check the default currency used.').' ');
- $this->displayInformation($this->l('You should also check:'));
- $this->displayInformation($this->l('the management type (according to the law in your country), the valuation currency and its associated carriers and shops.').' ');
- $this->displayInformation($this->l('You can also see detailed information about your stock, such as its overall value, the number of products and quantities stored, etc...')
+ $this->displayInformation($this->l('You should also check the management type (according to the law in your country), the valuation currency and its associated carriers and shops.').' ');
+ $this->displayInformation($this->l('You can also see detailed information about your stock, such as its overall value, the number of products and quantities stored, etc.')
.'
');
$this->displayInformation($this->l('Be careful! Products from different warehouses will need to be shipped in different packages.'));
@@ -163,61 +162,61 @@ public function renderForm()
),
array(
'type' => 'text',
- 'label' => $this->l('Reference:'),
+ 'label' => $this->l('Reference'),
'name' => 'reference',
'maxlength' => 32,
'required' => true,
- 'hint' => $this->l('Reference for this warehouse'),
+ 'hint' => $this->l('Reference for this warehouse.'),
),
array(
'type' => 'text',
- 'label' => $this->l('Name:'),
+ 'label' => $this->l('Name'),
'name' => 'name',
'maxlength' => 45,
'required' => true,
'hint' => array(
- $this->l('Name of this warehouse'),
+ $this->l('Name of this warehouse.'),
$this->l('Invalid characters:').' !<>,;?=+()@#"�{}_$%:',
)
),
array(
'type' => 'text',
- 'label' => $this->l('Phone:'),
+ 'label' => $this->l('Phone'),
'name' => 'phone',
'maxlength' => 16,
- 'hint' => $this->l('Phone number for this warehouse')
+ 'hint' => $this->l('Phone number for this warehouse.')
),
array(
'type' => 'text',
- 'label' => $this->l('Address:'),
+ 'label' => $this->l('Address'),
'name' => 'address',
'maxlength' => 128,
'required' => true
),
array(
'type' => 'text',
- 'label' => $this->l('Address:').' (2)',
+ 'label' => $this->l('Address').' (2)',
'name' => 'address2',
'maxlength' => 128,
- 'hint' => $this->l('Address of this warehouse (complementary address is optional).'),
+ 'hint' => $this->l('Complementary address (optional).'),
),
array(
'type' => 'text',
- 'label' => $this->l('Postcode/Zip Code:'),
+ 'label' => $this->l('Postcode/Zip Code'),
'name' => 'postcode',
'maxlength' => 12,
'required' => true,
),
array(
'type' => 'text',
- 'label' => $this->l('City:'),
+ 'label' => $this->l('City'),
'name' => 'city',
'maxlength' => 32,
'required' => true,
),
array(
'type' => 'select',
- 'label' => $this->l('Country:'),
+ 'label' => $this->l('Country'),
'name' => 'id_country',
'required' => true,
'default_value' => (int)$this->context->country->id,
@@ -226,11 +225,11 @@ public function renderForm()
'id' => 'id_country',
'name' => 'name',
),
- 'hint' => $this->l('Warehouse location country')
+ 'hint' => $this->l('Country of location of the warehouse.')
),
array(
'type' => 'select',
- 'label' => $this->l('State:'),
+ 'label' => $this->l('State'),
'name' => 'id_state',
'required' => true,
'options' => array(
@@ -241,7 +240,7 @@ public function renderForm()
),
array(
'type' => 'select',
- 'label' => $this->l('Manager:'),
+ 'label' => $this->l('Manager'),
'name' => 'id_employee',
'required' => true,
'options' => array(
@@ -252,7 +251,7 @@ public function renderForm()
),
array(
'type' => 'select',
- 'label' => $this->l('Carriers:'),
+ 'label' => $this->l('Carriers'),
'name' => 'ids_carriers[]',
'required' => false,
'multiple' => true,
@@ -262,8 +261,8 @@ public function renderForm()
'name' => 'name'
),
'hint' => array(
- $this->l('Associated carriers. Use CTRL+CLICK to select several.'),
- $this->l('You must select at least one carrier, if you do not select a carrier none will be able to ship from this warehouse.'),
+ $this->l('Associated carriers. Use CTRL+Click to select more than one carrier.'),
+ $this->l('You must select at least one carrier. If you do not select any carrier, none will be able to ship from this warehouse.'),
$this->l('You can specify the number of carriers available to ship orders from particular warehouses.'),
)
),
@@ -311,7 +310,7 @@ public function renderForm()
'id' => 'id',
'name' => 'name'
),
- 'hint' => $this->l('Inventory valuation method')
+ 'hint' => $this->l('Inventory valuation method.')
);
// adds input valuation currency