diff --git a/admin-dev/backup.php b/admin-dev/backup.php
index e4b451f43..8a4f66fef 100644
--- a/admin-dev/backup.php
+++ b/admin-dev/backup.php
@@ -33,15 +33,15 @@ if (!Context::getContext()->employee->isLoggedBack())
$tabAccess = Profile::getProfileAccess(Context::getContext()->employee->id_profile, Tab::getIdFromClassName('AdminBackup'));
if ($tabAccess['view'] !== '1')
- die (Tools::displayError('You do not have permission to view here'));
+ die (Tools::displayError('You do not have permission to view this.'));
$backupdir = realpath(_PS_ADMIN_DIR_ . '/backups/');
if ($backupdir === false)
- die (Tools::displayError('"Backup" directory does not exist.'));
+ die (Tools::displayError('A "Backup" directory does not exist.'));
if (!$backupfile = Tools::getValue('filename'))
- die (Tools::displayError('No file specified'));
+ die (Tools::displayError('No file has been specified.'));
// Check the realpath so we can validate the backup file is under the backup directory
$backupfile = realpath($backupdir.'/'.$backupfile);
@@ -58,7 +58,7 @@ else
$fp = @fopen($backupfile, 'r');
if ($fp === false)
- die (Tools::displayError('Unable to open backup file').' "'.addslashes($backupfile).'"');
+ die (Tools::displayError('Unable to open backup file(s).').' "'.addslashes($backupfile).'"');
// Add the correct headers, this forces the file is saved
header('Content-Type: '.$contentType);
@@ -70,4 +70,4 @@ $ret = @fpassthru($fp);
fclose($fp);
if ($ret === false)
- die (Tools::displayError('Unable to display backup file').' "'.addslashes($backupfile).'"');
\ No newline at end of file
+ die (Tools::displayError('Unable to display backup file(s).').' "'.addslashes($backupfile).'"');
\ No newline at end of file
diff --git a/admin-dev/functions.php b/admin-dev/functions.php
index 888f9bb24..351670003 100644
--- a/admin-dev/functions.php
+++ b/admin-dev/functions.php
@@ -250,7 +250,7 @@ function checkingTab($tab)
{
if (isset(AdminTab::$tabParenting[$tab]))
Tools::redirectAdmin('?tab='.AdminTab::$tabParenting[$tab].'&token='.Tools::getAdminTokenLite(AdminTab::$tabParenting[$tab]));
- echo sprintf(Tools::displayError('Page %s cannot be found.'),$tab);
+ echo sprintf(Tools::displayError('Page %s cannot be found..'),$tab);
return false;
}
diff --git a/admin-dev/themes/default/template/controllers/backup/download/view.tpl b/admin-dev/themes/default/template/controllers/backup/download/view.tpl
index d5ecb1bac..3a3fe6fbb 100644
--- a/admin-dev/themes/default/template/controllers/backup/download/view.tpl
+++ b/admin-dev/themes/default/template/controllers/backup/download/view.tpl
@@ -51,7 +51,7 @@
-
{l s='How to restore a database Backup in 10 easy steps:'}
+
{l s='How to restore a database backup in 10 easy steps:'}
{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}
{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
@@ -61,7 +61,7 @@
{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}
{l s='At the top of the screen, please select the "Import" tab'}
{l s='Click on the "Browse" button and select the backup file from your hard drive.'}
-
{l s='Check the max. allowed filesize (e.g. Max: 16MB)'} {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
+
{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'} {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}
{l s='How to restore a database Backup in 10 easy steps:'}
+
{l s='How to restore a database backup in 10 easy steps:'}
{l s='Set "Enable Shop" to "No" in the "Maintenance" page under the "Preferences" menu.'}
{l s='Download the backup from the list below or from your FTP server (in the folder "admin/backups").'}
@@ -69,7 +69,7 @@
{l s='Unless you enabled the "Drop existing tables" option, you must delete all tables from your current database.'}
{l s='At the top of the screen, please select the "Import" tab'}
{l s='Click on the "Browse" button and select the backup file from your hard drive.'}
-
{l s='Check the max. allowed filesize (e.g. Max: 16MB)'} {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
+
{l s='Check the maximum filesize allowed (e.g. Max: 16MB)'} {l s='If your backup file exceeds this limit, contact your hosting provider for assistence. '}
{l s='Click on the "Go" button and please wait patiently for the import process to conclude. This may take several minutes.'}
- {l s='If the voucher is not yet in the cart, it will be displayed under the cart in the cart summary.'}
+ {l s='If the voucher is not yet in the cart, it will be displayed in the cart summary.'}
diff --git a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
index 0ff7e7f70..9c5d80438 100644
--- a/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
+++ b/admin-dev/themes/default/template/controllers/cart_rules/product_rule.tpl
@@ -8,7 +8,7 @@
{* Everything is on a single line in order to avoid a empty space between the [ ] and the word *}
- [{if $product_rule_type == 'products'}{l s='Products:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers:'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]
+ [{if $product_rule_type == 'products'}{l s='Products:'}{elseif $product_rule_type == 'categories'}{l s='Categories:'}{elseif $product_rule_type == 'manufacturers'}{l s='Manufacturers:'}{elseif $product_rule_type == 'suppliers'}{l s='Suppliers'}{elseif $product_rule_type == 'attributes'}{l s='Attributes'}{/if}]