i18n modifications merged with new developments 

I've done merge with the new master branch and added a i18n fixes