reuse code, add some annotations
update translations, activate Italian translation
Merge branch 'master' into ffs