diff --git a/app/Resources/translations/default/AdminAdvparametersFeature.xlf b/app/Resources/translations/default/AdminAdvparametersFeature.xlf index 7f62f2d2a9f03..a9669e96160d7 100644 --- a/app/Resources/translations/default/AdminAdvparametersFeature.xlf +++ b/app/Resources/translations/default/AdminAdvparametersFeature.xlf @@ -1245,6 +1245,28 @@ File: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/EmailCo + + + + None + None + Context: + File: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php:63 + + + TLS + TLS + Context: + File: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php:64 + + + SSL + SSL + Context: + File: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php:65 + + + diff --git a/app/Resources/translations/default/AdminGlobal.xlf b/app/Resources/translations/default/AdminGlobal.xlf index e5375f4e58591..453baad320fae 100644 --- a/app/Resources/translations/default/AdminGlobal.xlf +++ b/app/Resources/translations/default/AdminGlobal.xlf @@ -2014,4 +2014,24 @@ File: modules/ps_faviconnotificationbo/views/templates/admin/menu.tpl:33 + + + + Actions + Actions + Context: + File: src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php:115 + + + + + + + ID + ID + Context: + File: src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php:94 + + + diff --git a/app/Resources/translations/default/AdminModulesNotification.xlf b/app/Resources/translations/default/AdminModulesNotification.xlf index 16ebe6b24f58c..2226509ffc40c 100644 --- a/app/Resources/translations/default/AdminModulesNotification.xlf +++ b/app/Resources/translations/default/AdminModulesNotification.xlf @@ -980,4 +980,21 @@ File: admin-dev/themes/default/template/controllers/modules/configuration_bar.tp + + + + Are you sure you want to uninstall this module? + Are you sure you want to uninstall this module? + Context: + File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:71 + Comment: Confirm uninstall + + + There was an error during the uninstallation. + There was an error during the uninstallation. + Context: + File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:101 + + + diff --git a/app/Resources/translations/default/AdminNotificationsError.xlf b/app/Resources/translations/default/AdminNotificationsError.xlf index 284a032e22e13..51d45215c4ffd 100644 --- a/app/Resources/translations/default/AdminNotificationsError.xlf +++ b/app/Resources/translations/default/AdminNotificationsError.xlf @@ -1072,16 +1072,6 @@ File: src/PrestaShopBundle/Controller/Admin/FrameworkBundleAdminController.php:3 - - - - You do not have permission to edit this - You do not have permission to edit this - Context: -File: src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php:87 - - - diff --git a/app/Resources/translations/default/AdminShopparametersFeature.xlf b/app/Resources/translations/default/AdminShopparametersFeature.xlf index 36fe4bf398021..c2ca46d74b7f8 100644 --- a/app/Resources/translations/default/AdminShopparametersFeature.xlf +++ b/app/Resources/translations/default/AdminShopparametersFeature.xlf @@ -1966,15 +1966,15 @@ File: src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/Blocks - - Improve your Seo - Improve your Seo + + Improve your SEO + Improve your SEO Context: File: src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/TrafficSeo/Meta/Blocks/meta_showcase_card.html.twig:34 - - Edit information about your pages to gain visibility and therefore reach more visitors. We advice you to start with the index page, it stand for your homepage. - Edit information about your pages to gain visibility and therefore reach more visitors. We advice you to start with the index page, it stand for your homepage. + + Edit information about your pages to gain visibility and therefore reach more visitors. We advise you to start with the index page, it stands for your homepage. + Edit information about your pages to gain visibility and therefore reach more visitors. We advise you to start with the index page, it stands for your homepage. Context: File: src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/TrafficSeo/Meta/Blocks/meta_showcase_card.html.twig:35 diff --git a/app/Resources/translations/default/GlobalActions.xlf b/app/Resources/translations/default/GlobalActions.xlf deleted file mode 100644 index 051da9960b886..0000000000000 --- a/app/Resources/translations/default/GlobalActions.xlf +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Actions - Actions - Context: -File: src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php:115 - - - - - - - ID - ID - Context: -File: src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php:94 - - - - diff --git a/app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf b/app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf deleted file mode 100644 index 3fb7142b6b837..0000000000000 --- a/app/Resources/translations/default/ModulesAutoupgradeAdmin.xlf +++ /dev/null @@ -1,1358 +0,0 @@ - - - - - - This version of PrestaShop cannot be upgraded: the PS_ADMIN_DIR constant is missing. - This version of PrestaShop cannot be upgraded: the PS_ADMIN_DIR constant is missing. - Context: -File: modules/autoupgrade/autoupgrade.php:46 - - - 1-Click Upgrade - 1-Click Upgrade - Context: -File: modules/autoupgrade/autoupgrade.php:50 - - - Provides an automated method to upgrade your shop to the latest version of PrestaShop. - Provides an automated method to upgrade your shop to the latest version of PrestaShop. - Context: -File: modules/autoupgrade/autoupgrade.php:51 - - - This version of 1-click upgrade requires PHP 5.6 to work properly. Please upgrade your server configuration. - This version of 1-click upgrade requires PHP 5.6 to work properly. Please upgrade your server configuration. - Context: -File: modules/autoupgrade/autoupgrade.php:59 - - - Unable to delete outdated "AdminUpgrade" tab (tab ID: %idtab%). - Unable to delete outdated "AdminUpgrade" tab (tab ID: %idtab%). - Context: -File: modules/autoupgrade/autoupgrade.php:71 - - - Unable to create the "AdminSelfUpgrade" tab - Unable to create the "AdminSelfUpgrade" tab - Context: -File: modules/autoupgrade/autoupgrade.php:85 - - - Unable to copy logo.gif in %s - Unable to copy logo.gif in %s - Context: -File: modules/autoupgrade/autoupgrade.php:88 - - - Unable to load the "AdminSelfUpgrade" tab - Unable to load the "AdminSelfUpgrade" tab - Context: -File: modules/autoupgrade/autoupgrade.php:98 - - - Unable to create the directory "%s" - Unable to create the directory "%s" - Context: -File: modules/autoupgrade/autoupgrade.php:134 - - - Unable to copy ajax-upgradetab.php in %s - Unable to copy ajax-upgradetab.php in %s - Context: -File: modules/autoupgrade/autoupgrade.php:119 - - - - - - - Unable to write in the directory "%s" - Unable to write in the directory "%s" - Context: -File: modules/autoupgrade/classes/Workspace.php:63 - - - Unable to create directory %s - Unable to create directory %s - Context: -File: modules/autoupgrade/classes/Workspace.php:60 - - - - - - - Back up my files and database - Back up my files and database - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:149 - - - Automatically back up your database and files in order to restore your shop if needed. This is experimental: you should still perform your own manual backup for safety. - Automatically back up your database and files in order to restore your shop if needed. This is experimental: you should still perform your own manual backup for safety. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:150 - - - Back up my images - Back up my images - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:153 - - - To save time, you can decide not to back your images up. In any case, always make sure you did back them up manually. - To save time, you can decide not to back your images up. In any case, always make sure you did back them up manually. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:154 - - - Server performance - Server performance - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:159 - - - Unless you are using a dedicated server, select "Low". - Unless you are using a dedicated server, select "Low". - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:160 - - - A high value can cause the upgrade to fail if your server is not powerful enough to process the upgrade tasks in a short amount of time. - A high value can cause the upgrade to fail if your server is not powerful enough to process the upgrade tasks in a short amount of time. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:161 - - - Low (recommended) - Low (recommended) - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:162 - - - Medium - Medium - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:162 - - - High - High - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:162 - - - Disable non-native modules - Disable non-native modules - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:165 - - - As non-native modules can experience some compatibility issues, we recommend to disable them by default. - As non-native modules can experience some compatibility issues, we recommend to disable them by default. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:166 - - - Keeping them enabled might prevent you from loading the "Modules" page properly after the upgrade. - Keeping them enabled might prevent you from loading the "Modules" page properly after the upgrade. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:167 - - - Upgrade the default theme - Upgrade the default theme - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:170 - - - If you customized the default PrestaShop theme in its folder (folder name "classic" in 1.7), enabling this option will lose your modifications. - If you customized the default PrestaShop theme in its folder (folder name "classic" in 1.7), enabling this option will lose your modifications. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:171 - - - If you are using your own theme, enabling this option will simply update the default theme files, and your own theme will be safe. - If you are using your own theme, enabling this option will simply update the default theme files, and your own theme will be safe. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:172 - - - Switch to the default theme - Switch to the default theme - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:175 - - - This will change your theme: your shop will then use the default theme of the version of PrestaShop you are upgrading to. - This will change your theme: your shop will then use the default theme of the version of PrestaShop you are upgrading to. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:176 - - - Keep the customized email templates - Keep the customized email templates - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:179 - - - This will not upgrade the default PrestaShop e-mails. - This will not upgrade the default PrestaShop e-mails. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:180 - - - If you customized the default PrestaShop e-mail templates, enabling this option will keep your modifications. - If you customized the default PrestaShop e-mail templates, enabling this option will keep your modifications. - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:181 - - - Unable to create file %s - Unable to create file %s - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:276 - - - Error when trying to delete backups %s - Error when trying to delete backups %s - Context: -File: modules/autoupgrade/AdminSelfUpgrade.php:330 - - - - - - - Backup Options - Backup Options - Context: -File: modules/autoupgrade/classes/Twig/Form/BackupOptionsForm.php:98 - - - - - - - Upgrade Options - Upgrade Options - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:179 - - - - - - - Major release - Major release - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:196 - Comment: Hey ! I'm really using a fieldset element to regroup fields ?! ! - - - Minor release (recommended) - Minor release (recommended) - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:197 - - - Release candidates - Release candidates - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:198 - - - Beta releases - Beta releases - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:199 - - - Alpha releases - Alpha releases - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:200 - - - Private release (require link and MD5 hash) - Private release (require link and MD5 hash) - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:201 - - - Local archive - Local archive - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:202 - - - Local directory - Local directory - Context: -File: modules/autoupgrade/classes/Twig/Block/UpgradeButtonBlock.php:203 - - - - - - - [NOTICE] File %s does not exist, merge skipped. - [NOTICE] File %s does not exist, merge skipped. - Context: -File: modules/autoupgrade/classes/UpgradeTools/Translation.php:143 - - - [WARNING] %variablename% variable missing in file %filename%. Merge skipped. - [WARNING] %variablename% variable missing in file %filename%. Merge skipped. - Context: -File: modules/autoupgrade/classes/UpgradeTools/Translation.php:130 - - - [WARNING] %variablename% variable missing in file %filename%. File %filename% deleted and merge skipped. - [WARNING] %variablename% variable missing in file %filename%. File %filename% deleted and merge skipped. - Context: -File: modules/autoupgrade/classes/UpgradeTools/Translation.php:155 - - - - - - - Error upgrading Doctrine schema - Error upgrading Doctrine schema - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader17.php:56 - - - Error updating translations - Error updating translations - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader17.php:80 - - - - - - - Invalid database configuration - Invalid database configuration - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:74 - - - Database upgrade OK - Database upgrade OK - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:87 - - - Warning detected during upgrade. - Warning detected during upgrade. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:104 - - - Database upgrade completed - Database upgrade completed - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:106 - - - /install/upgrade/php directory is missing in archive or directory - /install/upgrade/php directory is missing in archive or directory - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:177 - - - %s is not a valid version number. - %s is not a valid version number. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:224 - - - [ERROR] Version to install is too old. - [ERROR] Version to install is too old. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:231 - - - Current version: %oldversion%. Version to install: %newversion%. - Current version: %oldversion%. Version to install: %newversion%. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:234 - - - You already have the %s version. - You already have the %s version. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:242 - - - There is no older version. Did you delete or rename the app/config/parameters.php file? - There is no older version. Did you delete or rename the app/config/parameters.php file? - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:244 - - - Unable to find upgrade directory in the installation path. - Unable to find upgrade directory in the installation path. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:272 - - - Error while loading SQL upgrade file "%s.sql". - Error while loading SQL upgrade file "%s.sql". - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:282 - - - Cannot find the SQL upgrade files. Please check that the %s folder is not empty. - Cannot find the SQL upgrade files. Please check that the %s folder is not empty. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:289 - - - [DROP] SQL %s table has been dropped. - [DROP] SQL %s table has been dropped. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:401 - - - [SKIP] directory "%s" does not exist and cannot be emptied. - [SKIP] directory "%s" does not exist and cannot be emptied. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:466 - - - [CLEANING CACHE] File %s removed - [CLEANING CACHE] File %s removed - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader.php:479 - - - - - - - The config/settings.inc.php file was not found. - The config/settings.inc.php file was not found. - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php:88 - - - - - - - [ERROR] %dir% does not exist or is not a directory. - [ERROR] %dir% does not exist or is not a directory. - Context: -File: modules/autoupgrade/classes/UpgradeTools/ModuleAdapter.php:106 - - - [ERROR] No response from Addons server. - [ERROR] No response from Addons server. - Context: -File: modules/autoupgrade/classes/UpgradeTools/ModuleAdapter.php:167 - - - [ERROR] Unable to write module %s's zip file in temporary directory. - [ERROR] Unable to write module %s's zip file in temporary directory. - Context: -File: modules/autoupgrade/classes/UpgradeTools/ModuleAdapter.php:172 - - - [WARNING] Error when trying to extract module %s. - [WARNING] Error when trying to extract module %s. - Context: -File: modules/autoupgrade/classes/UpgradeTools/ModuleAdapter.php:181 - - - [WARNING] Error when trying to upgrade module %s. - [WARNING] Error when trying to upgrade module %s. - Context: -File: modules/autoupgrade/classes/UpgradeTools/ModuleAdapter.php:191 - - - - - - - [ERROR] %s does not exist or is not a directory. - [ERROR] %s does not exist or is not a directory. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:103 - - - filesToUpgrade is not an array - filesToUpgrade is not an array - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:55 - - - All files upgraded. Now upgrading database... - All files upgraded. Now upgrading database... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:67 - - - Error when trying to upgrade file %s. - Error when trying to upgrade file %s. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:76 - - - %s files left to upgrade. - %s files left to upgrade. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:82 - - - Nothing has been extracted. It seems the unzipping step has been skipped. - Nothing has been extracted. It seems the unzipping step has been skipped. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:104 - - - File %s is preserved - File %s is preserved - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:121 - - - %s ignored - %s ignored - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:148 - - - [WARNING] File %1$s has been deleted. - [WARNING] File %1$s has been deleted. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:156 - - - Directory %1$s created. - Directory %1$s created. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:160 - - - Error while creating directory %s. - Error while creating directory %s. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:165 - - - Directory %s already exists. - Directory %s already exists. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:170 - Comment: directory already exists - - - [TRANSLATION] The translation files have been merged into file %s. - [TRANSLATION] The translation files have been merged into file %s. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:179 - - - [TRANSLATION] The translation files have not been merged into file %filename%. Switch to copy %filename%. - [TRANSLATION] The translation files have not been merged into file %filename%. Switch to copy %filename%. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:184 - - - Copied %1$s. - Copied %1$s. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:193 - - - Error while copying file %s - Error while copying file %s - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:198 - - - [ERROR] Unable to find files to upgrade. - [ERROR] Unable to find files to upgrade. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:299 - - - %s files will be upgraded. - %s files will be upgraded. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeFiles.php:304 - - - - - - - Error during backupFiles - Error during backupFiles - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupFiles.php:51 - - - [ERROR] backupFiles filename has not been set - [ERROR] backupFiles filename has not been set - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupFiles.php:52 - - - %s Files to backup. - %s Files to backup. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupFiles.php:62 - - - Backup files initialized in %s - Backup files initialized in %s - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupFiles.php:70 - - - Backup files in progress. %d files left - Backup files in progress. %d files left - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupFiles.php:76 - - - All files have been added to archive. - All files have been added to archive. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupFiles.php:93 - - - All files saved. Now backing up database - All files saved. Now backing up database - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupFiles.php:94 - - - - - - - Unable to open archive - Unable to open archive - Context: -File: modules/autoupgrade/classes/ZipAction.php:358 - - - %s is not a file - %s is not a file - Context: -File: modules/autoupgrade/classes/ZipAction.php:83 - - - Unable to create directory %s. - Unable to create directory %s. - Context: -File: modules/autoupgrade/classes/ZipAction.php:91 - - - [ERROR] Unable to list archived files - [ERROR] Unable to list archived files - Context: -File: modules/autoupgrade/classes/ZipAction.php:119 - - - Error when trying to add %filename% to archive %archive%. - Error when trying to add %filename% to archive %archive%. - Context: -File: modules/autoupgrade/classes/ZipAction.php:144 - - - %filename% added to archive. %filescount% files left. - %filename% added to archive. %filescount% files left. - Context: -File: modules/autoupgrade/classes/ZipAction.php:196 - - - Could not close the Zip file properly. Check you are allowed to write on the disk and there is available space on it. - Could not close the Zip file properly. Check you are allowed to write on the disk and there is available space on it. - Context: -File: modules/autoupgrade/classes/ZipAction.php:167 - - - [ERROR] Error on backup using PclZip: %s. - [ERROR] Error on backup using PclZip: %s. - Context: -File: modules/autoupgrade/classes/ZipAction.php:209 - - - extractTo(): unable to use %s as extract destination.]]> - extractTo(): unable to use %s as extract destination.]]> - Context: -File: modules/autoupgrade/classes/ZipAction.php:226 - - - Archive extracted - Archive extracted - Context: -File: modules/autoupgrade/classes/ZipAction.php:232 - - - [ERROR] Error on extracting archive using PclZip: %s. - [ERROR] Error on extracting archive using PclZip: %s. - Context: -File: modules/autoupgrade/classes/ZipAction.php:267 - - - [ERROR] %file% has not been unzipped: %status% - [ERROR] %file% has not been unzipped: %status% - Context: -File: modules/autoupgrade/classes/ZipAction.php:274 - - - File %filename% (size: %filesize%) has been skipped during backup. - File %filename% (size: %filesize%) has been skipped during backup. - Context: -File: modules/autoupgrade/classes/ZipAction.php:296 - - - Using class ZipArchive... - Using class ZipArchive... - Context: -File: modules/autoupgrade/classes/ZipAction.php:338 - - - Unable to open zipFile %s - Unable to open zipFile %s - Context: -File: modules/autoupgrade/classes/ZipAction.php:341 - - - Using class PclZip... - Using class PclZip... - Context: -File: modules/autoupgrade/classes/ZipAction.php:355 - - - - - - - Error during database upgrade. You may need to restore your database. - Error during database upgrade. You may need to restore your database. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeDb.php:48 - - - Database upgraded. Now upgrading your Addons modules... - Database upgraded. Now upgrading your Addons modules... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeDb.php:54 - - - - - - - Starting upgrade... - Starting upgrade... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:40 - - - Downloading and unzipping steps have been skipped, upgrade process will now remove sample data. - Downloading and unzipping steps have been skipped, upgrade process will now remove sample data. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:60 - - - Shop deactivated. Removing sample files... - Shop deactivated. Removing sample files... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:61 - - - Downloading step has been skipped, upgrade process will now unzip the local archive. - Downloading step has been skipped, upgrade process will now unzip the local archive. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:65 - - - Shop deactivated. Extracting files... - Shop deactivated. Extracting files... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:66 - - - Shop deactivated. Now downloading... (this can take a while) - Shop deactivated. Now downloading... (this can take a while) - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:70 - - - Downloaded archive will come from %s - Downloaded archive will come from %s - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:75 - - - MD5 hash will be checked against %s - MD5 hash will be checked against %s - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeNow.php:76 - - - - - - - Database backup skipped. Now upgrading files... - Database backup skipped. Now upgrading files... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:42 - - - Backup directory is not writable (%path%). - Backup directory is not writable (%path%). - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:52 - - - Backup file %s already exists. Operation aborted. - Backup file %s already exists. Operation aborted. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:122 - - - Unable to create backup database file %s. - Unable to create backup database file %s. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:136 - - - Error during database backup. - Error during database backup. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:169 - - - An error occurred while backing up. Unable to obtain the schema of %s - An error occurred while backing up. Unable to obtain the schema of %s - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:168 - - - %s table has been saved. - %s table has been saved. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:248 - - - %s tables have been saved. - %s tables have been saved. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:285 - - - Database backup: %s table(s) left... - Database backup: %s table(s) left... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:265 - - - No valid tables were found to back up. Backup of file %s canceled. - No valid tables were found to back up. Backup of file %s canceled. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:274 - - - Error during database backup for file %s. - Error during database backup for file %s. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:275 - - - Database backup done in filename %s. Now upgrading files... - Database backup done in filename %s. Now upgrading files... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/BackupDb.php:291 - - - - - - - The database has been cleaned. - The database has been cleaned. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/CleanDatabase.php:49 - - - - - - - listModules is not an array. No module has been updated. - listModules is not an array. No module has been updated. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeModules.php:54 - - - The files of module %s have been upgraded. - The files of module %s have been upgraded. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeModules.php:66 - - - %s modules left to upgrade. - %s modules left to upgrade. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeModules.php:82 - - - The %modulename% module is not compatible with version %version%, it will be removed from your FTP. - The %modulename% module is not compatible with version %version%, it will be removed from your FTP. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeModules.php:109 - - - The %modulename% module is not compatible with version %version%, please remove it from your FTP. - The %modulename% module is not compatible with version %version%, please remove it from your FTP. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeModules.php:118 - - - Addons modules files have been upgraded. - Addons modules files have been upgraded. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeModules.php:132 - - - %s modules will be upgraded. - %s modules will be upgraded. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeModules.php:153 - - - - - - - Could not assert the folder %s contains a valid PrestaShop release, exiting. - Could not assert the folder %s contains a valid PrestaShop release, exiting. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/RemoveSamples.php:50 - - - A file may be missing, or the release is stored in a subfolder by mistake. - A file may be missing, or the release is stored in a subfolder by mistake. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/RemoveSamples.php:51 - - - Starting to remove %s sample files - Starting to remove %s sample files - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/RemoveSamples.php:81 - - - Error while removing item %itemname%, %itemscount% items left. - Error while removing item %itemname%, %itemscount% items left. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/RemoveSamples.php:94 - - - %itemname% item removed. %itemscount% items left. - %itemname% item removed. %itemscount% items left. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/RemoveSamples.php:107 - - - All sample files removed. Now backing up files. - All sample files removed. Now backing up files. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/RemoveSamples.php:123 - - - All sample files removed. Backup process skipped. Now upgrading files. - All sample files removed. Backup process skipped. Now upgrading files. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/RemoveSamples.php:132 - - - - - - - You need allow_url_fopen or cURL enabled for automatic download to work. You can also manually upload it in filepath %s. - You need allow_url_fopen or cURL enabled for automatic download to work. You can also manually upload it in filepath %s. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:42 - - - Downloading from %s - Downloading from %s - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:63 - - - File will be saved in %s - File will be saved in %s - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:64 - - - Download directory has been emptied - Download directory has been emptied - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:67 - - - Download complete. - Download complete. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:77 - - - Download complete. Now extracting... - Download complete. Now extracting... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:78 - - - Download complete but MD5 sum does not match (%s). - Download complete but MD5 sum does not match (%s). - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:80 - - - Download complete but MD5 sum does not match (%s). Operation aborted. - Download complete but MD5 sum does not match (%s). Operation aborted. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:81 - - - Error during download. The private key may be incorrect. - Error during download. The private key may be incorrect. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:86 - - - Error during download - Error during download - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:88 - - - Download directory %s is not writable. - Download directory %s is not writable. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Download.php:93 - - - - - - - "/latest" directory has been emptied - "/latest" directory has been emptied - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Unzip.php:47 - - - Extraction directory %s is not writable. - Extraction directory %s is not writable. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Unzip.php:52 - - - Unable to extract %filepath% file into %destination% folder... - Unable to extract %filepath% file into %destination% folder... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Unzip.php:87 - - - No prestashop/ folder found in the ZIP file. Aborting. - No prestashop/ folder found in the ZIP file. Aborting. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Unzip.php:103 - - - File extraction complete. Removing sample files... - File extraction complete. Removing sample files... - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/Unzip.php:119 - - - - - - - Upgrade process done, but some warnings have been found. - Upgrade process done, but some warnings have been found. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeComplete.php:44 - - - Upgrade process done. Congratulations! You can now reactivate your shop. - Upgrade process done. Congratulations! You can now reactivate your shop. - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeComplete.php:45 - - - %s removed - %s removed - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeComplete.php:57 - - - Please remove %s by FTP - Please remove %s by FTP - Context: -File: modules/autoupgrade/classes/TaskRunner/Upgrade/UpgradeComplete.php:59 - - - - - - - File %s does not exist. Unable to select that channel. - File %s does not exist. Unable to select that channel. - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/UpdateConfig.php:65 - - - Version number is missing. Unable to select that channel. - Version number is missing. Unable to select that channel. - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/UpdateConfig.php:85 - - - Upgrade process will use archive. - Upgrade process will use archive. - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/UpdateConfig.php:79 - Comment: $config['archive_name'] = $request['archive_name']; - - - Error on saving configuration - Error on saving configuration - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/UpdateConfig.php:98 - - - Configuration successfully updated. - Configuration successfully updated. - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/UpdateConfig.php:124 - - - This page will now be reloaded and the module will check if a new version is available. - This page will now be reloaded and the module will check if a new version is available. - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/UpdateConfig.php:124 - - - - - - - Unable to check files for the installed version of PrestaShop. - Unable to check files for the installed version of PrestaShop. - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/CheckFilesVersion.php:47 - - - Core files are ok - Core files are ok - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/CheckFilesVersion.php:60 - - - %modificationscount% file modifications have been detected, including %coremodifications% from core and native modules: - %modificationscount% file modifications have been detected, including %coremodifications% from core and native modules: - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/CheckFilesVersion.php:64 - - - - - - - %modifiedfiles% files will be modified, %deletedfiles% files will be deleted (if they are found). - %modifiedfiles% files will be modified, %deletedfiles% files will be deleted (if they are found). - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/CompareReleases.php:72 - - - No diff files found. - No diff files found. - Context: -File: modules/autoupgrade/classes/TaskRunner/Miscellaneous/CompareReleases.php:79 - - - - - - - %s file(s) will be removed before restoring the backup files. - %s file(s) will be removed before restoring the backup files. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreFiles.php:69 - - - [ERROR] Backup file %s does not exist. - [ERROR] Backup file %s does not exist. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreFiles.php:74 - - - [ERROR] File "%s" does not exist. - [ERROR] File "%s" does not exist. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreFiles.php:77 - - - Unable to remove upgraded files. - Unable to remove upgraded files. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreFiles.php:79 - - - Unable to extract file %filename% into directory %directoryname%. - Unable to extract file %filename% into directory %directoryname%. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreFiles.php:94 - - - Files restored. - Files restored. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreFiles.php:112 - - - Files restored. Now restoring database... - Files restored. Now restoring database... - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreFiles.php:113 - - - - - - - Nothing to restore - Nothing to restore - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/NoRollbackFound.php:36 - - - - - - - %s: File format does not match. - %s: File format does not match. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:66 - - - Opening backup database file %filename% in %extension% mode - Opening backup database file %filename% in %extension% mode - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:79 - - - Database backup is empty. - Database backup is empty. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:117 - - - Database restoration file %filename% done. %filescount% file(s) left... - Database restoration file %filename% done. %filescount% file(s) left... - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:165 - - - Database restoration file %1$s done. - Database restoration file %1$s done. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:173 - - - Database has been restored. - Database has been restored. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:182 - - - [SQL ERROR] - [SQL ERROR] - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:202 - - - Error during database restoration - Error during database restoration - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:203 - - - %numberqueries% queries left for file %filename%... - %numberqueries% queries left for file %filename%... - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:230 - - - Database restoration done. - Database restoration done. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RestoreDb.php:242 - - - - - - - Restoration process done. Congratulations! You can now reactivate your shop. - Restoration process done. Congratulations! You can now reactivate your shop. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/RollbackComplete.php:39 - - - - - - - [ERROR] File %s is missing: unable to restore files. Operation aborted. - [ERROR] File %s is missing: unable to restore files. Operation aborted. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/Rollback.php:62 - - - [ERROR] No backup database files found: it would be impossible to restore the database. Operation aborted. - [ERROR] No backup database files found: it would be impossible to restore the database. Operation aborted. - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/Rollback.php:78 - - - Restoring files ... - Restoring files ... - Context: -File: modules/autoupgrade/classes/TaskRunner/Rollback/Rollback.php:84 - - - - - - - Action %s skipped - Action %s skipped - Context: -File: modules/autoupgrade/classes/TaskRunner/AbstractTask.php:114 - - - - diff --git a/app/Resources/translations/default/ModulesBuybuttonliteAdmin.xlf b/app/Resources/translations/default/ModulesBuybuttonliteAdmin.xlf index b5253b900c5bc..f412682b98635 100644 --- a/app/Resources/translations/default/ModulesBuybuttonliteAdmin.xlf +++ b/app/Resources/translations/default/ModulesBuybuttonliteAdmin.xlf @@ -14,9 +14,9 @@ File: modules/ps_buybuttonlite/ps_buybuttonlite.php:49 Context: File: modules/ps_buybuttonlite/ps_buybuttonlite.php:50 - - Select Product - Select Product + + Select a product + Select a product Context: File: modules/ps_buybuttonlite/ps_buybuttonlite.php:150 @@ -37,12 +37,6 @@ File: modules/ps_buybuttonlite/ps_buybuttonlite.php:154 Please select an action Context: File: modules/ps_buybuttonlite/ps_buybuttonlite.php:155 - - - Copy to clipboard - Copy to clipboard - Context: -File: modules/ps_buybuttonlite/ps_buybuttonlite.php:156 Please select a product and an action @@ -55,16 +49,10 @@ File: modules/ps_buybuttonlite/ps_buybuttonlite.php:157 Link copied to clipboard Context: File: modules/ps_buybuttonlite/ps_buybuttonlite.php:158 - - - Screenshots - Screenshots - Context: -File: modules/ps_buybuttonlite/ps_buybuttonlite.php:164 - Want to go further - Want to go further + Want to go further? + Want to go further? Context: File: modules/ps_buybuttonlite/ps_buybuttonlite.php:165 diff --git a/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf b/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf index 8a69970117010..1a5da98320fb1 100644 --- a/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf +++ b/app/Resources/translations/default/ModulesEmailsubscriptionAdmin.xlf @@ -230,6 +230,18 @@ File: modules/ps_emailsubscription/ps_emailsubscription.php:1118 Context: File: modules/ps_emailsubscription/ps_emailsubscription.php:1131 + + Newsletter subscription: no email to delete, this customer has not registered. + Newsletter subscription: no email to delete, this customer has not registered. + Context: + File: modules/ps_emailsubscription/ps_emailsubscription.php:1267 + + + Newsletter subscription: no email to export, this customer has not registered. + Newsletter subscription: no email to export, this customer has not registered. + Context: + File: modules/ps_emailsubscription/ps_emailsubscription.php:1277 + diff --git a/app/Resources/translations/default/ModulesEmailsubscriptionShop.xlf b/app/Resources/translations/default/ModulesEmailsubscriptionShop.xlf index 26b4a307549f2..fcf445038ae61 100644 --- a/app/Resources/translations/default/ModulesEmailsubscriptionShop.xlf +++ b/app/Resources/translations/default/ModulesEmailsubscriptionShop.xlf @@ -1,5 +1,15 @@ + + + + Newsletter subscription + Newsletter subscription + Context: + File: modules/ps_emailsubscription/views/templates/front/subscription_execution.tpl:29 + + + diff --git a/app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf b/app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf index 6eda5ce26f911..0b7f9c71ea48f 100644 --- a/app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf +++ b/app/Resources/translations/default/ModulesFaviconnotificationboAdmin.xlf @@ -38,4 +38,20 @@ File: modules/ps_faviconnotificationbo/views/templates/admin/menu.tpl:30 + + + + Order Notifications on the Favicon + Order Notifications on the Favicon + Context: + File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:58 + + + Be notified of each new order, client or message directly in the browser tab of your back office, even when working on another page + Be notified of each new order, client or message directly in the browser tab of your back office, even when working on another page + Context: + File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:59 + + + diff --git a/app/Resources/translations/default/ModulesGAnalyticsAdmin.xlf b/app/Resources/translations/default/ModulesGAnalyticsAdmin.xlf index 4f905da15ef49..a52b5357de14e 100644 --- a/app/Resources/translations/default/ModulesGAnalyticsAdmin.xlf +++ b/app/Resources/translations/default/ModulesGAnalyticsAdmin.xlf @@ -20,6 +20,42 @@ File: modules/ps_googleanalytics/ps_googleanalytics.php:52 Context: File: modules/ps_googleanalytics/ps_googleanalytics.php:54 + + Google Analytics Tracking ID + Google Analytics Tracking ID + Context: + File: modules/ps_googleanalytics/ps_googleanalytics.php:184 + + + This information is available in your Google Analytics account + This information is available in your Google Analytics account + Context: + File: modules/ps_googleanalytics/ps_googleanalytics.php:188 + + + Enable User ID tracking + Enable User ID tracking + Context: + File: modules/ps_googleanalytics/ps_googleanalytics.php:192 + + + Anonymize IP + Anonymize IP + Context: + File: modules/ps_googleanalytics/ps_googleanalytics.php:208 + + + Use this option to anonymize the visitor’s IP to comply with data privacy laws in some countries + Use this option to anonymize the visitor’s IP to comply with data privacy laws in some countries + Context: + File: modules/ps_googleanalytics/ps_googleanalytics.php:210 + + + Enable Cross-Domain tracking + Enable Cross-Domain tracking + Context: + File: modules/ps_googleanalytics/ps_googleanalytics.php:233 + Account ID updated successfully Account ID updated successfully diff --git a/app/Resources/translations/default/ModulesGsitemapAdmin.xlf b/app/Resources/translations/default/ModulesGsitemapAdmin.xlf new file mode 100644 index 0000000000000..6d9d572c74260 --- /dev/null +++ b/app/Resources/translations/default/ModulesGsitemapAdmin.xlf @@ -0,0 +1,257 @@ + + + + + + Your sitemaps were successfully created. Please do not forget to setup the URL + Your sitemaps were successfully created. Please do not forget to setup the URL + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + in your Google Webmaster account. + in your Google Webmaster account. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Your sitemaps + Your sitemaps + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Sitemaps were already created. + Sitemaps were already created. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Continue + Continue + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Please set up the following sitemap URL in your Google Webmaster account: + Please set up the following sitemap URL in your Google Webmaster account: + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + This URL is the master sitemaps file. It refers to the following sub-sitemap files: + This URL is the master sitemaps file. It refers to the following sub-sitemap files: + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Your last update was made on this date: + Your last update was made on this date: + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + For a better use of the module, please make sure that you have + For a better use of the module, please make sure that you have + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + A minimum memory_limit value of 128 MB. + A minimum memory_limit value of 128 MB. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + A minimum max_execution_time value of 30 seconds. + A minimum max_execution_time value of 30 seconds. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + You can edit these limits in your php.ini file. For more details, please contact your hosting provider. + You can edit these limits in your php.ini file. For more details, please contact your hosting provider. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Configure your sitemap + Configure your sitemap + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Several sitemap files will be generated depending on how your server is configured and on the number of activated products in your catalog. + Several sitemap files will be generated depending on how your server is configured and on the number of activated products in your catalog. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + How often do you update your store? + How often do you update your store? + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + always + always + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + hourly + hourly + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + daily + daily + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + weekly + weekly + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + monthly + monthly + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + yearly + yearly + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + never + never + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Check this box if you wish to check the presence of the image files on the server + Check this box if you wish to check the presence of the image files on the server + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Check all + Check all + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Indicate the pages that you do not want to include in your sitemap files: + Indicate the pages that you do not want to include in your sitemap files: + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Generate sitemap + Generate sitemap + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + This can take several minutes + This can take several minutes + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + You have two ways to generate sitemaps. + You have two ways to generate sitemaps. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Manually: + Manually: + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Using the form above (as often as needed) + Using the form above (as often as needed) + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + -or- + -or- + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Automatically: + Automatically: + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Ask your hosting provider to setup a "Cron task" to load the following URL at the time you would like: + Ask your hosting provider to setup a "Cron task" to load the following URL at the time you would like: + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + It will automatically generate your XML sitemaps. + It will automatically generate your XML sitemaps. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Uncheck all + Uncheck all + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + This shop has no sitemap yet. + This shop has no sitemap yet. + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Generating a sitemap can take several minutes + Generating a sitemap can take several minutes + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + Information + Information + Context: + File: modules/gsitemap/views/templates/admin/configuration.tpl + + + + + + + Google sitemap + Google sitemap + Context: + File: modules/gsitemap/gsitemap.php + + + Generate your Google sitemap file + Generate your Google sitemap file + Context: + File: modules/gsitemap/gsitemap.php + + + An error occured while trying to check your file permissions. Please adjust your permissions to allow PrestaShop to write a file in your root directory. + An error occured while trying to check your file permissions. Please adjust your permissions to allow PrestaShop to write a file in your root directory. + Context: + File: modules/gsitemap/gsitemap.php + + + + diff --git a/app/Resources/translations/default/messages.xlf b/app/Resources/translations/default/messages.xlf index 5315ee986546c..a0b1da5aa01a1 100644 --- a/app/Resources/translations/default/messages.xlf +++ b/app/Resources/translations/default/messages.xlf @@ -1,357 +1,5 @@ - - - - Comment: - Comment: - Context: -File: modules/prestafraud/prestafraud.php:535 - - - PrestaShop Security - PrestaShop Security - Context: -File: modules/prestafraud/prestafraud.php:528 - - - Protect your store from fraudulent payments - Protect your store from fraudulent payments - Context: -File: modules/prestafraud/prestafraud.php:52 - - - -- Please choose your main activity -- - -- Please choose your main activity -- - Context: -File: modules/prestafraud/prestafraud.php:55 - - - Adult - Adult - Context: -File: modules/prestafraud/prestafraud.php:56 - - - Animals and Pets - Animals and Pets - Context: -File: modules/prestafraud/prestafraud.php:57 - - - Art and Culture - Art and Culture - Context: -File: modules/prestafraud/prestafraud.php:58 - - - Babies - Babies - Context: -File: modules/prestafraud/prestafraud.php:59 - - - Beauty and Personal Care - Beauty and Personal Care - Context: -File: modules/prestafraud/prestafraud.php:60 - - - Cars - Cars - Context: -File: modules/prestafraud/prestafraud.php:61 - - - Computer Hardware and Software - Computer Hardware and Software - Context: -File: modules/prestafraud/prestafraud.php:62 - - - Fashion and accessories - Fashion and accessories - Context: -File: modules/prestafraud/prestafraud.php:64 - - - Flowers, Gifts and Crafts - Flowers, Gifts and Crafts - Context: -File: modules/prestafraud/prestafraud.php:65 - - - Food and beverage - Food and beverage - Context: -File: modules/prestafraud/prestafraud.php:66 - - - HiFi, Photo and Video - HiFi, Photo and Video - Context: -File: modules/prestafraud/prestafraud.php:67 - - - Home and Garden - Home and Garden - Context: -File: modules/prestafraud/prestafraud.php:68 - - - Home Appliances - Home Appliances - Context: -File: modules/prestafraud/prestafraud.php:69 - - - Jewelry - Jewelry - Context: -File: modules/prestafraud/prestafraud.php:70 - - - Mobile and Telecom - Mobile and Telecom - Context: -File: modules/prestafraud/prestafraud.php:71 - - - Services - Services - Context: -File: modules/prestafraud/prestafraud.php:72 - - - Shoes and accessories - Shoes and accessories - Context: -File: modules/prestafraud/prestafraud.php:73 - - - Sport and Entertainment - Sport and Entertainment - Context: -File: modules/prestafraud/prestafraud.php:74 - - - Travel - Travel - Context: -File: modules/prestafraud/prestafraud.php:75 - - - Cheque - Cheque - Context: -File: modules/prestafraud/prestafraud.php:79 - - - Bankwire - Bankwire - Context: -File: modules/prestafraud/prestafraud.php:80 - - - Credit card - Credit card - Context: -File: modules/prestafraud/prestafraud.php:81 - - - Credit card multiple - Credit card multiple - Context: -File: modules/prestafraud/prestafraud.php:82 - - - Prepaid account (MoneyBookers, PayPal...) - Prepaid account (MoneyBookers, PayPal...) - Context: -File: modules/prestafraud/prestafraud.php:83 - - - Please accept the terms of service. - Please accept the terms of service. - Context: -File: modules/prestafraud/prestafraud.php:146 - - - PrestaShop Security configuration - PrestaShop Security configuration - Context: -File: modules/prestafraud/prestafraud.php:152 - - - My shop does not have a PrestaShop Security account yet - My shop does not have a PrestaShop Security account yet - Context: -File: modules/prestafraud/prestafraud.php:156 - - - I already have an account - I already have an account - Context: -File: modules/prestafraud/prestafraud.php:157 - - - Your email - Your email - Context: -File: modules/prestafraud/prestafraud.php:164 - - - Shop Url - Shop Url - Context: -File: modules/prestafraud/prestafraud.php:168 - - - I agree with the terms of PrestaShop Security service and I adhere to them unconditionally. - I agree with the terms of PrestaShop Security service and I adhere to them unconditionally. - Context: -File: modules/prestafraud/prestafraud.php:173 - - - Create account - Create account - Context: -File: modules/prestafraud/prestafraud.php:180 - - - Shop ID - Shop ID - Context: -File: modules/prestafraud/prestafraud.php:187 - - - Shop KEY - Shop KEY - Context: -File: modules/prestafraud/prestafraud.php:191 - - - Shop activity - Shop activity - Context: -File: modules/prestafraud/prestafraud.php:196 - - - Carriers - Carriers - Context: -File: modules/prestafraud/prestafraud.php:209 - - - Carrier - Carrier - Context: -File: modules/prestafraud/prestafraud.php:212 - - - Carrier Type - Carrier Type - Context: -File: modules/prestafraud/prestafraud.php:212 - - - Choose a carrier type... - Choose a carrier type... - Context: -File: modules/prestafraud/prestafraud.php:217 - - - Payments - Payments - Context: -File: modules/prestafraud/prestafraud.php:228 - - - Payment Module - Payment Module - Context: -File: modules/prestafraud/prestafraud.php:231 - - - Payment Type - Payment Type - Context: -File: modules/prestafraud/prestafraud.php:231 - - - Choose a payment type... - Choose a payment type... - Context: -File: modules/prestafraud/prestafraud.php:237 - - - Email is invalid - Email is invalid - Context: -File: modules/prestafraud/prestafraud.php:277 - - - Shop URL is invalid - Shop URL is invalid - Context: -File: modules/prestafraud/prestafraud.php:279 - - - Impossible to create a new account, please report this bug on http://forge.prestashop.com/ - Impossible to create a new account, please report this bug on http://forge.prestashop.com/ - Context: -File: modules/prestafraud/prestafraud.php:307 - - - This order has not been sent to PrestaShop Security. - This order has not been sent to PrestaShop Security. - Context: -File: modules/prestafraud/prestafraud.php:530 - - - Scoring: - Scoring: - Context: -File: modules/prestafraud/prestafraud.php:534 - - - Unknown - Unknown - Context: -File: modules/prestafraud/prestafraud.php:534 - - - Report this order as a fraud to PrestaShop - Report this order as a fraud to PrestaShop - Context: -File: modules/prestafraud/prestafraud.php:536 - - - Pick up in-store - Pick up in-store - Context: -File: modules/prestafraud/prestafraud.php:567 - - - Withdrawal point - Withdrawal point - Context: -File: modules/prestafraud/prestafraud.php:568 - - - Slow shipping more than 3 days - Slow shipping more than 3 days - Context: -File: modules/prestafraud/prestafraud.php:569 - - - Shipping express - Shipping express - Context: -File: modules/prestafraud/prestafraud.php:570 - - - @@ -1046,1495 +694,23 @@ File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl Context: File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:44 - - or - or - Context: -File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:81 - - - The locale must be installed - The locale must be installed - Context: -File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:188 - - - Multiple value separator - Multiple value separator - Context: -File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:208 - - - - - - - Mail alert: Unable to delete customer using email. - Mail alert: Unable to delete customer using email. - Context: -File: modules/ps_emailalerts/ps_emailalerts.php:1091 - - - Mail alert: Unable to export customer using email. - Mail alert: Unable to export customer using email. - Context: -File: modules/ps_emailalerts/ps_emailalerts.php:1102 - - - - - - - This functionality has been disabled. - This functionality has been disabled. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:279 - - - [TECHNICAL ERROR] ajax-upgradetab.php is missing. Please reinstall or reset the module. - [TECHNICAL ERROR] ajax-upgradetab.php is missing. Please reinstall or reset the module. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:287 - - - Are you sure you want to delete this backup? - Are you sure you want to delete this backup? - Context: -File: modules/autoupgrade/classes/UpgradePage.php:324 - - - An update is currently in progress... Click "OK" to abort. - An update is currently in progress... Click "OK" to abort. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:326 - - - Upgrading PrestaShop - Upgrading PrestaShop - Context: -File: modules/autoupgrade/classes/UpgradePage.php:327 - - - Upgrade complete - Upgrade complete - Context: -File: modules/autoupgrade/classes/UpgradePage.php:328 - - - Upgrade complete, but warning notifications has been found. - Upgrade complete, but warning notifications has been found. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:329 - - - Cookies have changed, you will need to log in again once you refreshed the page - Cookies have changed, you will need to log in again once you refreshed the page - Context: -File: modules/autoupgrade/classes/UpgradePage.php:331 - - - Javascript and CSS files have changed, please clear your browser cache with CTRL-F5 - Javascript and CSS files have changed, please clear your browser cache with CTRL-F5 - Context: -File: modules/autoupgrade/classes/UpgradePage.php:332 - - - Please check that your front-office theme is functional (try to create an account, place an order...) - Please check that your front-office theme is functional (try to create an account, place an order...) - Context: -File: modules/autoupgrade/classes/UpgradePage.php:333 - - - Images]]> - Images]]> - Context: -File: modules/autoupgrade/classes/UpgradePage.php:334 - - - Do not forget to reactivate your shop once you have checked everything! - Do not forget to reactivate your shop once you have checked everything! - Context: -File: modules/autoupgrade/classes/UpgradePage.php:335 - - - ToDo list: - ToDo list: - Context: -File: modules/autoupgrade/classes/UpgradePage.php:337 - - - Starting restoration... - Starting restoration... - Context: -File: modules/autoupgrade/classes/UpgradePage.php:338 - - - Restoration complete. - Restoration complete. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:339 - - - Your server cannot download the file. Please upload it first by ftp in your admin/autoupgrade directory - Your server cannot download the file. Please upload it first by ftp in your admin/autoupgrade directory - Context: -File: modules/autoupgrade/classes/UpgradePage.php:340 - - - Javascript error (parseJSON) detected for action - Javascript error (parseJSON) detected for action - Context: -File: modules/autoupgrade/classes/UpgradePage.php:341 - - - Manually go to %s button - Manually go to %s button - Context: -File: modules/autoupgrade/classes/UpgradePage.php:342 - - - End of process - End of process - Context: -File: modules/autoupgrade/classes/UpgradePage.php:343 - - - Operation canceled. Checking for restoration... - Operation canceled. Checking for restoration... - Context: -File: modules/autoupgrade/classes/UpgradePage.php:344 - - - Do you want to restore %s? - Do you want to restore %s? - Context: -File: modules/autoupgrade/classes/UpgradePage.php:345 - - - Operation canceled. An error happened. - Operation canceled. An error happened. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:346 - - - [TECHNICAL ERROR] ajax-upgradetab.php is missing. Please reinstall the module. - [TECHNICAL ERROR] ajax-upgradetab.php is missing. Please reinstall the module. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:347 - - - Click to refresh the page and use the new configuration - Click to refresh the page and use the new configuration - Context: -File: modules/autoupgrade/classes/UpgradePage.php:348 - - - Error detected during - Error detected during - Context: -File: modules/autoupgrade/classes/UpgradePage.php:349 - - - The request exceeded the max_time_limit. Please change your server configuration. - The request exceeded the max_time_limit. Please change your server configuration. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:350 - - - See or hide the list - See or hide the list - Context: -File: modules/autoupgrade/classes/UpgradePage.php:351 - - - Core file(s) - Core file(s) - Context: -File: modules/autoupgrade/classes/UpgradePage.php:352 - - - Mail file(s) - Mail file(s) - Context: -File: modules/autoupgrade/classes/UpgradePage.php:353 - - - Translation file(s) - Translation file(s) - Context: -File: modules/autoupgrade/classes/UpgradePage.php:354 - - - Link and MD5 hash cannot be empty - Link and MD5 hash cannot be empty - Context: -File: modules/autoupgrade/classes/UpgradePage.php:355 - - - You need to enter the version number associated with the archive. - You need to enter the version number associated with the archive. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:356 - - - No archive has been selected. - No archive has been selected. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:357 - - - You need to enter the version number associated with the directory. - You need to enter the version number associated with the directory. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:358 - - - Please confirm that you want to skip the backup. - Please confirm that you want to skip the backup. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:359 - - - Please confirm that you want to preserve file options. - Please confirm that you want to preserve file options. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:360 - - - Less options - Less options - Context: -File: modules/autoupgrade/classes/UpgradePage.php:361 - - - These files will be deleted - These files will be deleted - Context: -File: modules/autoupgrade/classes/UpgradePage.php:363 - - - These files will be replaced - These files will be replaced - Context: -File: modules/autoupgrade/classes/UpgradePage.php:364 - - - Required field - Required field - Context: -File: modules/autoupgrade/classes/UpgradePage.php:379 - - - Too long! - Too long! - Context: -File: modules/autoupgrade/classes/UpgradePage.php:380 - - - Fields are different! - Fields are different! - Context: -File: modules/autoupgrade/classes/UpgradePage.php:381 - - - This email address is wrong! - This email address is wrong! - Context: -File: modules/autoupgrade/classes/UpgradePage.php:382 - - - Impossible to send the email! - Impossible to send the email! - Context: -File: modules/autoupgrade/classes/UpgradePage.php:383 - - - Cannot create settings file, if /app/config/parameters.php exists, please give the public write permissions to this file, else please create a file named parameters.php in config directory. - Cannot create settings file, if /app/config/parameters.php exists, please give the public write permissions to this file, else please create a file named parameters.php in config directory. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:384 - - - Cannot write settings file, please create a file named settings.inc.php in the "config" directory. - Cannot write settings file, please create a file named settings.inc.php in the "config" directory. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:385 - - - Impossible to upload the file! - Impossible to upload the file! - Context: -File: modules/autoupgrade/classes/UpgradePage.php:386 - - - Data integrity is not valided. Hack attempt? - Data integrity is not valided. Hack attempt? - Context: -File: modules/autoupgrade/classes/UpgradePage.php:387 - - - Impossible to read the content of a MySQL content file. - Impossible to read the content of a MySQL content file. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:388 - - - Cannot access a MySQL content file. - Cannot access a MySQL content file. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:389 - - - Error while inserting data in the database: - Error while inserting data in the database: - Context: -File: modules/autoupgrade/classes/UpgradePage.php:390 - - - This is not a valid file name. - This is not a valid file name. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:393 - - - This is not a valid image file. - This is not a valid image file. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:394 - - - Error while creating the /app/config/parameters.php file. - Error while creating the /app/config/parameters.php file. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:395 - - - Error: - Error: - Context: -File: modules/autoupgrade/classes/UpgradePage.php:396 - - - This PrestaShop database already exists. Please revalidate your authentication information to the database. - This PrestaShop database already exists. Please revalidate your authentication information to the database. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:397 - - - An error occurred while resizing the picture. - An error occurred while resizing the picture. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:398 - - - Database connection is available! - Database connection is available! - Context: -File: modules/autoupgrade/classes/UpgradePage.php:399 - - - Database Server is available but database is not found - Database Server is available but database is not found - Context: -File: modules/autoupgrade/classes/UpgradePage.php:400 - - - Database Server is not found. Please verify the login, password and server fields. - Database Server is not found. Please verify the login, password and server fields. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:401 - - - An error occurred while sending email, please verify your parameters. - An error occurred while sending email, please verify your parameters. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:402 - - - Impossible to write the image /img/logo.jpg. If this image already exists, please delete it. - Impossible to write the image /img/logo.jpg. If this image already exists, please delete it. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:403 - - - The uploaded file exceeds the upload_max_filesize directive in php.ini - The uploaded file exceeds the upload_max_filesize directive in php.ini - Context: -File: modules/autoupgrade/classes/UpgradePage.php:404 - - - The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form - The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form - Context: -File: modules/autoupgrade/classes/UpgradePage.php:405 - - - The uploaded file was only partially uploaded - The uploaded file was only partially uploaded - Context: -File: modules/autoupgrade/classes/UpgradePage.php:406 - - - No file was uploaded. - No file was uploaded. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:407 - - - Missing a temporary folder - Missing a temporary folder - Context: -File: modules/autoupgrade/classes/UpgradePage.php:408 - - - Failed to write file to disk - Failed to write file to disk - Context: -File: modules/autoupgrade/classes/UpgradePage.php:409 - - - File upload stopped by extension - File upload stopped by extension - Context: -File: modules/autoupgrade/classes/UpgradePage.php:410 - - - Cannot convert your database's data to utf-8. - Cannot convert your database's data to utf-8. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:411 - - - Your MySQL server does not support this engine, please use another one like MyISAM - Your MySQL server does not support this engine, please use another one like MyISAM - Context: -File: modules/autoupgrade/classes/UpgradePage.php:415 - - - Your lastname contains some invalid characters - Your lastname contains some invalid characters - Context: -File: modules/autoupgrade/classes/UpgradePage.php:416 - - - The file /img/logo.jpg is not writable, please CHMOD 755 this file or CHMOD 777 - The file /img/logo.jpg is not writable, please CHMOD 755 this file or CHMOD 777 - Context: -File: modules/autoupgrade/classes/UpgradePage.php:417 - - - Invalid catalog mode - Invalid catalog mode - Context: -File: modules/autoupgrade/classes/UpgradePage.php:418 - - - No error code available - No error code available - Context: -File: modules/autoupgrade/classes/UpgradePage.php:419 - - - This installer is too old. - This installer is too old. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:421 - Comment: upgrader - - - You already have the %s version. - You already have the %s version. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:422 - - - There is no older version. Did you delete or rename the app/config/parameters.php file? - There is no older version. Did you delete or rename the app/config/parameters.php file? - Context: -File: modules/autoupgrade/classes/UpgradePage.php:423 - - - The app/config/parameters.php file was not found. Did you delete or rename this file? - The app/config/parameters.php file was not found. Did you delete or rename this file? - Context: -File: modules/autoupgrade/classes/UpgradePage.php:424 - - - Cannot find the SQL upgrade files. Please verify that the /install/upgrade/sql folder is not empty. - Cannot find the SQL upgrade files. Please verify that the /install/upgrade/sql folder is not empty. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:425 - - - No upgrade is possible. - No upgrade is possible. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:426 - - - Error while loading SQL upgrade file. - Error while loading SQL upgrade file. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:427 - - - Error while inserting content into the database - Error while inserting content into the database - Context: -File: modules/autoupgrade/classes/UpgradePage.php:428 - - - Unfortunately, - Unfortunately, - Context: -File: modules/autoupgrade/classes/UpgradePage.php:429 - - - SQL errors have occurred. - SQL errors have occurred. - Context: -File: modules/autoupgrade/classes/UpgradePage.php:430 - - - The config/defines.inc.php file was not found. Where did you move it? - The config/defines.inc.php file was not found. Where did you move it? - Context: -File: modules/autoupgrade/classes/UpgradePage.php:431 - - - - - - - More options (Expert mode) - More options (Expert mode) - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:67 - - - Start your Upgrade - Start your Upgrade - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:5 - - - You come from the future! You are using a more recent version than the latest available! - You come from the future! You are using a more recent version than the latest available! - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:9 - - - Congratulations, you are already using the latest version available! - Congratulations, you are already using the latest version available! - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:11 - - - Your current PrestaShop version - Your current PrestaShop version - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:14 - - - Latest official version for %s channel. - Latest official version for %s channel. - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:17 - - - Upgrade PrestaShop now! - Upgrade PrestaShop now! - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:23 - - - PrestaShop will be downloaded from %s - PrestaShop will be downloaded from %s - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:25 - - - Open changelog in a new window - Open changelog in a new window - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:28 - - - No file will be downloaded (channel %s is used) - No file will be downloaded (channel %s is used) - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:32 - - - The following action are automatically replaced - The following action are automatically replaced - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:37 - - - %old% will be replaced by %new% - %old% will be replaced by %new% - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:41 - - - To change this behavior, you need to manually edit your php files - To change this behavior, you need to manually edit your php files - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:45 - - - Refresh the page - Refresh the page - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:52 - - - Check if a new version is available - Check if a new version is available - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:54 - - - Last check: %s - Last check: %s - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:57 - - - Last check: never - Last check: never - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:59 - - - Expert mode - Expert mode - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:72 - - - Please select your channel: - Please select your channel: - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:73 - - - Channels are offering you different ways to perform an upgrade. You can either upload the new version manually or let the 1-Click Upgrade module download it for you. - Channels are offering you different ways to perform an upgrade. You can either upload the new version manually or let the 1-Click Upgrade module download it for you. - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:75 - - - The Alpha, Beta and Private channels give you the ability to upgrade to a non-official or unstable release (for testing purposes only). - The Alpha, Beta and Private channels give you the ability to upgrade to a non-official or unstable release (for testing purposes only). - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:76 - - - By default, you should use the "Minor release" channel which is offering the latest stable version available. - By default, you should use the "Minor release" channel which is offering the latest stable version available. - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:77 - - - Channel: - Channel: - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:80 - - - This option regroup all stable versions. - This option regroup all stable versions. - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:92 - - - Link: - Link: - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:96 - - - Hash key: - Hash key: - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:99 - - - Allow major upgrade: - Allow major upgrade: - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:102 - - - Archive to use: - Archive to use: - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:108 - - - Choose an archive - Choose an archive - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:111 - - - Number of the version you want to upgrade to: - Number of the version you want to upgrade to: - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:118 - - - No archive found in your admin/autoupgrade/download directory - No archive found in your admin/autoupgrade/download directory - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:122 - - - Save in the following directory the archive file of the version you want to upgrade to: %s - Save in the following directory the archive file of the version you want to upgrade to: %s - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:125 - - - Click "Save" once the archive is there. - Click "Save" once the archive is there. - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:137 - - - This option will skip the download step. - This option will skip the download step. - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:127 - - - Save in the following directory the uncompressed PrestaShop files of the version you want to upgrade to: %s - Save in the following directory the uncompressed PrestaShop files of the version you want to upgrade to: %s - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:132 - - - Please tell us which version you are upgrading to [1](1.7.0.1 for instance)[/1] - Please tell us which version you are upgrading to [1](1.7.0.1 for instance)[/1] - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:134 - - - This option will skip both download and unzip steps and will use %1$s as the source directory - This option will skip both download and unzip steps and will use %1$s as the source directory - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:138 - - - Step - Step - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:152 - - - Upgrade steps - Upgrade steps - Context: -File: modules/autoupgrade/views/templates/block/upgradeButtonBlock.twig:153 - - - - - - - Back up my files and database - Back up my files and database - Context: -File: modules/autoupgrade/classes/Twig/Form/BackupOptionsForm.php:59 - - - Automatically back up your database and files in order to restore your shop if needed. This is experimental: you should still perform your own manual backup for safety. - Automatically back up your database and files in order to restore your shop if needed. This is experimental: you should still perform your own manual backup for safety. - Context: -File: modules/autoupgrade/classes/Twig/Form/BackupOptionsForm.php:68 - - - Back up my images - Back up my images - Context: -File: modules/autoupgrade/classes/Twig/Form/BackupOptionsForm.php:75 - - - To save time, you can decide not to back your images up. In any case, always make sure you did back them up manually. - To save time, you can decide not to back your images up. In any case, always make sure you did back them up manually. - Context: -File: modules/autoupgrade/classes/Twig/Form/BackupOptionsForm.php:84 - - - - - - - Server performance - Server performance - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:60 - - - Unless you are using a dedicated server, select "Low". - Unless you are using a dedicated server, select "Low". - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:68 - - - A high value can cause the upgrade to fail if your server is not powerful enough to process the upgrade tasks in a short amount of time. - A high value can cause the upgrade to fail if your server is not powerful enough to process the upgrade tasks in a short amount of time. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:73 - - - Low (recommended) - Low (recommended) - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:79 - - - Medium - Medium - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:83 - - - High - High - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:85 - - - Disable non-native modules - Disable non-native modules - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:93 - - - As non-native modules can experience some compatibility issues, we recommend to disable them by default. - As non-native modules can experience some compatibility issues, we recommend to disable them by default. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:101 - - - Keeping them enabled might prevent you from loading the "Modules" page properly after the upgrade. - Keeping them enabled might prevent you from loading the "Modules" page properly after the upgrade. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:106 - - - Upgrade the default theme - Upgrade the default theme - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:113 - - - If you customized the default PrestaShop theme in its folder (folder name "classic" in 1.7), enabling this option will lose your modifications. - If you customized the default PrestaShop theme in its folder (folder name "classic" in 1.7), enabling this option will lose your modifications. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:122 - - - If you are using your own theme, enabling this option will simply update the default theme files, and your own theme will be safe. - If you are using your own theme, enabling this option will simply update the default theme files, and your own theme will be safe. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:127 - - - Switch to the default theme - Switch to the default theme - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:135 - - - This will change your theme: your shop will then use the default theme of the version of PrestaShop you are upgrading to. - This will change your theme: your shop will then use the default theme of the version of PrestaShop you are upgrading to. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:144 - - - Keep the customized email templates - Keep the customized email templates - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:152 - - - This will not upgrade the default PrestaShop e-mails. - This will not upgrade the default PrestaShop e-mails. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:160 - - - If you customized the default PrestaShop e-mail templates, enabling this option will keep your modifications. - If you customized the default PrestaShop e-mail templates, enabling this option will keep your modifications. - Context: -File: modules/autoupgrade/classes/Twig/Form/UpgradeOptionsForm.php:165 - - - - - - - Settings file updated - Settings file updated - Context: -File: modules/autoupgrade/classes/UpgradeTools/CoreUpgrader/CoreUpgrader16.php:76 - - - - - - - Error when opening settings.inc.php file in write mode - Error when opening settings.inc.php file in write mode - Context: -File: modules/autoupgrade/classes/UpgradeTools/SettingsFileWriter.php:60 - - - Error when generating new settings.inc.php file. - Error when generating new settings.inc.php file. - Context: -File: modules/autoupgrade/classes/UpgradeTools/SettingsFileWriter.php:71 - - - - - - - Settings - Settings - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:179 - - - Google Analytics Tracking ID - Google Analytics Tracking ID - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:184 - - - This information is available in your Google Analytics account - This information is available in your Google Analytics account - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:188 - - - Enable User ID tracking - Enable User ID tracking - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:192 - - - Enabled - Enabled - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:239 - - - Disabled - Disabled - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:244 - - - Anonymize IP - Anonymize IP - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:208 - - - Use this option to anonymize the visitor’s IP to comply with data privacy laws in some countries - Use this option to anonymize the visitor’s IP to comply with data privacy laws in some countries - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:210 - - - Enable Cross-Domain tracking - Enable Cross-Domain tracking - Context: -File: modules/ps_googleanalytics/ps_googleanalytics.php:233 - - - - - - - Newsletter subscription: Unable to delete customer using email. - Newsletter subscription: Unable to delete customer using email. - Context: -File: modules/ps_emailsubscription/ps_emailsubscription.php:1267 - - - Newsletter subscription: Unable to export customer using email. - Newsletter subscription: Unable to export customer using email. - Context: -File: modules/ps_emailsubscription/ps_emailsubscription.php:1277 - - - - - - - Theme Customization - Theme Customization - Context: -File: modules/ps_themecusto/ps_themecusto.php:69 - - - Theme & Logo page.]]> - Theme & Logo page.]]> - Context: -File: modules/ps_themecusto/ps_themecusto.php:70 - - - There was an error during the installation. Please contact us through Addons website - There was an error during the installation. Please contact us through Addons website - Context: -File: modules/ps_themecusto/ps_themecusto.php:95 - - - There was an error during the uninstall. Please contact us through Addons website - There was an error during the uninstall. Please contact us through Addons website - Context: -File: modules/ps_themecusto/ps_themecusto.php:113 - - - - - - - Uninstall - Uninstall - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/module_actions.tpl:57 - - - Install - Install - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/module_actions.tpl:91 - - - Enable - Enable - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/module_actions.tpl:71 - - - Disable - Disable - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/module_actions.tpl:59 - - - Reset - Reset - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/module_actions.tpl:61 - - - Disable mobile - Disable mobile - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/module_actions.tpl:75 - - - Enable mobile - Enable mobile - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/module_actions.tpl:79 - - - - - - - Configure - Configure - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:74 - - - Change colors, typography and your logo position - Change colors, typography and your logo position - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:20 - - - Use the Theme configurator module to customize the main graphic elements of your website : colors, buttons, typography, logo position. - Use the Theme configurator module to customize the main graphic elements of your website : colors, buttons, typography, logo position. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:28 - - - Main theme modules cartography - Main theme modules cartography - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:39 - - - There is no module for this section - There is no module for this section - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:112 - - - You can install a module for this section from our Modules Selection - You can install a module for this section from our Modules Selection - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:115 - - - See modules selection - See modules selection - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:119 - - - See all theme's modules - See all theme's modules - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/index.tpl:130 - - - - - - - Disable Mobile - Disable Mobile - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:43 - - - Enable Mobile - Enable Mobile - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:44 - - - Menu - Menu - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:48 - - - Slider - Slider - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:49 - - - Home Products - Home Products - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:50 - - - Text block - Text block - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:51 - - - Banner - Banner - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:52 - - - - - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:53 - - - Footer - Footer - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:54 - - - Create and manage Product Categories - Create and manage Product Categories - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:70 - - - Create here a full range of categories and subcategories to classify your products and manage your catalog easily. - Create here a full range of categories and subcategories to classify your products and manage your catalog easily. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:71 - - - Create content pages - Create content pages - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:74 - - - Add and manage your content pages (CMS pages: Terms and conditions of use, Our stores, About us, etc.) as you want. - Add and manage your content pages (CMS pages: Terms and conditions of use, Our stores, About us, etc.) as you want. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:75 - - - Create Brands and Suppliers pages - Create Brands and Suppliers pages - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:78 - - - This page allows you to create and manage your Brands and/or Suppliers pages. - This page allows you to create and manage your Brands and/or Suppliers pages. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:79 - - - Shop details - Shop details - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:119 - - - Display additional information about your store or how to contact you to make it easy for your customers to reach you. - Display additional information about your store or how to contact you to make it easy for your customers to reach you. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:120 - - - Action on the module successfully completed - Action on the module successfully completed - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:171 - - - Action on module failed - Action on module failed - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoConfiguration.php:172 - - - - - - - You do not have permission to edit this. - You do not have permission to edit this. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:537 - - - An error occured, please check your zip file - An error occured, please check your zip file - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:65 - - - The file is not valid. - The file is not valid. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:66 - - - Make sure you zip your edited theme files directly to the root of your child theme's folder before uploading it. - Make sure you zip your edited theme files directly to the root of your child theme's folder before uploading it. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:196 - - - Only CSS, YML and PNG files are accepted in the ZIP - Only CSS, YML and PNG files are accepted in the ZIP - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:205 - - - There is some PHP files in your ZIP - There is some PHP files in your ZIP - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:207 - - - The theme already exists or the parent name in the config file is wrong - The theme already exists or the parent name in the config file is wrong - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:224 - - - You must enter the parent theme name in the theme.yml file. Furthermore, the parent name must be the current parent theme. - You must enter the parent theme name in the theme.yml file. Furthermore, the parent name must be the current parent theme. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:233 - - - The child theme has been added successfully. - The child theme has been added successfully. - Context: -File: modules/ps_themecusto/controllers/admin/AdminPsThemeCustoAdvanced.php:240 - - - - - - - Google sitemap - Google sitemap - Context: -File: modules/gsitemap/gsitemap.php:46 - - - Generate your Google sitemap file - Generate your Google sitemap file - Context: -File: modules/gsitemap/gsitemap.php:47 - - - An error occured while trying to check your file permissions. Please adjust your permissions to allow PrestaShop to write a file in your root directory. - An error occured while trying to check your file permissions. Please adjust your permissions to allow PrestaShop to write a file in your root directory. - Context: -File: modules/gsitemap/gsitemap.php:696 - - - - - - - Order Notifications on the Favicon - Order Notifications on the Favicon - Context: -File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:58 - - - Get notified when you get new order, new client or new message directly on your browser tab of your back office even if you are working on another page - Get notified when you get new order, new client or new message directly on your browser tab of your back office even if you are working on another page - Context: -File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:59 - - - Are you sure you want to uninstall this module? - Are you sure you want to uninstall this module? - Context: -File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:71 - Comment: Confirm uninstall - - - There was an error during the uninstallation. - There was an error during the uninstallation. - Context: -File: modules/ps_faviconnotificationbo/ps_faviconnotificationbo.php:101 - - - - - - - None - None - Context: -File: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php:63 - - - TLS - TLS - Context: -File: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php:64 - - - SSL - SSL - Context: -File: src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php:65 - - - - - - - Cancel - Cancel - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:43 - - - Uninstall module? - Uninstall module? - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:20 - - - Disable module? - Disable module? - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:21 - - - Reset module? - Reset module? - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:22 - - - You are about to uninstall - You are about to uninstall - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:29 - - - This will definitely disable the module. - This will definitely disable the module. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:30 - - - You are about to disable - You are about to disable - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:33 - - - Your current settings will be saved, but the module will no longer be active. - Your current settings will be saved, but the module will no longer be active. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:34 - - - You are about to reset - You are about to reset - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:37 - - - This will restore the defaults settings. - This will restore the defaults settings. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:38 - - - This action cannot be undone. - This action cannot be undone. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:39 - - - Yes, uninstall it - Yes, uninstall it + + or + or Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:45 +File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:81 - - Yes, disable it - Yes, disable it + + The locale must be installed + The locale must be installed Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:46 +File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:188 - - Yes, reset it - Yes, reset it + + Multiple value separator + Multiple value separator Context: -File: modules/ps_themecusto/views/templates/admin/controllers/configuration/elem/modal.tpl:47 +File: admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl:208 @@ -2674,264 +850,6 @@ File: admin-dev/themes/default/template/helpers/options/options.tpl:331 - - - - Welcome! - Welcome! - Context: -File: modules/autoupgrade/views/templates/main.twig:18 - - - With the PrestaShop 1-Click Upgrade module, upgrading your store to the latest version available has never been easier! - With the PrestaShop 1-Click Upgrade module, upgrading your store to the latest version available has never been easier! - Context: -File: modules/autoupgrade/views/templates/main.twig:21 - - - Please always perform a full manual backup of your files and database before starting any upgrade. - Please always perform a full manual backup of your files and database before starting any upgrade. - Context: -File: modules/autoupgrade/views/templates/main.twig:22 - - - Double-check the integrity of your backup and that you can easily manually roll-back if necessary. - Double-check the integrity of your backup and that you can easily manually roll-back if necessary. - Context: -File: modules/autoupgrade/views/templates/main.twig:23 - - - If you do not know how to proceed, ask your hosting provider. - If you do not know how to proceed, ask your hosting provider. - Context: -File: modules/autoupgrade/views/templates/main.twig:24 - - - - - - - Branch: - Branch: - Context: -File: modules/autoupgrade/views/templates/block/channelInfo.twig:5 - - - Name: - Name: - Context: -File: modules/autoupgrade/views/templates/block/channelInfo.twig:19 - - - Version number: - Version number: - Context: -File: modules/autoupgrade/views/templates/block/channelInfo.twig:25 - - - URL: - URL: - Context: -File: modules/autoupgrade/views/templates/block/channelInfo.twig:31 - - - MD5 hash: - MD5 hash: - Context: -File: modules/autoupgrade/views/templates/block/channelInfo.twig:37 - - - Changelog: - Changelog: - Context: -File: modules/autoupgrade/views/templates/block/channelInfo.twig:43 - - - see changelog - see changelog - Context: -File: modules/autoupgrade/views/templates/block/channelInfo.twig:44 - - - - - - - Activity Log - Activity Log - Context: -File: modules/autoupgrade/views/templates/block/activityLog.twig:4 - - - Currently processing - Currently processing - Context: -File: modules/autoupgrade/views/templates/block/activityLog.twig:12 - - - Analyzing the situation... - Analyzing the situation... - Context: -File: modules/autoupgrade/views/templates/block/activityLog.twig:13 - - - Errors - Errors - Context: -File: modules/autoupgrade/views/templates/block/activityLog.twig:20 - - - - - - - Rollback - Rollback - Context: -File: modules/autoupgrade/views/templates/block/rollbackForm.twig:27 - - - After upgrading your shop, you can rollback to the previous database and files. Use this function if your theme or an essential module is not working correctly. - After upgrading your shop, you can rollback to the previous database and files. Use this function if your theme or an essential module is not working correctly. - Context: -File: modules/autoupgrade/views/templates/block/rollbackForm.twig:7 - - - Choose your backup: - Choose your backup: - Context: -File: modules/autoupgrade/views/templates/block/rollbackForm.twig:11 - - - -- Choose a backup to restore -- - -- Choose a backup to restore -- - Context: -File: modules/autoupgrade/views/templates/block/rollbackForm.twig:14 - - - - - - - The pre-Upgrade checklist - The pre-Upgrade checklist - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:7 - - - The checklist is not OK. You can only upgrade your shop once all indicators are green. - The checklist is not OK. You can only upgrade your shop once all indicators are green. - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:10 - - - Before starting the upgrade process, please make sure this checklist is all green. - Before starting the upgrade process, please make sure this checklist is all green. - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:13 - - - The 1-click upgrade module is up-to-date (your current version is v%s) - The 1-click upgrade module is up-to-date (your current version is v%s) - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:16 - - - Your store's root directory is writable (with appropriate CHMOD permissions) - Your store's root directory is writable (with appropriate CHMOD permissions) - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:33 - - - The "/admin/autoupgrade" directory is writable (appropriate CHMOD permissions) - The "/admin/autoupgrade" directory is writable (appropriate CHMOD permissions) - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:44 - - - PHP's "Safe mode" option is turned off - PHP's "Safe mode" option is turned off - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:55 - - - PHP's "allow_url_fopen" option is turned on, or cURL is installed - PHP's "allow_url_fopen" option is turned on, or cURL is installed - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:65 - - - Your store is in maintenance mode - Your store is in maintenance mode - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:76 - - - Click here to put your shop under maintenance - Click here to put your shop under maintenance - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:79 - - - PrestaShop's caching features are disabled - PrestaShop's caching features are disabled - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:92 - - - PHP's max_execution_time setting has a high value or is disabled entirely (current value: unlimited) - PHP's max_execution_time setting has a high value or is disabled entirely (current value: unlimited) - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:104 - - - PHP's max_execution_time setting has a high value or is disabled entirely (current value: %s seconds) - PHP's max_execution_time setting has a high value or is disabled entirely (current value: %s seconds) - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:106 - - - PrestaShop requirements are satisfied. - PrestaShop requirements are satisfied. - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:120 - - - PrestaShop requirements are not satisfied. [1]See details[/1] or [2]ignore[/2]. - PrestaShop requirements are not satisfied. [1]See details[/1] or [2]ignore[/2]. - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:122 - - - Please also make sure you make a full manual backup of your files and database. - Please also make sure you make a full manual backup of your files and database. - Context: -File: modules/autoupgrade/views/templates/block/checklist.twig:140 - - - - - - - Version comparison - Version comparison - Context: -File: modules/autoupgrade/views/templates/block/versionComparison.twig:4 - - - PrestaShop Original version - PrestaShop Original version - Context: -File: modules/autoupgrade/views/templates/block/versionComparison.twig:7 - - - Differences between versions - Differences between versions - Context: -File: modules/autoupgrade/views/templates/block/versionComparison.twig:13 - - - @@ -2964,16 +882,6 @@ File: admin-dev/themes/default/template/controllers/modules/tab_modules_list.tpl - - - - IP address - IP address - Context: -File: src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/memcache_servers.html.twig:79 - - - @@ -5530,408 +3438,5 @@ File: admin-dev/themes/new-theme/template/layout.tpl:93 - - - - Newsletter subscription - Newsletter subscription - Context: -File: modules/ps_emailsubscription/views/templates/front/subscription_execution.tpl:29 - - - - - - - The module %s has been disabled - The module %s has been disabled - Context: -File: modules/ps_themecusto/views/templates/admin/page.tpl:23 - - - - - - - Upload child theme - Upload child theme - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:80 - - - Advanced Customization - Advanced Customization - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:19 - - - You can edit your theme sheet by using the Parent/Child theme feature - You can edit your theme sheet by using the Parent/Child theme feature - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:23 - - - Advanced use only. - Advanced use only. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:27 - - - Support team might not be able to assist you on issues created by your own child theme. - Support team might not be able to assist you on issues created by your own child theme. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:29 - - - Download your current theme - Download your current theme - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:38 - - - You picked a theme but still want to bring some specific adjustments? Get a child theme, it will allow you to keep the parts you want and customize the others! - You picked a theme but still want to bring some specific adjustments? Get a child theme, it will allow you to keep the parts you want and customize the others! - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:40 - - - Edit your child theme - Edit your child theme - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:47 - - - Once the child theme created, next step is simple: apply the changes you want within the desired files, it will handle the customization part while keeping the parent theme’s look and functionality. - Once the child theme created, next step is simple: apply the changes you want within the desired files, it will handle the customization part while keeping the parent theme’s look and functionality. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:49 - - - Upload your child theme - Upload your child theme - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:56 - - - As you only bring modification to the child theme, you can upgrade the parent theme easily, without losing your customization. - As you only bring modification to the child theme, you can upgrade the parent theme easily, without losing your customization. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:58 - - - An error occurred - An error occurred - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:66 - - - Please check that you have the rights to write to the folders /app/cache/ and /themes/ - Please check that you have the rights to write to the folders /app/cache/ and /themes/ - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:67 - - - Download theme - Download theme - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:70 - - - Downloading - Downloading - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:73 - - - How to use parents/child themes - How to use parents/child themes - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:77 - - - Information - Information - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:84 - - - By using this method you can only override the CSS of your theme. - By using this method you can only override the CSS of your theme. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:86 - - - By using this method you can override the CSS and html of your theme, and add analytics tags. - By using this method you can override the CSS and html of your theme, and add analytics tags. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:88 - - - - - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/index.tpl:90 - - - - - - - Drop your child theme archive here or - Drop your child theme archive here or - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/elem/modal.tpl:33 - - - select file - select file - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/elem/modal.tpl:33 - - - Please upload one file at a time, .zip. Your child theme will be installed right after that. - Please upload one file at a time, .zip. Your child theme will be installed right after that. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/elem/modal.tpl:36 - - - Oops... Upload failed. - Oops... Upload failed. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/elem/modal.tpl:41 - - - What happened? - What happened? - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/elem/modal.tpl:42 - - - An error has occurred. - An error has occurred. - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/elem/modal.tpl:43 - - - Try again - Try again - Context: -File: modules/ps_themecusto/views/templates/admin/controllers/advanced/elem/modal.tpl:45 - - - - - - - Your Sitemaps were successfully created. Please do not forget to setup the URL - Your Sitemaps were successfully created. Please do not forget to setup the URL - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:5 - - - in your Google Webmaster account. - in your Google Webmaster account. - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:5 - - - Your Sitemaps - Your Sitemaps - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:28 - - - Sitemaps were already created. - Sitemaps were already created. - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:17 - - - Continue - Continue - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:22 - - - Please set up the following Sitemap URL in your Google Webmaster account: - Please set up the following Sitemap URL in your Google Webmaster account: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:29 - - - This URL is the master Sitemaps file. It refers to the following sub-sitemap files: - This URL is the master Sitemaps file. It refers to the following sub-sitemap files: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:31 - - - Your last update was made on this date: - Your last update was made on this date: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:39 - - - For a better use of the module, please make sure that you have - For a better use of the module, please make sure that you have - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:45 - - - a minimum memory_limit value of 128 MB. - a minimum memory_limit value of 128 MB. - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:48 - - - a minimum max_execution_time value of 30 seconds. - a minimum max_execution_time value of 30 seconds. - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:51 - - - You can edit these limits in your php.ini file. For more details, please contact your hosting provider. - You can edit these limits in your php.ini file. For more details, please contact your hosting provider. - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:54 - - - Configure your Sitemap - Configure your Sitemap - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:60 - - - Several Sitemaps files will be generated depending on how your server is configured and on the number of activated products in your catalog. - Several Sitemaps files will be generated depending on how your server is configured and on the number of activated products in your catalog. - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:61 - - - How often do you update your store? - How often do you update your store? - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:63 - - - always - always - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:65 - - - hourly - hourly - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:66 - - - daily - daily - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:67 - - - weekly - weekly - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:68 - - - monthly - monthly - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:69 - - - yearly - yearly - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:70 - - - never - never - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:71 - - - Check this box if you wish to check the presence of the image files on the server - Check this box if you wish to check the presence of the image files on the server - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:74 - - - check all - check all - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:116 - - - Indicate the pages that you do not want to include in your Sitemaps file: - Indicate the pages that you do not want to include in your Sitemaps file: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:79 - - - Generate Sitemap - Generate Sitemap - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:89 - - - This can take several minutes - This can take several minutes - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:89 - - - You have two ways to generate Sitemap: - You have two ways to generate Sitemap: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:96 - - - Manually: - Manually: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:97 - - - using the form above (as often as needed) - using the form above (as often as needed) - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:97 - - - -or- - -or- - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:98 - - - Automatically: - Automatically: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:99 - - - Ask your hosting provider to setup a "Cron task" to load the following URL at the time you would like: - Ask your hosting provider to setup a "Cron task" to load the following URL at the time you would like: - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:99 - - - It will automatically generate your XML Sitemaps. - It will automatically generate your XML Sitemaps. - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:101 - - - uncheck all - uncheck all - Context: -File: modules/gsitemap/views/templates/admin/configuration.tpl:113 - - - + diff --git a/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php index d2daf5ec91992..d6a68d1b21ba1 100644 --- a/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/LogGridDefinitionFactory.php @@ -91,7 +91,7 @@ protected function getColumns() { return (new ColumnCollection()) ->add((new DataColumn('id_log')) - ->setName($this->trans('ID', [], 'Global.Actions')) + ->setName($this->trans('ID', [], 'Admin.Global')) ->setOptions([ 'field' => 'id_log', ]) diff --git a/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php b/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php index aec8b5d53d2ba..bec2124131ea9 100644 --- a/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php +++ b/src/Core/Grid/Definition/Factory/RequestSqlGridDefinitionFactory.php @@ -112,7 +112,7 @@ protected function getColumns() ]) ) ->add((new ActionColumn('actions')) - ->setName($this->trans('Actions', [], 'Global.Actions')) + ->setName($this->trans('Actions', [], 'Admin.Global')) ->setOptions([ 'actions' => (new RowActionCollection()) ->add((new LinkRowAction('export')) diff --git a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php index fa133cde5820e..b30d711663d30 100644 --- a/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php +++ b/src/PrestaShopBundle/Controller/Admin/Configure/ShopParameters/OrderPreferencesController.php @@ -84,7 +84,7 @@ public function processAction(Request $request) )) { $this->addFlash( 'error', - $this->trans('You do not have permission to edit this', 'Admin.Notifications.Error') + $this->trans('You do not have permission to edit this.', 'Admin.Notifications.Error') ); return $this->redirectToRoute('admin_order_preferences'); diff --git a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php index 697b346d91b37..d093254f206fe 100644 --- a/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php +++ b/src/PrestaShopBundle/Form/Admin/Configure/AdvancedParameters/Email/SmtpConfigurationType.php @@ -64,7 +64,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'TLS' => 'tls', 'SSL' => 'ssl', ], - 'choice_translation_domain' => false, + 'choice_translation_domain' => 'Admin.Advparameters.Feature', ]) ->add('port', TextType::class, [ 'required' => false, diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/memcache_servers.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/memcache_servers.html.twig index bf7c6f0860103..d4cde98be38ff 100644 --- a/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/memcache_servers.html.twig +++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/AdvancedParameters/memcache_servers.html.twig @@ -76,7 +76,7 @@ {{ 'ID'|trans({}, 'Admin.Global') }} - {{ 'IP address'|trans({}, 'messages') }} + {{ 'IP Address'|trans }} {{ 'Port'|trans }} {{ 'Weight'|trans }}   diff --git a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/TrafficSeo/Meta/Blocks/meta_showcase_card.html.twig b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/TrafficSeo/Meta/Blocks/meta_showcase_card.html.twig index d241364d7bd6c..71f73ea729356 100644 --- a/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/TrafficSeo/Meta/Blocks/meta_showcase_card.html.twig +++ b/src/PrestaShopBundle/Resources/views/Admin/Configure/ShopParameters/TrafficSeo/Meta/Blocks/meta_showcase_card.html.twig @@ -31,8 +31,8 @@
-

{{ 'Improve your Seo'|trans }}

-

{{ 'Edit information about your pages to gain visibility and therefore reach more visitors. We advice you to start with the index page, it stand for your homepage.'|trans }}

+

{{ 'Improve your SEO'|trans }}

+

{{ 'Edit information about your pages to gain visibility and therefore reach more visitors. We advise you to start with the index page, it stands for your homepage.'|trans }}

{{ 'Learn more'|trans({}, 'Admin.Actions') }} {% if indexPageId and isGridDisplayed %} {{ 'Configure index page'|trans }}