Synchronized translations
Merge branch 'master' into bootstrap3