// changed English strings, especially focusing on colons harmonization

This commit is contained in:
fram
2013-03-12 19:39:30 +01:00
parent f7c76f60fb
commit ed947bc123
590 changed files with 6160 additions and 7064 deletions
@@ -52,7 +52,7 @@ class AdminCurrenciesControllerCore extends AdminController
'change' => array(
'title' => $this->l('Currency rates'),
'image' => '../img/admin/exchangesrate.gif',
'description' => $this->l('Use PrestaShop\'s webservice to update your currency exchange rates. Please use caution, rates are provided as-is.'),
'description' => $this->l('Use PrestaShop\'s webservice to update your currency exchange rates. Please use caution, however, rates are provided as-is.'),
'submit' => array(
'title' => $this->l('Update currency rates'),
'class' => 'button',
@@ -135,11 +135,11 @@ class AdminCurrenciesControllerCore extends AdminController
'size' => 3,
'maxlength' => 11,
'required' => true,
'desc' => $this->l('Conversion rate from one unit of your shop\'s default currency (for example, 1€) to this currency. For example, if the default currency is euros and this currency is dollars, type \'1.20\'').' 1€ = $1.20',
'desc' => $this->l('Conversion rates are calculated from one unit of your shop\'s default currency. For example, if the default currency is euros and your chosen currency is dollars, type "1.20"').' 1€ = $1.20',
),
array(
'type' => 'select',
'label' => $this->l('Conversion rate from one unit of your shop\'s default currency (for example, 1 Euro) to this currency. For example, if the default currency is Euros and this currency is Dollars, type \'1.20\''),
'label' => $this->l('Currency format:'),
'name' => 'format',
'size' => 3,
'maxlength' => 11,
@@ -249,7 +249,7 @@ class AdminCurrenciesControllerCore extends AdminController
return true;
}
else
$this->errors[] = Tools::displayError('An error occurred while deleting object.').'
$this->errors[] = Tools::displayError('An error occurred while deleting the object.').'
<b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
return false;
@@ -265,7 +265,7 @@ class AdminCurrenciesControllerCore extends AdminController
return true;
}
else
$this->errors[] = Tools::displayError('An error occurred while updating status for object.').'
$this->errors[] = Tools::displayError('An error occurred while updating the status for an object.').'
<b>'.$this->table.'</b> '.Tools::displayError('(cannot load object)');
return false;
@@ -342,10 +342,10 @@ class AdminCurrenciesControllerCore extends AdminController
if ($this->tabAccess['edit'] === '1')
$this->action = 'exchangeRates';
else
$this->errors[] = Tools::displayError('You do not have permission to edit here.');
$this->errors[] = Tools::displayError('You do not have permission to edit this.');
}
if (Tools::isSubmit('submitAddcurrency') && !Tools::getValue('id_currency') && Currency::exists(Tools::getValue('iso_code'), Tools::getValue('iso_code_num')))
$this->errors[] = Tools::displayError('This currency already exist.');
$this->errors[] = Tools::displayError('This currency already exists.');
parent::initProcess();
}
}