X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/ac152d06f4cfa9abcd4a88de7dbc6a9040f99c0d..f2c185d6f2428dc45f84c9d186543693fae752dd:/templates/options.labels

diff --git a/templates/options.labels b/templates/options.labels
index b62a918..1197b04 100644
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -138,18 +138,32 @@ label	login.title		"DisOrder Login"
 # Text for login fields
 label	login.username		"Username"
 label	login.password		"Password"
+label	login.password1		"Password"
+label	login.password2		"Password"
+label	login.newpassword	"New Password"
 label	login.email		"Email address"
 
+label	login.registerusernameextra	"May only contain unaccented Roman letters and digits; case matters"
+label	login.registeremailextra	"Must be valid"
+label	login.registerpassword1extra	"Letter case matters"
+label	login.registerpassword2extra	"Type same password again to check"
+
+label	login.edituseremailextra	""
+label	login.edituserpassword1extra	"Leave blank to keep existing password"
+label	login.edituserpassword2extra	"Type same password again to check"
+
 # Text for login page buttons
 label	login.login		"Login"
 label	login.register		"Register"
 label	login.edituser		"Change Details"
 label	login.logout		"Logout"
 
-label	login.loginok		"Logged in OK"
-label	login.logoutok		"Logged out OK"
-label	login.registered	"Registered your new login"
-label	login.confirmed		"Confirmed your new login"
+# Text for login page responses
+label	login.loginok		"You are now logged in."
+label	login.logoutok		"You are now logged out."
+label	login.registered	"Your new login has been registered.  Please check your email."
+label	login.confirmed		"Your new login has been confirmed.  You are now logged in."
+label	login.edited		"Your details have been changed."
 
 # <TITLE> for account page
 label	account.title		"DisOrder User Details"
@@ -161,8 +175,18 @@ label	error.title		"DisOrder error"
 # Text used when cannot connect to server
 label	error.connect		"Cannot connect to server."
 
-# Text used when cannot become right user
-label	error.become		"Unauthorized user."
+# Error messages for login.html
+label	error.loginfailed	"Incorrect username and/or password."
+label	error.cookiefailed	"Cannot create login cookie."
+label	error.nousername	"No username specified."
+label	error.nopassword	"No password specified."
+label	error.passwordmismatch	"Passwords do not match."
+label	error.noemail		"No email address specified."
+label	error.bademail		"Invalid email address."
+label	error.cannotregister	"Unable to register user."
+label	error.noconfirm		"Missing confirmation string."
+label	error.badconfirm	"Invalid confirmation string."
+label	error.badedit		"Cannot edit user details."
 
 # Text appended to all error pages
 label	error.generic		""