Fixed another null pointer deref in the same line!

[disorder] / templates / options.labels

diff --git a/templates/options.labels b/templates/options.labels
index 86586aad4ff2f7d629b2a2f2e85f214ba7dd3fb3..c4aac36ae2edfe6e1af35dfbf1ac96d8ff0b2386 100644 (file)
--- 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
 
 # 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"
 
 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
 
 # <TITLE> for search page
 label  search.title            Search
 

-# Text for search button
+# Text for search buttons

 label  search.search           Search
 label  search.search           Search

+label   search.clear            Clear

 
 # <TITLE> for about page
 label  about.title             "About DisOrder"
 
 # <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."
 # 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."
 label  error.nousername        "No username specified."
 label  error.nopassword        "No password specified."
 label  error.passwordmismatch  "Passwords do not match."


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


@@ -236,7 +239,7 @@ label       heading.album           Album
 label  heading.title           Title
 label  heading.length          Length
 
 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
 label   images.enabled          tick.png
 label   images.disabled         cross.png
 label   images.remove           cross.png