Merge branch 'sf2.4' into sonatauser
Merge branch 'sonatauser' into i18n
copy translations
it trans
Merge branch 'sonatauser' into i18n
Merge branch 'i18n'