X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fdf98378d2d8c8550661f657d30ec5186ff642f1..06638b8da63effe8cc24af0a6a13745583262dcf:/templates/options.labels
diff --git a/templates/options.labels b/templates/options.labels
index f5cfd90..82de2d9 100644
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -79,10 +79,10 @@ label playing.albumverbose "more tracks from this album"
label recent.title "Recently Played"
#
for new tracks page
-label new.title "New tracks"
+label new.title "New Tracks"
# for choose track page
-label choose.title "Pick track"
+label choose.title "Pick Track"
# Text for play all button
label choose.playall "Play all"
@@ -93,6 +93,9 @@ label choose.directories Directories
# 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"
@@ -130,7 +133,7 @@ label prefs.random "Random play"
label prefs.tags "Tags"
# for help page
-label help.title "DisOrder help"
+label help.title "DisOrder Help"
# for login page
label login.title "DisOrder Login"
@@ -138,13 +141,34 @@ 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.lougout "Logout"
+label login.logout "Logout"
+label login.reminder "Send reminder"
+
+# 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."
+label login.reminded "You have been sent a reminder email."
# for account page
label account.title "DisOrder User Details"
@@ -156,8 +180,19 @@ 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."
+label error.reminderfailed "Cannot send a reminder."
# Text appended to all error pages
label error.generic ""
@@ -187,10 +222,6 @@ label sidebar.loginverbose "log in to DisOrder"
label sidebar.helpverbose "basic user guide"
label sidebar.manageverbose "queue management and volume control"
-# This should be 'topbar' or 'sidebar'. If 'topbar' then the menu appears
-# across the top of the screen, otherwise down the side.
-label menu topbar
-
# This should be 'choose' or 'choosealpha'. If 'choose' then all artists
# appear on the same page, otherwise they are broken up by initial letter
# (which can be more convenient if you have huge numbers).
@@ -204,24 +235,13 @@ label heading.album Album
label heading.title Title
label heading.length Length
-# Images. These are (possibly relative) URLs. In the factory configuration
-# DisOrder assumes that you have arranged for 'static' relative to the base
-# URL (i.e. the URL of the CGI) to point somewhere useful, but it's not
-# the only way. The .deb for instance uses /disorder instead.
-label images.enabled static/tick.png
-label images.disabled static/cross.png
-label images.scratch static/cross.png
-label images.noscratch static/nocross.png
-label images.up static/up.png
-label images.noup static/noup.png
-label images.down static/down.png
-label images.nodown static/nodown.png
-label images.edit static/edit.png
-label images.upall static/upup.png
-label images.noupall static/noupup.png
-label images.downall static/downdown.png
-label images.nodownall static/nodowndown.png
-
-# Stylesheet. As above, a (possibly relative) URL.
-label links.css static/disorder.css
-
+# Role images. See the documentation for @images:NAME@.
+label images.enabled tick.png
+label images.disabled cross.png
+label images.scratch cross.png
+label images.noscratch nocross.png
+label images.noup noup.png
+label images.upall upup.png
+label images.noupall noupup.png
+label images.downall downdown.png
+label images.nodownall nodowndown.png