Index: apps/lang/deutsch.lang
===================================================================
--- apps/lang/deutsch.lang	(revision 14893)
+++ apps/lang/deutsch.lang	(working copy)
@@ -7362,7 +7362,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Zeige ID3-Info"
Index: apps/lang/dansk.lang
===================================================================
--- apps/lang/dansk.lang	(revision 14893)
+++ apps/lang/dansk.lang	(working copy)
@@ -3318,7 +3318,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Vis metadata"
Index: apps/lang/polski.lang
===================================================================
--- apps/lang/polski.lang	(revision 14893)
+++ apps/lang/polski.lang	(working copy)
@@ -3880,7 +3880,7 @@
   desc: Menu option to start tag viewer
   user: 
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Pokaż info ID3"
Index: apps/lang/wallisertitsch.lang
===================================================================
--- apps/lang/wallisertitsch.lang	(revision 14893)
+++ apps/lang/wallisertitsch.lang	(working copy)
@@ -2608,7 +2608,7 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Zeig ID3 Info"
Index: apps/lang/chinese-trad.lang
===================================================================
--- apps/lang/chinese-trad.lang	(revision 14893)
+++ apps/lang/chinese-trad.lang	(working copy)
@@ -3889,13 +3889,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "顯示標籤資訊"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/eesti.lang
===================================================================
--- apps/lang/eesti.lang	(revision 14893)
+++ apps/lang/eesti.lang	(working copy)
@@ -3991,7 +3991,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Näita ID3 infot"
Index: apps/lang/svenska.lang
===================================================================
--- apps/lang/svenska.lang	(revision 14893)
+++ apps/lang/svenska.lang	(working copy)
@@ -7366,13 +7366,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Visa spårinfo"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/hebrew.lang
===================================================================
--- apps/lang/hebrew.lang	(revision 14893)
+++ apps/lang/hebrew.lang	(working copy)
@@ -3041,13 +3041,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "ID3 הצג מידע"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/nederlands.lang
===================================================================
--- apps/lang/nederlands.lang	(revision 14893)
+++ apps/lang/nederlands.lang	(working copy)
@@ -3889,7 +3889,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Toon ID3 info"
Index: apps/lang/korean.lang
===================================================================
--- apps/lang/korean.lang	(revision 14893)
+++ apps/lang/korean.lang	(working copy)
@@ -4016,7 +4016,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "ID3 정보 보기"
Index: apps/lang/magyar.lang
===================================================================
--- apps/lang/magyar.lang	(revision 14893)
+++ apps/lang/magyar.lang	(working copy)
@@ -7361,13 +7361,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Fájl info"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/russian.lang
===================================================================
--- apps/lang/russian.lang	(revision 14893)
+++ apps/lang/russian.lang	(working copy)
@@ -3798,13 +3798,13 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Показывать инф. ID3"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/catala.lang
===================================================================
--- apps/lang/catala.lang	(revision 14893)
+++ apps/lang/catala.lang	(working copy)
@@ -2440,7 +2440,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Mostrar Info ID3"
Index: apps/lang/thai.lang
===================================================================
--- apps/lang/thai.lang	(revision 14893)
+++ apps/lang/thai.lang	(working copy)
@@ -7378,13 +7378,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "แสดงข้อมูล ID3"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/japanese.lang
===================================================================
--- apps/lang/japanese.lang	(revision 14893)
+++ apps/lang/japanese.lang	(working copy)
@@ -7371,13 +7371,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "ID3情報の表示"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/francais.lang
===================================================================
--- apps/lang/francais.lang	(revision 14893)
+++ apps/lang/francais.lang	(working copy)
@@ -7397,7 +7397,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Montrer infos tags"
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 14893)
+++ apps/lang/english.lang	(working copy)
@@ -7433,13 +7433,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/norsk.lang
===================================================================
--- apps/lang/norsk.lang	(revision 14893)
+++ apps/lang/norsk.lang	(working copy)
@@ -3475,13 +3475,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Vis ID3-info"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/czech.lang
===================================================================
--- apps/lang/czech.lang	(revision 14893)
+++ apps/lang/czech.lang	(working copy)
@@ -4012,7 +4012,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Zobraz ID3 Info"
Index: apps/lang/portugues.lang
===================================================================
--- apps/lang/portugues.lang	(revision 14893)
+++ apps/lang/portugues.lang	(working copy)
@@ -3840,13 +3840,13 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Ver Informação ID3"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/finnish.lang
===================================================================
--- apps/lang/finnish.lang	(revision 14893)
+++ apps/lang/finnish.lang	(working copy)
@@ -3880,7 +3880,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Näytä ID3-tiedot"
Index: apps/lang/galego.lang
===================================================================
--- apps/lang/galego.lang	(revision 14893)
+++ apps/lang/galego.lang	(working copy)
@@ -2832,13 +2832,13 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Amosar Info ID3"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/italiano.lang
===================================================================
--- apps/lang/italiano.lang	(revision 14893)
+++ apps/lang/italiano.lang	(working copy)
@@ -3598,7 +3598,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Mostra info ID3"
Index: apps/lang/esperanto.lang
===================================================================
--- apps/lang/esperanto.lang	(revision 14893)
+++ apps/lang/esperanto.lang	(working copy)
@@ -3994,7 +3994,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Montri ID3an Informojn"
Index: apps/lang/espanol.lang
===================================================================
--- apps/lang/espanol.lang	(revision 14893)
+++ apps/lang/espanol.lang	(working copy)
@@ -2720,7 +2720,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Mostrar Información ID3"
Index: apps/lang/islenska.lang
===================================================================
--- apps/lang/islenska.lang	(revision 14893)
+++ apps/lang/islenska.lang	(working copy)
@@ -3028,13 +3028,13 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Sýna ID3 Uppl."
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/slovenscina.lang
===================================================================
--- apps/lang/slovenscina.lang	(revision 14893)
+++ apps/lang/slovenscina.lang	(working copy)
@@ -1768,7 +1768,7 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Pokazi ID3 Info"
Index: apps/lang/chinese-simp.lang
===================================================================
--- apps/lang/chinese-simp.lang	(revision 14893)
+++ apps/lang/chinese-simp.lang	(working copy)
@@ -3889,13 +3889,13 @@
   desc: Menu option to start tag viewer
   user: 
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "显示标签信息"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/portugues-brasileiro.lang
===================================================================
--- apps/lang/portugues-brasileiro.lang	(revision 14893)
+++ apps/lang/portugues-brasileiro.lang	(working copy)
@@ -7369,13 +7369,13 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Ver Informação ID3"
   </dest>
   <voice>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </voice>
 </phrase>
 <phrase>
