BUGFIX: The demo dictionary was malformed

Most of the changes here are just shuffling keys around however.

tests/lmeds_demo/english.txt

@@ -1,74 +1,4 @@
 
-====================
-one_play_two_response
-====================
-
-Same or different?<br />
-Press 'p' to play the audio; 'z' for the left response and 'm' for the right response.
-
-====================
-prominence_point_instr
-====================
-
-Please mark on a five point scale, the degree of prominence carried by the word marked in bold.
-
-====================
-boundary_and_prominence_with_limits
-====================
-
-The next few pages contain more prominence and boundary pages.  However,
-on these pages, you'll be limited in the number of items you can select.
-Specific instructions will be given for each page.
-
-====================
-keyboard_shortcuts_boundary
-====================
-
-<front color="red">Boundary task.</font>  Press [p] to play the audio file and [enter] to continue
-
-====================
-keyboard_shortcuts_prominence
-====================
-
-<font color="blue">Prominence task.</font>  Press [p] to play the audio file and [enter] to continue
-
-====================
-mark_one_boundary
-====================
-
-Mark exactly one boundary.
-
-====================
-mark_one_prominence
-====================
-
-Mark exactly one prominence.
-
-====================
-pbMinMaxSelectedErrorMsg
-====================
-
-Error.  You must select at least %d word(s) but not more than %d word(s).
-
-====================
-boundary_at_most_one
-====================
-
-Mark at most one boundary.
-
-====================
-prominence_at_least_two
-====================
-
-Mark at least two prominences.
-
-====================
-two_play_two_response
-====================
-
-Same or different?<br />
-Press 'q' for the left audio and 'p' for the right audio.\n<br />
-Press 'z' for the left response and 'm' for the right response.
 
 ------------------------------
 lmeds_interface
@@ -160,6 +90,14 @@ Mark the boundaries you hear based on pauses in the speech (there aren't
 really any pauses in these short recordings though) and mark the prominences
 based on the words you think stand out.
 
+====================
+boundary_and_prominence_with_limits
+====================
+
+The next few pages contain more prominence and boundary pages.  However,
+on these pages, you'll be limited in the number of items you can select.
+Specific instructions will be given for each page.
+
 ====================
 fill_in_the_blank_instructions
 ====================
@@ -184,6 +122,15 @@ is a consent form, and a demographics survey.<br /><br />
 
 This demo should only take about 5 minutes to complete.
 
+====================
+keyboard_shortcuts
+====================
+
+On the next page there is a boundary and prominence page followed by 
+a media choice page, as you have seen before.  However,
+these pages have been configured to allow interaction via a keyboard.
+Specific instructions will be given for each page.
+
 ====================
 multingual_support
 ====================
@@ -434,6 +381,13 @@ neutral
 
 Neither
 
+====================
+one_play_two_response
+====================
+
+Same or different?<br />
+Press 'p' to play the audio; 'z' for the left response and 'm' for the right response.
+
 ====================
 prominence_point_instr
 ====================
@@ -458,6 +412,14 @@ same_different_instr
 
 Are the two audio files the same or different?
 
+====================
+two_play_two_response
+====================
+
+Same or different?<br />
+Press 'q' for the left audio and 'p' for the right audio.\n<br />
+Press 'z' for the left response and 'm' for the right response.
+
 ====================
 vnonprom
 ====================
@@ -491,10 +453,60 @@ boundary_and_prominence
 ------------------------------
 
 ====================
-nonspecific_prominence_instr
+keyboard_shortcuts_boundary
 ====================
 
-Mark the words that the speaker <font color="blue">highlighted for the listener, to make them stand out</font>.
+<front color="red">Boundary task.</font>  Press [p] to play the audio file and [enter] to continue
+
+====================
+keyboard_shortcuts_prominence
+====================
+
+<font color="blue">Prominence task.</font>  Press [p] to play the audio file and [enter] to continue
+
+====================
+mark_one_boundary
+====================
+
+Mark exactly one boundary.
+
+====================
+mark_one_prominence
+====================
+
+Mark exactly one prominence.
+
+====================
+pbMinMaxSelectedErrorMsg
+====================
+
+Error.  You must select at least %d word(s) but not more than %d word(s).
+
+====================
+true
+====================
+
+
+
+------------------------------
+boundary
+------------------------------
+
+====================
+boundary_at_most_one
+====================
+
+Mark at most one boundary.
+
+------------------------------
+prominence
+------------------------------
+
+====================
+prominence_at_least_two
+====================
+
+Mark at least two prominences.
 
 ------------------------------
 syllable_marking
@@ -565,36 +577,24 @@ You have chosen not to participate in this study. Thank you for your time.
 <br /><br />
 
 ------------------------------
-media_test,media_list,media_choice,boundary_and_prominence,boundary,prominence,syllable_marking,media_slider
+boundary_and_prominence,boundary,prominence
 ------------------------------
 
 ====================
-error_must_play_audio
-====================
-
-You must listen to each of the audio files at least %d time(s).
-
-====================
-error_must_play_audio_at_least
-====================
-
-You must listen to each of the audio files at least %d time(s).
-
-====================
-play_button
+nonspecific_boundary_instr
 ====================
 
-Play
+Mark a boundary between words <font color="red">that belong to different chunks</font>.
 
 ------------------------------
-boundary_and_prominence,boundary,prominence
+lmeds_interface,login,login_bad_user_name
 ------------------------------
 
 ====================
-nonspecific_boundary_instr
+back_button_warning
 ====================
 
-Mark a boundary between words <font color="red">that belong to different chunks</font>.
+<font color="red">Please note that pressing 'back' or 'refresh' will invalidate this experiment session.</font>
 
 ------------------------------
 login,text_page,consent,login_bad_user_name
@@ -623,14 +623,24 @@ prominent
 Prominent
 
 ------------------------------
-lmeds_interface,login,login_bad_user_name
+boundary_and_prominence,prominence,boundary
 ------------------------------
 
 ====================
-back_button_warning
+nonspecific_prominence_instr
 ====================
 
-<font color="red">Please note that pressing 'back' or 'refresh' will invalidate this experiment session.</font>
+Mark the words that the speaker <font color="blue">highlighted for the listener, to make them stand out</font>.
+
+------------------------------
+prominence,boundary_and_prominence
+------------------------------
+
+====================
+pbMinSelectedErrorMsg
+====================
+
+Error.  You must select at least %d word(s).
 
 ------------------------------
 login,login_bad_user_name
@@ -654,6 +664,28 @@ user_name_text
 
 Please enter a unique user id.  No spaces please.  (e.g. k123l or john_doe_22)
 
+------------------------------
+media_test,media_list,media_choice,boundary_and_prominence,boundary,prominence,syllable_marking,media_slider
+------------------------------
+
+====================
+error_must_play_audio
+====================
+
+You must listen to each of the audio files at least %d time(s).
+
+====================
+error_must_play_audio_at_least
+====================
+
+You must listen to each of the audio files at least %d time(s).
+
+====================
+play_button
+====================
+
+Play
+
 ------------------------------
 lmeds_interface,boundary_and_prominence
 ------------------------------
@@ -664,3 +696,13 @@ continue_button
 
 Continue
 
+------------------------------
+boundary,boundary_and_prominence
+------------------------------
+
+====================
+pbMaxSelectedErrorMsg
+====================
+
+Error. You must not select more than %d word(s).
+