1 files changed, 152 insertions, 63 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 25acb517aa..ecfa2be042 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -4712,13 +4712,13 @@
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_SELECT_LIST_BOOKMARKS
-  desc: From the auto-load screen, allows user to list all bookmarks
+  desc: DEPRECATED
  user:
  <source>
-    *: "Down = List"
+    *: ""
  </source>
  <dest>
-    *: "Down = List"
+    *: deprecated
  </dest>
  <voice>
    *: ""
@@ -4726,25 +4726,13 @@
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_SELECT_EXIT
-  desc: From the bookmark list screen, allows user to exit
+  desc: DEPRECATED
  user:
  <source>
-    *: "OFF = Exit"
+    *: ""
-    h100,h120,h300: "STOP = Exit"
-    ipod*: "PLAY/PAUSE = Exit"
-    x5: "RECORD = Exit"
-    h10,h10_5gb: "PREV = Exit"
-    gigabeatf: "A = Exit"
-    e200: "POWER = Exit"
  </source>
  <dest>
-    *: "OFF = Exit"
+    *: deprecated
-    h100,h120,h300: "STOP = Exit"
-    ipod*: "PLAY/PAUSE = Exit"
-    x5: "RECORD = Exit"
-    h10,h10_5gb: "PREV = Exit"
-    gigabeatf: "A = Exit"
-    e200: "POWER = Exit"
  </dest>
  <voice>
    *: ""
@@ -4752,13 +4740,13 @@
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_SELECT_BOOKMARK_TEXT
-  desc: Used on the bookmark select window to label bookmark number
+  desc: DEPRECATED
  user:
  <source>
-    *: "Bookmark"
+    *: ""
  </source>
  <dest>
-    *: "Bookmark"
+    *: deprecated
  </dest>
  <voice>
    *: ""
@@ -4766,53 +4754,41 @@
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_SELECT_INDEX_TEXT
-  desc: Used on the bookmark select window to label index number
+  desc: DEPRECATED
  user:
  <source>
-    *: "Index"
+    *: ""
  </source>
  <dest>
-    *: "Index"
+    *: deprecated
  </dest>
  <voice>
-    *: "Index"
+    *: ""
  </voice>
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_SELECT_TIME_TEXT
-  desc: Used on the bookmark select window to label elapsed time
+  desc: DEPRECATED
  user:
  <source>
-    *: "Time"
+    *: ""
  </source>
  <dest>
-    *: "Time"
+    *: deprecated
  </dest>
  <voice>
-    *: "Time"
+    *: ""
  </voice>
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_SELECT_PLAY
-  desc: Used on the bookmark select window to indicated the play option
+  desc: DEPRECATED
  user:
  <source>
-    *: "PLAY = Select"
+    *: ""
-    h100,h120,h300: "NAVI = Select"
-    ipod*: "SELECT = Select"
-    x5: "SELECT = Select"
-    h10,h10_5gb: "SELECT = Select"
-    gigabeatf: "SELECT = Select"
-    e200: "SELECT = Select"
  </source>
  <dest>
-    *: "PLAY = Select"
+    *: deprecated
-    h100,h120,h300: "NAVI = Select"
-    ipod*: "SELECT = Select"
-    x5: "SELECT = Select"
-    h10,h10_5gb: "SELECT = Select"
-    gigabeatf: "SELECT = Select"
-    e200: "SELECT = Select"
  </dest>
  <voice>
    *: ""
@@ -4820,25 +4796,13 @@
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_SELECT_DELETE
-  desc: Used on the bookmark select window to indicated the bookmark delete option
+  desc: DEPRECATED
  user:
  <source>
-    *: "ON+Play = Delete"
+    *: ""
-    h100,h120,h300: "RECORD = Delete"
-    ipod*: "Long MENU = Delete"
-    x5: "Long RECORD = Delete"
-    h10,h10_5gb: "REWIND = Delete"
-    gigabeatf: "POWER = Delete"
-    e200: "PLAY = Delete"
  </source>
  <dest>
-    *: "ON+Play = Delete"
+    *: deprecated
-    h100,h120,h300: "RECORD = Delete"
-    ipod*: "Long MENU = Delete"
-    x5: "Long RECORD = Delete"
-    h10,h10_5gb: "REWIND = Delete"
-    gigabeatf: "POWER = Delete"
-    e200: "PLAY = Delete"
  </dest>
  <voice>
    *: ""
@@ -4846,13 +4810,13 @@
 </phrase>
 <phrase>
  id: LANG_BOOKMARK_AUTOLOAD_QUERY
-  desc: prompt for user to decide to create a bookmark
+  desc: DEPRECATED
  user:
  <source>
-    *: "Load Last Bookmark?"
+    *: ""
  </source>
  <dest>
-    *: "Load Last Bookmark?"
+    *: deprecated
  </dest>
  <voice>
    *: ""