Index: apps/lang/norsk-nynorsk.lang
===================================================================
--- apps/lang/norsk-nynorsk.lang	(revision 14893)
+++ apps/lang/norsk-nynorsk.lang	(working copy)
@@ -3746,7 +3746,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Vis ID3-info"
Index: apps/lang/romaneste.lang
===================================================================
--- apps/lang/romaneste.lang	(revision 14893)
+++ apps/lang/romaneste.lang	(working copy)
@@ -1459,7 +1459,7 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Info ID3"
Index: apps/lang/greek.lang
===================================================================
--- apps/lang/greek.lang	(revision 14893)
+++ apps/lang/greek.lang	(working copy)
@@ -3041,7 +3041,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Εμφάνιση πληροφοριών ID3"
Index: manual/rockbox_interface/wps.tex
===================================================================
--- manual/rockbox_interface/wps.tex	(revision 14893)
+++ manual/rockbox_interface/wps.tex	(working copy)
@@ -181,8 +181,8 @@
 \subsubsection{Bookmarks}
 This allows you to create a bookmark in the currently-playing track.
 
-\subsubsection{\label{ref:ID3viewer}Show ID3 info}
-\screenshot{rockbox_interface/images/ss-id3-viewer}{The ID3 viewer}{}
+\subsubsection{\label{ref:trackinfoviewer}Show Track Info}
+\screenshot{rockbox_interface/images/ss-id3-viewer}{The track info viewer}{}
 This screen is accessible from the WPS screen, and provides a detailed view of
 all the identity information about the current track. This info is known as
 meta data and is stored in audio file formats to keep information on artist,
@@ -191,7 +191,7 @@
   press \ActionWpsIdThreeScreen. }%
 \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD}{press \ActionWpsContext{}
   to access the \setting{WPS Context Menu} and select
-  \setting{Show ID3 info}. }%
+  \setting{Show Track Info}. }%
 \opt{RECORDER_PAD,PLAYER_PAD,ONDIO_PAD}{Use \ButtonLeft\ and \ButtonRight\
   to move through the information.}%
 \subsubsection{Open With...}