X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/1a3dba678a4edf1df3d7de2cc29f8e32d6fea080..7a2c706849ecf6cee19d9e502f8491ffac3322e0:/templates/options.labels

diff --git a/templates/options.labels b/templates/options.labels
index 85e0377..c4aac36 100644
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -71,7 +71,7 @@ label	volume.upverbose	"Increase volume"
 # Amount to increase/reduce volume by
 label	volume.resolution	4
 
-# Long text for linsk to album/artist
+# Long text for links to album/artist
 label	playing.artistverbose	"More tracks by this artist"
 label	playing.albumverbose	"More tracks from this album"
 
@@ -110,8 +110,9 @@ label	choose.play		"Add track to queue"
 # <TITLE> for search page
 label	search.title		Search
 
-# Text for search button
+# Text for search buttons
 label	search.search		Search
+label   search.clear            Clear
 
 # <TITLE> for about page
 label	about.title		"About DisOrder"
@@ -184,6 +185,7 @@ label	error.connect		"Cannot connect to server."
 # Error messages for login.html
 label	error.loginfailed	"Incorrect username and/or password."
 label	error.cookiefailed	"Cannot create login cookie."
+label	error.revokefailed	"Cannot revoke login cookie."
 label	error.nousername	"No username specified."
 label	error.nopassword	"No password specified."
 label	error.passwordmismatch	"Passwords do not match."
@@ -194,39 +196,40 @@ 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."
+label   error.noright           "Access denied."
 
 # Text appended to all error pages
 label	error.generic		""
 
-# Displayed text for links in the sidebar (or other menu)
-label	sidebar.playing		Playing
-label	sidebar.choose		Choose
-label	sidebar.random		Random
-label	sidebar.search		Search
-label	sidebar.recent		Recent
-label	sidebar.new		New
-label	sidebar.about		About
-label	sidebar.volume		Volume
-label	sidebar.login		Login
-label	sidebar.help		Help
-label	sidebar.manage		Manage
-
-# Long (i.e. TITLE=) text for sidebar links
-label	sidebar.playingverbose	"Current and queued tracks"
-label	sidebar.chooseverbose	"Choose tracks"
-label	sidebar.searchverbose	"Word search among track names"
-label	sidebar.recentverbose	"Recently played tracks"
-label	sidebar.newverbose	"Newly added tracks"
-label	sidebar.aboutverbose	"About DisOrder"
-label	sidebar.volumeverbose	"Volume control"
-label	sidebar.loginverbose	"Log in to DisOrder"
-label	sidebar.helpverbose	"Basic user guide"
-label	sidebar.manageverbose	"Queue management and volume control"
+# Displayed text for links in the menu
+label	menu.playing		Playing
+label	menu.choose		Choose
+label	menu.random		Random
+label	menu.search		Search
+label	menu.recent		Recent
+label	menu.new		New
+label	menu.about		About
+label	menu.volume		Volume
+label	menu.login		Login
+label	menu.help		Help
+label	menu.manage		Manage
+
+# Long (i.e. TITLE=) text for menu links
+label	menu.playingverbose	"Current and queued tracks"
+label	menu.chooseverbose	"Choose tracks"
+label	menu.searchverbose	"Word search among track names"
+label	menu.recentverbose	"Recently played tracks"
+label	menu.newverbose	"Newly added tracks"
+label	menu.aboutverbose	"About DisOrder"
+label	menu.volumeverbose	"Volume control"
+label	menu.loginverbose	"Log in to DisOrder"
+label	menu.helpverbose	"Basic user guide"
+label	menu.manageverbose	"Queue management and volume control"
 
 # 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).
-label	sidebar.choosewhich	choose
+label	menu.choosewhich	choose
 
 # Column headings for tables of tracks (playing, queue, recent)
 label	heading.when		When
@@ -236,7 +239,7 @@ label	heading.album		Album
 label	heading.title		Title
 label	heading.length		Length
 
-# Role images.  See the documentation for @images:NAME@.
+# Role images.  See the documentation for @image{NAME}.
 label   images.enabled          tick.png
 label   images.disabled         cross.png
 label   images.remove           cross.png
@@ -246,3 +249,6 @@ label   images.upall            upup.png
 label   images.noupall          noupup.png
 label   images.downall          downdown.png
 label   images.nodownall        nodowndown.png
+
+# Where to find images etc
+label   url.static              /disorder