Merge commit 'a83c1e5e4f' into feature/TDBfromRDB2

This commit is contained in:
Jim Blake 2014-06-11 16:50:58 -04:00
commit 66fbf81034
15 changed files with 35 additions and 517 deletions

View file

@ -90,7 +90,7 @@ be emailed to the address entered above. The password will not \
be reset until the user follows the link provided in this email.
new_password = New password
confirm_password = Confirm new password
minimum_password_length = Minimum of {0} characters in length.
minimum_password_length = Minimum of {0} characters in length; maximum of {1}.
leave_password_unchanged = Leaving this blank means that the password will not be changed.
confirm_initial_password = Confirm initial password