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/pl/data/gender.xml
-1
View File
@@ -2,5 +2,4 @@
<entity_gender>
<gender id="1" name="Pan"/>
<gender id="2" name="Pani"/>
<gender id="3" name="Panna"/>
</entity_gender>
install-dev/langs/pl/install.php
+1 -1
View File
@@ -82,7 +82,7 @@ return array(
'You must enter a database login' => 'Podaj login dla bazy danych',
'Tables prefix is invalid' => 'Prefiks tebeli jest niepoprawny ',
'Wrong engine chosen for MySQL' => 'Silnik dla MySQL jest niepoprawny',
'Cannot convert database data to utf-8' => 'Nie można przekonwertowąć bazy danych na utf-8',
'Cannot convert database data to utf-8' => 'Nie można przekonwertować bazy danych na utf-8',
'At least one table with same prefix was already found, please change your prefix or drop your database' => 'Co najmniej jedna tabela z tym samym prefiksem została znaleziona - proszę zmienić aktualny prefiks lub usunąć istniejące tabele.',
'Database Server is not found. Please verify the login, password and server fields' => 'Nie można połączyć się z serwerem bazy danych. Sprawdź swój login i hasło.',
'Connection to MySQL server succeeded, but database "%s" not found' => 'Połączenie do serwera MySQL odbyło się poprawnie lecz baza danych "%is" nie została znaleziona.',