// updated Spanish fixtures translations

Conflicts:
	install-dev/langs/es/data/order_state.xml
// updated French fixtures translations

Conflicts:
	install-dev/langs/fr/data/order_state.xml
// updated Italian fixtures translations

Conflicts:
	install-dev/langs/it/data/order_state.xml
// updated Dutch fixtures translations

Conflicts:
	install-dev/langs/nl/data/order_state.xml
// updated Brazilian fixtures translations

Conflicts:
	install-dev/langs/br/data/order_state.xml
Merge branch '1.6' of ssh://github.com/PrestaShop/PrestaShop into 1.6