#2 i18n navbar
Merge remote-tracking branch 'origin/master'