Merge branch 'es_traslation' into 'stable-3.1'

Marius Burkard

2016-04-01 224dde7ac5f03d82b5cb202e1eeba88f0bff96c2

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;