Added a clean way to show level field, included i18n support
Updated locales
Merge remote-tracking branch 'upstream/develop' into develop