dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

//Changed English strings using the translationsenglish module.

Browse Source
This commit is contained in:
djfm
2013-01-04 16:58:58 +01:00
parent 507309ddf5
commit 385c593129
319 changed files with 5991 additions and 5991 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminCarriersController.php
+26 -26
View File
@@ -43,7 +43,7 @@ class AdminCarriersControllerCore extends AdminController
$this->context = Context::getContext();
$this->bulk_actions = array(
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')),
'delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Are you sure that you want to delete the selected items?')),
'enableSelection' => array('text' => $this->l('Enable selection')),
'disableSelection' => array('text' => $this->l('Disable selection'))
);
@@ -162,24 +162,24 @@ class AdminCarriersControllerCore extends AdminController
'&nbsp;<b>'.$this->l('How do I create a new carrier?').'</b>
<br />
<ul>
<li>'.$this->l('Click "Add new."').'<br /></li>
<li>'.$this->l('Click "Add New."').'<br /></li>
<li>'.$this->l('Fill in the fields and click "Save."').'</li>
<li>'.
$this->l('You need to set a price range or a weight range for which the new carrier will be available.').' '.
$this->l('You need to set a price range -- or weight range -- for which the new carrier will be available.').' '.
$this->l('Under the "Shipping" menu, click either "Price Ranges" or "Weight Ranges".').'
</li>
<li>'.$this->l('Click "Add new."').'</li>
<li>'.$this->l('Click "Add New."').'</li>
<li>'.
$this->l('Select the name of the carrier and define the price range or the weight range.').' '.
$this->l('Select the name of the carrier before defining the price or weight range.').' '.
$this->l('For example, the carrier can be made available for a weight range between 0 and 5lbs. Another carrier can have a range between 5 and 10lbs.').'
</li>
<li>'.$this->l('When you are done, click "Save."').'</li>
<li>'.$this->l('Click on the "Shipping" menu.').'</li>
<li>'.
$this->l('You need to set the fees that will be applied for this carrier.').' '.
$this->l('At the bottom on the page, in the "Fees" section, select the name of the carrier.').'
$this->l('At the bottom on the page -- in the "Fees" section -- select the name of the carrier.').'
</li>
<li>'.$this->l('For each zone, enter a price and click "Save."').'</li>
<li>'.$this->l('For each zone, enter a price and then click "Save."').'</li>
<li>'.$this->l('You\'re all set! The new carrier will be displayed to your customers.').'</li>
</ul>'
);
@@ -196,7 +196,7 @@ class AdminCarriersControllerCore extends AdminController
{
$this->fields_form = array(
'legend' => array(
'title' => $this->l('Carriers'),
'title' => $this->l('Carriers:'),
'image' => '../img/admin/delivery.gif'
),
'input' => array(
@@ -209,14 +209,14 @@ class AdminCarriersControllerCore extends AdminController
'hint' => sprintf($this->l('Allowed characters: letters, spaces and %s'), '().-'),
'desc' => array(
$this->l('Carrier name displayed during checkout'),
$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name')
$this->l('For in-store pickup, enter 0 to replace the carrier name with your shop name.')
)
),
array(
'type' => 'file',
'label' => $this->l('Logo:'),
'name' => 'logo',
'desc' => $this->l('Upload a logo from your computer').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
'desc' => $this->l('Upload a logo from your computer.').' (.gif, .jpg, .jpeg '.$this->l('or').' .png)'
),
array(
'type' => 'text',
@@ -226,7 +226,7 @@ class AdminCarriersControllerCore extends AdminController
'required' => true,
'size' => 41,
'maxlength' => 128,
'desc' => $this->l('Estimated delivery time, displayed during checkout')
'desc' => $this->l('Estimated delivery time will be displayed during checkout.')
),
array(
'type' => 'text',
@@ -234,14 +234,14 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'grade',
'required' => false,
'size' => 1,
'desc' => $this->l('"0" for a longest shipping delay, "9" for the shortest shipping delay.')
'desc' => $this->l('Enter "0" for a longest shipping delay, or "9" for the shortest shipping delay.')
),
array(
'type' => 'text',
'label' => $this->l('URL:'),
'name' => 'url',
'size' => 40,
'desc' => $this->l('Delivery tracking URL; type \'@\' where the tracking number will appear, it will be automatically replaced by the tracking number')
'desc' => $this->l('Delivery tracking URL: Type \'@\' where the tracking number should appear. It will then be automatically replaced by the tracking number.')
),
array(
'type' => 'checkbox',
@@ -252,14 +252,14 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id_zone',
'name' => 'name'
),
'desc' => $this->l('The zones in which this carrier is to be used')
'desc' => $this->l('The zones in which this carrier will be used')
),
array(
'type' => 'group',
'label' => $this->l('Group access:'),
'name' => 'groupBox',
'values' => Group::getGroups(Context::getContext()->language->id),
'desc' => $this->l('Mark all groups for which you want to give access to this carrier')
'desc' => $this->l('Mark the groups that are allowed access to this carrier.')
),
array(
'type' => 'radio',
@@ -280,7 +280,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Enable carrier in the Front Office')
'desc' => $this->l('Enable the carrier in the Front Office')
),
array(
'type' => 'radio',
@@ -300,7 +300,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => '<img src="../img/admin/disabled.gif" alt="'.$this->l('No').'" title="'.$this->l('No').'" />'
)
),
'desc' => $this->l('Apply both regular shipping cost and product-specific additional shipping costs')
'desc' => $this->l('Apply both regular shipping cost and product-specific shipping costs.')
),
array(
'type' => 'select',
@@ -318,7 +318,7 @@ class AdminCarriersControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Shipping & handling:'),
'label' => $this->l('Shipping and handling:'),
'name' => 'shipping_handling',
'required' => false,
'class' => 't',
@@ -335,7 +335,7 @@ class AdminCarriersControllerCore extends AdminController
'label' => $this->l('Disabled')
)
),
'desc' => $this->l('Include the shipping & handling costs in carrier price')
'desc' => $this->l('Include the shipping and handling costs in the carrier price.')
),
array(
'type' => 'radio',
@@ -380,7 +380,7 @@ class AdminCarriersControllerCore extends AdminController
'id' => 'id',
'name' => 'name'
),
'desc' => $this->l('Out-of-range behavior 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 none is defined (e.g. when a customer\'s cart weight is greater than the highest range limit)')
),
array(
'type' => 'text',
@@ -388,7 +388,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_height',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum height managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum height managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -396,7 +396,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_width',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum width managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum width managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -404,7 +404,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_depth',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum depth managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum depth managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'text',
@@ -412,7 +412,7 @@ class AdminCarriersControllerCore extends AdminController
'name' => 'max_weight',
'required' => false,
'size' => 10,
'desc' => $this->l('Maximum weight managed by this carrier. Set "0" or leave this field blank to ignore this.')
'desc' => $this->l('Maximum weight managed by this carrier. Set the value to "0," or leave this field blank to ignore.')
),
array(
'type' => 'hidden',
@@ -443,7 +443,7 @@ class AdminCarriersControllerCore extends AdminController
}
$this->fields_form['submit'] = array(
'title' => $this->l(' Save '),
'title' => $this->l('Save '),
'class' => 'button'
);
@@ -555,7 +555,7 @@ class AdminCarriersControllerCore extends AdminController
{
if ((Tools::isSubmit('submitDel'.$this->table) && in_array(Configuration::get('PS_CARRIER_DEFAULT'), Tools::getValue('carrierBox')))
|| (isset($_GET['delete'.$this->table]) && Tools::getValue('id_carrier') == Configuration::get('PS_CARRIER_DEFAULT')))
$this->errors[] = $this->l('Please set another carrier as default before deleting this one');
$this->errors[] = $this->l('Please set another carrier as default before deleting this one.');
else
{
// if deletion : removes the carrier from the warehouse/carrier association