Implemented the requested feature from calcifer:#29
Updated the translations
Added some unit tests.