Merge fixes up to 3.0.1

[disorder] / templates / options.labels

diff --git a/templates/options.labels b/templates/options.labels
index d81f7be6a2144f7dd0445eb0fdbb47bb766b786e..55d661a538ed7ae5c5624cf26a404b67ae4cf12b 100644 (file)
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -93,6 +93,9 @@ label choose.directories      Directories
 # Heading for track list
 label  choose.files            Tracks
 
 # Heading for track list
 label  choose.files            Tracks
 

+# Caption for visit-directory links
+label  choose.directory        "Visit directory"
+

 # Short and long text for edit prefs button (both recent and choose pages)
 label  choose.prefs            Edit
 label  choose.prefsverbose     "edit track information"
 # Short and long text for edit prefs button (both recent and choose pages)
 label  choose.prefs            Edit
 label  choose.prefsverbose     "edit track information"


@@ -128,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"
 # 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"
 
 # <TITLE> for help page
 label  help.title              "DisOrder Help"


@@ -157,6 +161,7 @@ label       login.login             "Login"
 label  login.register          "Register"
 label  login.edituser          "Change Details"
 label  login.logout            "Logout"
 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."
 
 # Text for login page responses
 label  login.loginok           "You are now logged in."


@@ -164,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.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"
 
 # <TITLE> for account page
 label  account.title           "DisOrder User Details"


@@ -187,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.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           ""
 
 # Text appended to all error pages
 label  error.generic           ""