extended @movable expansion; more template...

[disorder] / templates / options.labels

diff --git a/templates/options.labels b/templates/options.labels
index 1197b04b54421643095be14eaeb2ac8f0c45d2aa..ef6272d6424831ddc971e660e8f793f1cedd5f16 100644 (file)
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -15,12 +15,12 @@ label       playing.randomtrack      
 label  queue.randomtrack       random
 
 # Short and long text for scratch (remove playing track) button
-label  playing.scratch         Scratch
-label  playing.scratchverbose  "stop playing this track"
+label  playing.remove          Scratch
+label  playing.removeverbose   "stop playing this track"
 
 # Short and long text for remove queued track button
-label  playing.remove          Remove
-label  playing.removeverbose   "remove track from queue"
+label  queue.remove            Remove
+label  queue.removeverbose     "remove track from queue"
 
 # Text for banner above currently playing track
 label  playing.now             "Now playing"
@@ -79,10 +79,10 @@ label       playing.albumverbose    "more tracks from this album"
 label  recent.title            "Recently Played"
 
 # <TITLE> for new tracks page
-label  new.title               "New tracks"
+label  new.title               "New Tracks"
 
 # <TITLE> 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"
@@ -128,9 +131,10 @@ 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"
+label  help.title              "DisOrder Help"
 
 # <TITLE> for login page
 label  login.title             "DisOrder Login"
@@ -157,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."
@@ -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.reminded          "You have been sent a reminder email."
 
 # <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.reminderfailed    "Cannot send a reminder."
 
 # Text appended to all error pages
 label  error.generic           ""
@@ -229,12 +236,13 @@ label     heading.album           Album
 label  heading.title           Title
 label  heading.length          Length
 
-# (Possibly relative) URL to images.  This be a URL for the directory
-# containing the icons used by the web interface (which might be
-# /usr/local/share/disorder/static/).
-label  url.static              /disorder/
-
-# Stylesheet.  As above, a (possibly relative) URL, but this time pointing
-# to the stylesheet to use in all DisOrder web pages.
-label  links.css               /disorder/disorder.css
-
+# Role images.  See the documentation for @images:NAME@.
+label   images.enabled          tick.png
+label   images.disabled         cross.png
+label   images.remove           cross.png
+label   images.noremove         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