diff --git a/apps/lang/catala.lang b/apps/lang/catala.lang
index 87408d7986..44bc353fbc 100644
--- a/apps/lang/catala.lang
+++ b/apps/lang/catala.lang
@@ -2440,7 +2440,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Mostrar Info ID3"
diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 7e3c4e136a..cc24417917 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -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>
diff --git a/apps/lang/chinese-trad.lang b/apps/lang/chinese-trad.lang
index a9ae4eab30..77a5b4e28c 100644
--- a/apps/lang/chinese-trad.lang
+++ b/apps/lang/chinese-trad.lang
@@ -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>
diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index f79fee7cdd..5ea1bc4092 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -4012,7 +4012,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Zobraz ID3 Info"
diff --git a/apps/lang/dansk.lang b/apps/lang/dansk.lang
index 23304b730f..495f41795c 100644
--- a/apps/lang/dansk.lang
+++ b/apps/lang/dansk.lang
@@ -3318,7 +3318,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Vis metadata"
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 2b915d7ad8..b020e33233 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -7362,7 +7362,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Zeige ID3-Info"
diff --git a/apps/lang/eesti.lang b/apps/lang/eesti.lang
index 14b5c31ec5..9f367ba6e1 100644
--- a/apps/lang/eesti.lang
+++ b/apps/lang/eesti.lang
@@ -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"
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index de254a3b1d..6ad4313cf4 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -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>
diff --git a/apps/lang/espanol.lang b/apps/lang/espanol.lang
index bcbcdfad17..4e0f1135e5 100644
--- a/apps/lang/espanol.lang
+++ b/apps/lang/espanol.lang
@@ -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"
diff --git a/apps/lang/esperanto.lang b/apps/lang/esperanto.lang
index f4c110081b..54710c502e 100644
--- a/apps/lang/esperanto.lang
+++ b/apps/lang/esperanto.lang
@@ -3994,7 +3994,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Montri ID3an Informojn"
diff --git a/apps/lang/finnish.lang b/apps/lang/finnish.lang
index 451a05aa77..9a9d132027 100644
--- a/apps/lang/finnish.lang
+++ b/apps/lang/finnish.lang
@@ -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"
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 1a1e8f891c..a21aab37a8 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -7397,7 +7397,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Montrer infos tags"
diff --git a/apps/lang/galego.lang b/apps/lang/galego.lang
index cd2fc2362c..90505b273e 100644
--- a/apps/lang/galego.lang
+++ b/apps/lang/galego.lang
@@ -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>
diff --git a/apps/lang/greek.lang b/apps/lang/greek.lang
index 0616a1014f..97a5641537 100644
--- a/apps/lang/greek.lang
+++ b/apps/lang/greek.lang
@@ -3041,7 +3041,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Εμφάνιση πληροφοριών ID3"
diff --git a/apps/lang/hebrew.lang b/apps/lang/hebrew.lang
index 543efacac1..731c7389c4 100644
--- a/apps/lang/hebrew.lang
+++ b/apps/lang/hebrew.lang
@@ -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>
diff --git a/apps/lang/islenska.lang b/apps/lang/islenska.lang
index 35485e5975..751e1fc415 100644
--- a/apps/lang/islenska.lang
+++ b/apps/lang/islenska.lang
@@ -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>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index fd4f07e9e5..ee12ce0bec 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -3598,7 +3598,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Mostra info ID3"
diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index bb4ecad059..8e78a4b98d 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -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>
diff --git a/apps/lang/korean.lang b/apps/lang/korean.lang
index 2303427530..f82f2457ca 100644
--- a/apps/lang/korean.lang
+++ b/apps/lang/korean.lang
@@ -4016,7 +4016,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "ID3 정보 보기"
diff --git a/apps/lang/magyar.lang b/apps/lang/magyar.lang
index a1dd10c816..2bbcf4504e 100644
--- a/apps/lang/magyar.lang
+++ b/apps/lang/magyar.lang
@@ -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>
diff --git a/apps/lang/nederlands.lang b/apps/lang/nederlands.lang
index 48a48772b0..4a52c49736 100644
--- a/apps/lang/nederlands.lang
+++ b/apps/lang/nederlands.lang
@@ -3889,7 +3889,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Toon ID3 info"
diff --git a/apps/lang/norsk-nynorsk.lang b/apps/lang/norsk-nynorsk.lang
index 4c19aed5aa..956e505389 100644
--- a/apps/lang/norsk-nynorsk.lang
+++ b/apps/lang/norsk-nynorsk.lang
@@ -3746,7 +3746,7 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Vis ID3-info"
diff --git a/apps/lang/norsk.lang b/apps/lang/norsk.lang
index 5df94f6f67..92d159174b 100644
--- a/apps/lang/norsk.lang
+++ b/apps/lang/norsk.lang
@@ -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>
diff --git a/apps/lang/polski.lang b/apps/lang/polski.lang
index bf3e90ae96..d453b75786 100644
--- a/apps/lang/polski.lang
+++ b/apps/lang/polski.lang
@@ -3880,7 +3880,7 @@
   desc: Menu option to start tag viewer
   user: 
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Pokaż info ID3"
diff --git a/apps/lang/portugues-brasileiro.lang b/apps/lang/portugues-brasileiro.lang
index 4fefe69036..e468fa5617 100644
--- a/apps/lang/portugues-brasileiro.lang
+++ b/apps/lang/portugues-brasileiro.lang
@@ -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>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 3442e3d77b..0b694f7edd 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -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>
diff --git a/apps/lang/romaneste.lang b/apps/lang/romaneste.lang
index 2edcf57d9b..a2e77cf941 100644
--- a/apps/lang/romaneste.lang
+++ b/apps/lang/romaneste.lang
@@ -1459,7 +1459,7 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Info ID3"
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index c09c82729a..27624d746e 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -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>
diff --git a/apps/lang/slovenscina.lang b/apps/lang/slovenscina.lang
index dd336fdb22..9cad5979df 100644
--- a/apps/lang/slovenscina.lang
+++ b/apps/lang/slovenscina.lang
@@ -1768,7 +1768,7 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Pokazi ID3 Info"
diff --git a/apps/lang/svenska.lang b/apps/lang/svenska.lang
index 2bc5aa756b..24546d79a0 100644
--- a/apps/lang/svenska.lang
+++ b/apps/lang/svenska.lang
@@ -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>
diff --git a/apps/lang/thai.lang b/apps/lang/thai.lang
index 5c456ac9b0..8a16afbd4c 100644
--- a/apps/lang/thai.lang
+++ b/apps/lang/thai.lang
@@ -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>
diff --git a/apps/lang/wallisertitsch.lang b/apps/lang/wallisertitsch.lang
index 14d6e13979..65bb388ff9 100644
--- a/apps/lang/wallisertitsch.lang
+++ b/apps/lang/wallisertitsch.lang
@@ -2608,7 +2608,7 @@
   desc: Menu option to start id3 viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
     *: "Zeig ID3 Info"
diff --git a/docs/CREDITS b/docs/CREDITS
index 542278e914..83967930d8 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -335,6 +335,7 @@ Max Kelley
 Alexander Eickhoff
 Pinitnun Shanasabang
 Ken Fazzone
+David Bishop
 
 The libmad team
 The wavpack team
diff --git a/manual/rockbox_interface/wps.tex b/manual/rockbox_interface/wps.tex
index 00da1e9cc9..b7ceff04bb 100644
--- a/manual/rockbox_interface/wps.tex
+++ b/manual/rockbox_interface/wps.tex
@@ -181,8 +181,8 @@ browser. Press \ButtonRight{} to increment the value. The value wraps at 10.
 \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 @@ album etc. To access this screen, %
   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...}