Fixes #180 - Fixed dependency on error() function.
Removed incorrect implementation of password reset.
Updated translation strings.
Merge branch 'release-2.1.7'