Fix for #1609

- Fix for #1609
- Using translations
- Feature built 100% from recycled Bugs

![screenshot](https://lh5.googleusercontent.com/-B5kySJheQv4/UxWn-n4VrzI/AAAAAAAAEaA/2fepEsfNq8o/w438-rw-h134-no/temp.jpg)
https://lh5.googleusercontent.com/-B5kySJheQv4/UxWn-n4VrzI/AAAAAAAAEaA/2fepEsfNq8o/w438-rw-h134-no/temp.jpg

Brancho:  fix/toolbar :octocat: