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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/import/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/modules/filters.tpl
	admin-dev/themes/default/template/controllers/modules/list.tpl
	admin-dev/themes/default/template/controllers/orders/form.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	classes/Category.php
	classes/controller/AdminController.php
	controllers/admin/AdminAttributesGroupsController.php
	controllers/admin/AdminFeaturesController.php
	controllers/admin/AdminImportController.php
	controllers/admin/AdminLogsController.php
	install-dev/install_version.php
	install-dev/langs/ru/data/tab.xml
	js/admin_carrier_wizard.js
	modules/loyalty/loyalty.php
This commit is contained in:
Kevin Granger
2013-10-14 12:21:29 +02:00
parent 59435fa2ee f9cfde9a05
commit 67dc7aac04
316 changed files with 8504 additions and 1178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/langs/es/data/gender.xml
-1
View File
@@ -2,5 +2,4 @@
<entity_gender>
<gender id="1" name="Sr."/>
<gender id="2" name="Sra."/>
<gender id="3" name="Miss"/>
</entity_gender>
install-dev/langs/es/install.php
+5 -3
View File
@@ -2,8 +2,8 @@
return array(
'informations' => array(
'phone' => '+34 917.872.909',
'support' => 'https://www.prestashop.com/es/support',
'blog' => 'http://www.prestashop.com/blog/es/'
'support' => 'https://www.prestashop.com/es/support',
'blog' => 'http://www.prestashop.com/blog/es/',
),
'translations' => array(
'menu_welcome' => 'Elegir el idioma',
@@ -246,5 +246,7 @@ return array(
'To enjoy the many features that are offered for free by PrestaShop, please read the license terms below. PrestaShop core is licensed under OSL 3.0, while the modules and themes are licensed under AFL 3.0.' => 'Para disfrutar de las numerosas funcionalidades ofrecidas de forma gratuita por PrestaShop, por favor lea los términos de la licencia a continuación. Core PrestaShop está disponible bajo la licencia OSL 3.0, mientras que los módulos y los temas están licenciados bajo la AFL 3.0.',
'For security purposes, you must delete the "install" folder.' => 'Por razones de seguridad, debe eliminar la carpeta "install".',
'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation' => 'http://doc.prestashop.com/display/PS15/Installing+PrestaShop#InstallingPrestaShop-Completingtheinstallation',
'Files' => 'Ficheros',
'All files are not successfuly uploaded on your server' => 'Todos los ficheros no se han subido correctamente al servidor',
),
);
);