@@ -10862,4 +10826,129 @@
    *: "Moving"
  </voice>
 </phrase>
+<phrase>
+  id: LANG_BOOKMARK_SELECT_BOOKMARK
+  desc: bookmark selection list title
+  user:
+  <source>
+    *: "Select Bookmark"
+  </source>
+  <dest>
+    *: "Select Bookmark"
+  </dest>
+  <voice>
+    *: "Select Bookmark"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_DONT_RESUME
+  desc: top item in the list when asking user about bookmark auto load
+  user:
+  <source>
+    *: "<Don't Resume>"
+  </source>
+  <dest>
+    *: "<Don't Resume>"
+  </dest>
+  <voice>
+    *: "Do Not Resume"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_SHUFFLE
+  desc: bookmark selection list, bookmark enables shuffle
+  user:
+  <source>
+    *: ", Shuffle"
+  </source>
+  <dest>
+    *: ", Shuffle"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_INVALID
+  desc: bookmark selection list, bookmark couldn't be parsed
+  user:
+  <source>
+    *: "<Invalid Bookmark>"
+  </source>
+  <dest>
+    *: "<Invalid Bookmark>"
+  </dest>
+  <voice>
+    *: "Invalid Bookmark"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_CONTEXT_MENU
+  desc: bookmark selection list context menu
+  user:
+  <source>
+    *: "Bookmark Actions"
+  </source>
+  <dest>
+    *: "Bookmark Actions"
+  </dest>
+  <voice>
+    *: "Bookmark Actions"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_CONTEXT_RESUME
+  desc: bookmark context menu, resume this bookmark
+  user:
+  <source>
+    *: "Resume"
+  </source>
+  <dest>
+    *: "Resume"
+  </dest>
+  <voice>
+    *: "Resume"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_CONTEXT_DELETE
+  desc: bookmark context menu, delete this bookmark
+  user:
+  <source>
+    *: "Delete"
+  </source>
+  <dest>
+    *: "Delete"
+  </dest>
+  <voice>
+    *: "Delete"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BOOKMARK_SELECT_INDEX_TEXT
+  desc: voice only, used in the bookmark list to label index number
+  user:
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Index"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BOOKMARK_SELECT_TIME_TEXT
+  desc: voice only, used in the bookmark select list to label elapsed time
+  user:
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Time"
+  </voice>
+</phrase>

diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 25acb517aa..ecfa2be042 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang
@@ -4712,13 +4712,13 @@
4712	</phrase>	4712	</phrase>
4713	<phrase>	4713	<phrase>
4714	id: LANG_BOOKMARK_SELECT_LIST_BOOKMARKS	4714	id: LANG_BOOKMARK_SELECT_LIST_BOOKMARKS
4715	desc: From the auto-load screen, allows user to list all bookmarks	4715	desc: DEPRECATED
4716	user:	4716	user:
4717	<source>	4717	<source>
4718	*: "Down = List"	4718	*: ""
4719	</source>	4719	</source>
4720	<dest>	4720	<dest>
4721	*: "Down = List"	4721	*: deprecated
4722	</dest>	4722	</dest>
4723	<voice>	4723	<voice>
4724	*: ""	4724	*: ""
@@ -4726,25 +4726,13 @@
4726	</phrase>	4726	</phrase>
4727	<phrase>	4727	<phrase>
4728	id: LANG_BOOKMARK_SELECT_EXIT	4728	id: LANG_BOOKMARK_SELECT_EXIT
4729	desc: From the bookmark list screen, allows user to exit	4729	desc: DEPRECATED
4730	user:	4730	user:
4731	<source>	4731	<source>
4732	*: "OFF = Exit"	4732	*: ""
4733	h100,h120,h300: "STOP = Exit"
4734	ipod*: "PLAY/PAUSE = Exit"
4735	x5: "RECORD = Exit"
4736	h10,h10_5gb: "PREV = Exit"
4737	gigabeatf: "A = Exit"
4738	e200: "POWER = Exit"
4739	</source>	4733	</source>
4740	<dest>	4734	<dest>
4741	*: "OFF = Exit"	4735	*: deprecated
4742	h100,h120,h300: "STOP = Exit"
4743	ipod*: "PLAY/PAUSE = Exit"
4744	x5: "RECORD = Exit"
4745	h10,h10_5gb: "PREV = Exit"
4746	gigabeatf: "A = Exit"
4747	e200: "POWER = Exit"
4748	</dest>	4736	</dest>
4749	<voice>	4737	<voice>
4750	*: ""	4738	*: ""
@@ -4752,13 +4740,13 @@
4752	</phrase>	4740	</phrase>
4753	<phrase>	4741	<phrase>
4754	id: LANG_BOOKMARK_SELECT_BOOKMARK_TEXT	4742	id: LANG_BOOKMARK_SELECT_BOOKMARK_TEXT
4755	desc: Used on the bookmark select window to label bookmark number	4743	desc: DEPRECATED
4756	user:	4744	user:
4757	<source>	4745	<source>
4758	*: "Bookmark"	4746	*: ""
4759	</source>	4747	</source>
4760	<dest>	4748	<dest>
4761	*: "Bookmark"	4749	*: deprecated
4762	</dest>	4750	</dest>
4763	<voice>	4751	<voice>
4764	*: ""	4752	*: ""
@@ -4766,53 +4754,41 @@
4766	</phrase>	4754	</phrase>
4767	<phrase>	4755	<phrase>
4768	id: LANG_BOOKMARK_SELECT_INDEX_TEXT	4756	id: LANG_BOOKMARK_SELECT_INDEX_TEXT
4769	desc: Used on the bookmark select window to label index number	4757	desc: DEPRECATED
4770	user:	4758	user:
4771	<source>	4759	<source>
4772	*: "Index"	4760	*: ""
4773	</source>	4761	</source>
4774	<dest>	4762	<dest>
4775	*: "Index"	4763	*: deprecated
4776	</dest>	4764	</dest>
4777	<voice>	4765	<voice>
4778	*: "Index"	4766	*: ""
4779	</voice>	4767	</voice>
4780	</phrase>	4768	</phrase>
4781	<phrase>	4769	<phrase>
4782	id: LANG_BOOKMARK_SELECT_TIME_TEXT	4770	id: LANG_BOOKMARK_SELECT_TIME_TEXT
4783	desc: Used on the bookmark select window to label elapsed time	4771	desc: DEPRECATED
4784	user:	4772	user:
4785	<source>	4773	<source>
4786	*: "Time"	4774	*: ""
4787	</source>	4775	</source>
4788	<dest>	4776	<dest>
4789	*: "Time"	4777	*: deprecated
4790	</dest>	4778	</dest>
4791	<voice>	4779	<voice>
4792	*: "Time"	4780	*: ""
4793	</voice>	4781	</voice>
4794	</phrase>	4782	</phrase>
4795	<phrase>	4783	<phrase>
4796	id: LANG_BOOKMARK_SELECT_PLAY	4784	id: LANG_BOOKMARK_SELECT_PLAY
4797	desc: Used on the bookmark select window to indicated the play option	4785	desc: DEPRECATED
4798	user:	4786	user:
4799	<source>	4787	<source>
4800	*: "PLAY = Select"	4788	*: ""
4801	h100,h120,h300: "NAVI = Select"
4802	ipod*: "SELECT = Select"
4803	x5: "SELECT = Select"
4804	h10,h10_5gb: "SELECT = Select"
4805	gigabeatf: "SELECT = Select"
4806	e200: "SELECT = Select"
4807	</source>	4789	</source>
4808	<dest>	4790	<dest>
4809	*: "PLAY = Select"	4791	*: deprecated
4810	h100,h120,h300: "NAVI = Select"
4811	ipod*: "SELECT = Select"
4812	x5: "SELECT = Select"
4813	h10,h10_5gb: "SELECT = Select"
4814	gigabeatf: "SELECT = Select"
4815	e200: "SELECT = Select"
4816	</dest>	4792	</dest>
4817	<voice>	4793	<voice>
4818	*: ""	4794	*: ""
@@ -4820,25 +4796,13 @@
4820	</phrase>	4796	</phrase>
4821	<phrase>	4797	<phrase>
4822	id: LANG_BOOKMARK_SELECT_DELETE	4798	id: LANG_BOOKMARK_SELECT_DELETE
4823	desc: Used on the bookmark select window to indicated the bookmark delete option	4799	desc: DEPRECATED
4824	user:	4800	user:
4825	<source>	4801	<source>
4826	*: "ON+Play = Delete"	4802	*: ""
4827	h100,h120,h300: "RECORD = Delete"
4828	ipod*: "Long MENU = Delete"
4829	x5: "Long RECORD = Delete"
4830	h10,h10_5gb: "REWIND = Delete"
4831	gigabeatf: "POWER = Delete"
4832	e200: "PLAY = Delete"
4833	</source>	4803	</source>
4834	<dest>	4804	<dest>
4835	*: "ON+Play = Delete"	4805	*: deprecated
4836	h100,h120,h300: "RECORD = Delete"
4837	ipod*: "Long MENU = Delete"
4838	x5: "Long RECORD = Delete"
4839	h10,h10_5gb: "REWIND = Delete"
4840	gigabeatf: "POWER = Delete"
4841	e200: "PLAY = Delete"
4842	</dest>	4806	</dest>
4843	<voice>	4807	<voice>
4844	*: ""	4808	*: ""
@@ -4846,13 +4810,13 @@
4846	</phrase>	4810	</phrase>
4847	<phrase>	4811	<phrase>
4848	id: LANG_BOOKMARK_AUTOLOAD_QUERY	4812	id: LANG_BOOKMARK_AUTOLOAD_QUERY
4849	desc: prompt for user to decide to create a bookmark	4813	desc: DEPRECATED
4850	user:	4814	user:
4851	<source>	4815	<source>
4852	*: "Load Last Bookmark?"	4816	*: ""
4853	</source>	4817	</source>
4854	<dest>	4818	<dest>
4855	*: "Load Last Bookmark?"	4819	*: deprecated
4856	</dest>	4820	</dest>
4857	<voice>	4821	<voice>
4858	*: ""	4822	*: ""
@@ -10862,4 +10826,129 @@
10862	*: "Moving"	10826	*: "Moving"
10863	</voice>	10827	</voice>
10864	</phrase>	10828	</phrase>
10865		10829	<phrase>
		10830	id: LANG_BOOKMARK_SELECT_BOOKMARK
		10831	desc: bookmark selection list title
		10832	user:
		10833	<source>
		10834	*: "Select Bookmark"
		10835	</source>
		10836	<dest>
		10837	*: "Select Bookmark"
		10838	</dest>
		10839	<voice>
		10840	*: "Select Bookmark"
		10841	</voice>
		10842	</phrase>
		10843	<phrase>
		10844	id: LANG_BOOKMARK_DONT_RESUME
		10845	desc: top item in the list when asking user about bookmark auto load
		10846	user:
		10847	<source>
		10848	*: "<Don't Resume>"
		10849	</source>
		10850	<dest>
		10851	*: "<Don't Resume>"
		10852	</dest>
		10853	<voice>
		10854	*: "Do Not Resume"
		10855	</voice>
		10856	</phrase>
		10857	<phrase>
		10858	id: LANG_BOOKMARK_SHUFFLE
		10859	desc: bookmark selection list, bookmark enables shuffle
		10860	user:
		10861	<source>
		10862	*: ", Shuffle"
		10863	</source>
		10864	<dest>
		10865	*: ", Shuffle"
		10866	</dest>
		10867	<voice>
		10868	*: ""
		10869	</voice>
		10870	</phrase>
		10871	<phrase>
		10872	id: LANG_BOOKMARK_INVALID
		10873	desc: bookmark selection list, bookmark couldn't be parsed
		10874	user:
		10875	<source>
		10876	*: "<Invalid Bookmark>"
		10877	</source>
		10878	<dest>
		10879	*: "<Invalid Bookmark>"
		10880	</dest>
		10881	<voice>
		10882	*: "Invalid Bookmark"
		10883	</voice>
		10884	</phrase>
		10885	<phrase>
		10886	id: LANG_BOOKMARK_CONTEXT_MENU
		10887	desc: bookmark selection list context menu
		10888	user:
		10889	<source>
		10890	*: "Bookmark Actions"
		10891	</source>
		10892	<dest>
		10893	*: "Bookmark Actions"
		10894	</dest>
		10895	<voice>
		10896	*: "Bookmark Actions"
		10897	</voice>
		10898	</phrase>
		10899	<phrase>
		10900	id: LANG_BOOKMARK_CONTEXT_RESUME
		10901	desc: bookmark context menu, resume this bookmark
		10902	user:
		10903	<source>
		10904	*: "Resume"
		10905	</source>
		10906	<dest>
		10907	*: "Resume"
		10908	</dest>
		10909	<voice>
		10910	*: "Resume"
		10911	</voice>
		10912	</phrase>
		10913	<phrase>
		10914	id: LANG_BOOKMARK_CONTEXT_DELETE
		10915	desc: bookmark context menu, delete this bookmark
		10916	user:
		10917	<source>
		10918	*: "Delete"
		10919	</source>
		10920	<dest>
		10921	*: "Delete"
		10922	</dest>
		10923	<voice>
		10924	*: "Delete"
		10925	</voice>
		10926	</phrase>
		10927	<phrase>
		10928	id: VOICE_BOOKMARK_SELECT_INDEX_TEXT
		10929	desc: voice only, used in the bookmark list to label index number
		10930	user:
		10931	<source>
		10932	*: ""
		10933	</source>
		10934	<dest>
		10935	*: ""
		10936	</dest>
		10937	<voice>
		10938	*: "Index"
		10939	</voice>
		10940	</phrase>
		10941	<phrase>
		10942	id: VOICE_BOOKMARK_SELECT_TIME_TEXT
		10943	desc: voice only, used in the bookmark select list to label elapsed time
		10944	user:
		10945	<source>
		10946	*: ""
		10947	</source>
		10948	<dest>
		10949	*: ""
		10950	</dest>
		10951	<voice>
		10952	*: "Time"
		10953	</voice>
		10954	</phrase>