Merge fixes up to 3.0.1

[disorder] / templates / options.labels

diff --git a/templates/options.labels b/templates/options.labels
index 289a0cf8e6321bf87fd8478d8b8905642123dbb9..55d661a538ed7ae5c5624cf26a404b67ae4cf12b 100644 (file)
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -131,6 +131,7 @@ label       prefs.value             Value
 # Legend for prefs controls that don't correspond to a heading
 label  prefs.random            "Random play"
 label  prefs.tags              "Tags"
+label  prefs.weight            "Weight"
 
 # <TITLE> for help page
 label  help.title              "DisOrder Help"
@@ -160,6 +161,7 @@ label       login.login             "Login"
 label  login.register          "Register"
 label  login.edituser          "Change Details"
 label  login.logout            "Logout"
+label  login.reminder          "Send reminder"
 
 # Text for login page responses
 label  login.loginok           "You are now logged in."
@@ -167,6 +169,7 @@ 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."
+label  login.reminded          "You have been sent a reminder email."
 
 # <TITLE> for account page
 label  account.title           "DisOrder User Details"
@@ -190,6 +193,7 @@ 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."
+label  error.reminderfailed    "Cannot send a reminder."
 
 # Text appended to all error pages
 label  error.generic           ""