New debugging program: rtpmon. This listens for packets the same way

[disorder] / templates / options.labels

diff --git a/templates/options.labels b/templates/options.labels
index 1e7131593cee0d45d57c123c0571a8a160c05ebb..c4aac36ae2edfe6e1af35dfbf1ac96d8ff0b2386 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  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
 
 # 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"
 
 # Text for banner above currently playing track
 label  playing.now             "Now playing"


@@ -33,19 +33,19 @@ label       playing.up              Up
 label  playing.down            Down
 label  playing.upall           Head
 label  playing.downall         Tail
 label  playing.down            Down
 label  playing.upall           Head
 label  playing.downall         Tail

-label  playing.upverbose       "move track earlier in queue"
-label  playing.downverbose     "move track later in queue"
-label  playing.upallverbose    "move track to head of queue"
-label  playing.downallverbose  "move track to end of queue"
+label  playing.upverbose       "Move track earlier in queue"
+label  playing.downverbose     "Move track later in queue"
+label  playing.upallverbose    "Move track to head of queue"
+label  playing.downallverbose  "Move track to end of queue"

 
 # Short and long text for play control buttons
 label  playing.random          "Random play"
 label  playing.playing         "Playing"
 label  playing.pause           Pause
 
 # Short and long text for play control buttons
 label  playing.random          "Random play"
 label  playing.playing         "Playing"
 label  playing.pause           Pause

-label  playing.randomdisableverbose    "disable random play"
-label  playing.randomenableverbose     "enable random play"
-label  playing.playingdisableverbose   "disable playing"
-label  playing.playingenableverbose    "enable playing"
+label  playing.randomdisableverbose    "Disable random play"
+label  playing.randomenableverbose     "Enable random play"
+label  playing.playingdisableverbose   "Disable playing"
+label  playing.playingenableverbose    "Enable playing"

 label  playing.pauseverbose    "Pause the current track"
 label  playing.resumeverbose   "Resume play"
 
 label  playing.pauseverbose    "Pause the current track"
 label  playing.resumeverbose   "Resume play"
 


@@ -63,26 +63,26 @@ label       volume.left             ""
 label  volume.right            ""
 
 # Short and long text for volume down/up buttons
 label  volume.right            ""
 
 # Short and long text for volume down/up buttons

-label  volume.reduce           Down
-label  volume.increase         Up
-label  volume.reduceverbose    "reduce volume"
-label  volume.increaseverbose  "increase volume"
+label  volume.down             Down
+label  volume.up               Up
+label  volume.downverbose      "Reduce volume"
+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
-label  playing.artistverbose   "more tracks by this artist"
-label  playing.albumverbose    "more tracks from this album"
+# Long text for links to album/artist
+label  playing.artistverbose   "More tracks by this artist"
+label  playing.albumverbose    "More tracks from this album"

 
 # <TITLE> for recently played page
 label  recent.title            "Recently Played"
 
 # <TITLE> for new tracks page
 
 # <TITLE> for recently played page
 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
 
 # <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"
 
 # 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
 
 # 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"


@@ -107,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"


@@ -128,9 +132,48 @@ 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
 
 # <TITLE> for help page

-label  help.title              "DisOrder help"
+label  help.title              "DisOrder Help"
+
+# <TITLE> for login page
+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.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."
+
+# <TITLE> for account page
+label  account.title           "DisOrder User Details"

 
 # <TITLE> for error page.  Note that in this page the 'error' label is set
 # to a string indicating the type of error.
 
 # <TITLE> for error page.  Note that in this page the 'error' label is set
 # to a string indicating the type of error.


@@ -139,43 +182,54 @@ label     error.title             "DisOrder error"
 # Text used when cannot connect to server
 label  error.connect           "Cannot connect to server."
 
 # 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.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.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."
+label   error.noright           "Access denied."

 
 # Text appended to all error pages
 label  error.generic           ""
 
 
 # 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.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.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
+# 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).
 
 # 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
 
 # Column headings for tables of tracks (playing, queue, recent)
 label  heading.when            When


@@ -185,24 +239,16 @@ label     heading.album           Album
 label  heading.title           Title
 label  heading.length          Length
 
 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 @image{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
+
+# Where to find images etc
+label   url.static              /disorder