Merge branch 'French_Translation_fixes' into 'stable-3.1'

Till Brehm

2016-04-25 d44bcf1e2a69874b6b8b50db79b84dcdd8dc41b7

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