Merge branch 'French_Translation_fixes' into 'stable-3.1'

Till Brehm

2016-04-25 d44bcf1e2a69874b6b8b50db79b84dcdd8dc41b7

1
2
3
 
-- increase column size
ALTER TABLE `client` CHANGE `template_additional` `template_additional` TEXT NOT NULL;