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

// changed English strings, especially focusing on colons harmonization

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminPerformanceController.php
+22 -22
View File
@@ -61,7 +61,7 @@ class AdminPerformanceControllerCore extends AdminController
'id' => 'smarty_force_compile_'._PS_SMARTY_FORCE_COMPILE_,
'value' => _PS_SMARTY_FORCE_COMPILE_,
'label' => $this->l('Force compilation'),
'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. It should never be used in a production environment.')
'desc' => $this->l('This forces Smarty to (re)compile templates on every invocation. This is handy for development and debugging. Note: This should never be used in a production environment.')
)
)
),
@@ -155,7 +155,7 @@ class AdminPerformanceControllerCore extends AdminController
),
array(
'type' => 'radio',
'label' => $this->l('Features:'),
'label' => $this->l('Features'),
'name' => 'feature',
'class' => 't',
'is_bool' => true,
@@ -307,7 +307,7 @@ class AdminPerformanceControllerCore extends AdminController
'title' => $this->l('Media servers (use only with CCC)'),
'image' => '../img/admin/subdomain.gif'
),
'desc' => $this->l('You must enter another domain or subdomain in order to use cookieless static content.'),
'desc' => $this->l('You must enter another domain, or subdomain, in order to use cookieless static content.'),
'input' => array(
array(
'type' => 'hidden',
@@ -554,11 +554,11 @@ class AdminPerformanceControllerCore extends AdminController
if ($this->tabAccess['add'] === '1')
{
if (!Tools::getValue('memcachedIp'))
$this->errors[] = Tools::displayError('Memcached IP is missing');
$this->errors[] = Tools::displayError('The Memcached IP is missing.');
if (!Tools::getValue('memcachedPort'))
$this->errors[] = Tools::displayError('Memcached port is missing');
$this->errors[] = Tools::displayError('The Memcached port is missing.');
if (!Tools::getValue('memcachedWeight'))
$this->errors[] = Tools::displayError('Memcached weight is missing');
$this->errors[] = Tools::displayError('The Memcached weight is missing.');
if (!count($this->errors))
{
if (CacheMemcache::addServer(pSQL(Tools::getValue('memcachedIp')),
@@ -566,11 +566,11 @@ class AdminPerformanceControllerCore extends AdminController
(int)Tools::getValue('memcachedWeight')))
Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
else
$this->errors[] = Tools::displayError('Cannot add Memcached server');
$this->errors[] = Tools::displayError('The Memcached server cannot be added.');
}
}
else
$this->errors[] = Tools::displayError('You do not have permission to add here.');
$this->errors[] = Tools::displayError('You do not have permission to add this.');
}
if (Tools::getValue('deleteMemcachedServer'))
@@ -580,10 +580,10 @@ class AdminPerformanceControllerCore extends AdminController
if (CacheMemcache::deleteServer((int)Tools::getValue('deleteMemcachedServer')))
Tools::redirectAdmin(self::$currentIndex.'&token='.Tools::getValue('token').'&conf=4');
else
$this->errors[] = Tools::displayError('Error in deleting Memcached server');
$this->errors[] = Tools::displayError('There was an error when attempting to delete the Memcached server.');
}
else
$this->errors[] = Tools::displayError('You do not have permission to delete here.');
$this->errors[] = Tools::displayError('You do not have permission to delete this.');
}
$redirectAdmin = false;
@@ -597,7 +597,7 @@ class AdminPerformanceControllerCore extends AdminController
$redirectAdmin = true;
}
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 ((bool)Tools::getValue('features_detachables_up'))
@@ -610,7 +610,7 @@ class AdminPerformanceControllerCore extends AdminController
$redirectAdmin = true;
}
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 ((bool)Tools::getValue('ccc_up'))
@@ -631,7 +631,7 @@ class AdminPerformanceControllerCore extends AdminController
}
}
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 ((bool)Tools::getValue('media_server_up'))
@@ -663,7 +663,7 @@ class AdminPerformanceControllerCore extends AdminController
}
}
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 ((bool)Tools::getValue('ciphering_up') && Configuration::get('PS_CIPHER_ALGORITHM') != (int)Tools::getValue('PS_CIPHER_ALGORITHM'))
@@ -676,7 +676,7 @@ class AdminPerformanceControllerCore extends AdminController
if ($algo)
{
if (!function_exists('mcrypt_encrypt'))
$this->errors[] = Tools::displayError('PHP "Mcrypt" extension is not activated on this server.');
$this->errors[] = Tools::displayError('The PHP "Mcrypt" extension is not activated on this server.');
else
{
if (!strstr($new_settings, '_RIJNDAEL_KEY_'))
@@ -713,11 +713,11 @@ class AdminPerformanceControllerCore extends AdminController
$redirectAdmin = true;
}
else
$this->errors[] = Tools::displayError('Cannot overwrite settings file.');
$this->errors[] = Tools::displayError('The settings file cannot be overwritten.');
}
}
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 ((bool)Tools::getValue('cache_up'))
@@ -732,7 +732,7 @@ class AdminPerformanceControllerCore extends AdminController
$cache_active = 1;
if (!$caching_system = Tools::getValue('caching_system'))
$this->errors[] = Tools::displayError('Caching system is missing');
$this->errors[] = Tools::displayError('The caching system is missing.');
else
$new_settings = preg_replace(
'/define\(\'_PS_CACHING_SYSTEM_\', \'([a-z0-9=\/+-_]+)\'\);/Ui',
@@ -754,14 +754,14 @@ class AdminPerformanceControllerCore extends AdminController
<a href="http://xcache.lighttpd.net/wiki/XcacheIni">http://xcache.lighttpd.net/wiki/XcacheIni</a>';
elseif ($cache_active && $caching_system == 'CacheFs' && !is_writable(_PS_CACHEFS_DIRECTORY_))
$this->errors[] = sprintf(
Tools::displayError('To use CacheFS the directory %s must be writable.'),
Tools::displayError('To use CacheFS, the directory %s must be writable.'),
realpath(_PS_CACHEFS_DIRECTORY_)
);
if ($caching_system == 'CacheFs' && $cache_active)
{
if (!($depth = Tools::getValue('ps_cache_fs_directory_depth')))
$this->errors[] = Tools::displayError('Please set a directory depth');
$this->errors[] = Tools::displayError('Please set a directory depth.');
if (!count($this->errors))
{
CacheFs::deleteCacheDirectory();
@@ -782,11 +782,11 @@ class AdminPerformanceControllerCore extends AdminController
))
$redirectAdmin = true;
else
$this->errors[] = Tools::displayError('Cannot overwrite settings file.');
$this->errors[] = Tools::displayError('The settings file cannot be overwritten.');
}
}
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 ($redirectAdmin && (!isset($this->errors) || !count($this->errors)))
{