From 5fcd8d762e9232341e9419edba370c3ec92707f8 Mon Sep 17 00:00:00 2001 From: vChabot Date: Wed, 11 Jan 2012 15:49:35 +0000 Subject: [PATCH] [-] BO : BugFix : #PSTEST-355 : replacing "Groups Attributes and Attributes" by "Attributes and Values" git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12362 b9a71923-0436-4b27-9f14-aed3839534dd --- .../template/controllers/performance/form.tpl | 2 +- .../controllers/products/combinations.tpl | 10 +- .../admin/AdminAttributesGroupsController.php | 22 +- install-new/data/xml/access.xml | 2 +- install-new/data/xml/tab.xml | 2 +- install-new/fixtures/apple/data/access.xml | 8 +- install-new/langs/de/data/tab.xml | 2 +- install-new/langs/en/data/tab.xml | 2 +- install-new/langs/es/data/tab.xml | 2 +- install-new/langs/fr/data/tab.xml | 2 +- install-new/langs/it/data/tab.xml | 2 +- translations/fr/admin.php | 1276 +++++++++-------- 12 files changed, 670 insertions(+), 662 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/performance/form.tpl b/admin-dev/themes/default/template/controllers/performance/form.tpl index bf2475e94..31b3ecab9 100644 --- a/admin-dev/themes/default/template/controllers/performance/form.tpl +++ b/admin-dev/themes/default/template/controllers/performance/form.tpl @@ -51,8 +51,8 @@ {if $input.type == 'radio' && $input.name == 'combination'} {elseif $input.type == 'radio' && $input.name == 'feature'}