pcm as3525v1: correct ASM constraint

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_6@26776 a1c6a512-1295-4272-9138-f99709370657

apps/audio_path.c

@@ -135,6 +135,15 @@ void audio_set_input_source(int source, unsigned flags)
 {
     (void)source;
     (void)flags;
+#if CONFIG_TUNER
+    /* Switch radio off or on per source and flags. */
+    if (source != AUDIO_SRC_FMRADIO)
+        radio_stop();
+    else if (flags & SRCF_FMRADIO_PAUSED)
+        radio_pause();
+    else
+        radio_start();
+#endif
 } /* audio_set_input_source */
 
 #ifdef HAVE_SPDIF_IN

apps/lang/catala.lang

@@ -250,10 +250,10 @@
     *: "Are You Sure?"
   </source>
   <dest>
-    *: "Estàs Segur?"
+    *: "N'estàs segur?"
   </dest>
   <voice>
-    *: "Estàs Segur?"
+    *: "n'estàs segur?"
   </voice>
 </phrase>
 <phrase>
@@ -456,7 +456,7 @@
     *: "Connectors"
   </dest>
   <voice>
-    *: "Mostra Connectors"
+    *: "Mostra connectors"
   </voice>
 </phrase>
 <phrase>
@@ -509,7 +509,7 @@
     *: ", Shuffle"
   </source>
   <dest>
-    *: ", Aleatori"
+    *: ", aleatori"
   </dest>
   <voice>
     *: ""
@@ -596,7 +596,7 @@
     *: "Punt de pàgina creat"
   </dest>
   <voice>
-    *: "Punt de pàgina Creat"
+    *: "Punt de pàgina creat"
   </voice>
 </phrase>
 <phrase>
@@ -624,7 +624,7 @@
     *: "Punt de pàgina buit"
   </dest>
   <voice>
-    *: "Punt de pàgina Buit"
+    *: "Punt de pàgina buit"
   </voice>
 </phrase>
 <phrase>
@@ -778,7 +778,7 @@
     *: "Mono dret"
   </dest>
   <voice>
-    *: "Mono Dret"
+    *: "Mono dret"
   </voice>
 </phrase>
 <phrase>
@@ -857,7 +857,7 @@
   </dest>
   <voice>  
     *: none
-    swcodec: "Guany Creuat"
+    swcodec: "Guany creuat"
   </voice>
 </phrase>
 <phrase>
@@ -921,11 +921,11 @@
   </source>
   <dest>
     *: none
-    swcodec: "Activar EQ"
+    swcodec: "Activa EQ"
   </dest>
   <voice>
     *: none
-    swcodec: "Activar equalitzador"
+    swcodec: "Activa equalitzador"
   </voice>
 </phrase>
 <phrase>
@@ -1145,7 +1145,7 @@
   </dest>
   <voice>
     *: none
-    swcodec: "Freqüència Central"
+    swcodec: "Freqüència central"
   </voice>
 </phrase>
 <phrase>
@@ -1344,11 +1344,11 @@
   </source>
   <dest>
     *: none
-    masf: "Activar MDB"
+    masf: "Activa MDB"
   </dest>
   <voice>
     *: none
-    masf: "Activar MDB"
+    masf: "Activa MDB"
   </voice>
 </phrase>
 <phrase>
@@ -1648,7 +1648,7 @@
   </dest>
   <voice>
     *: none
-    crossfade: "Activar Crosféid"
+    crossfade: "Activar crosféid"
   </voice>
 </phrase>
 <phrase>
@@ -2082,7 +2082,7 @@
     *: "Suport per Cuesheet"
   </dest>
   <voice>
-    *: "Suport per Cuesheet"
+    *: "Suport per cuesheet"
   </voice>
 </phrase>
 <phrase>
@@ -2329,10 +2329,10 @@
     *: "Show Path"
   </source>
   <dest>
-    *: "Mostra Camí"
+    *: "Mostra camí"
   </dest>
   <voice>
-    *: "Mostra Camí"
+    *: "Mostra camí"
   </voice>
 </phrase>
 <phrase>
@@ -2343,10 +2343,10 @@
     *: "Current Directory Only"
   </source>
   <dest>
-    *: "Només Directori Actual"
+    *: "Només directori actual"
   </dest>
   <voice>
-    *: "Només Directori Actual"
+    *: "Només directori actual"
   </voice>
 </phrase>
 <phrase>
@@ -2357,10 +2357,10 @@
     *: "Full Path"
   </source>
   <dest>
-    *: "Camí Complet"
+    *: "Camí complert"
   </dest>
   <voice>
-    *: "Ruta Completa"
+    *: "Camí complert"
   </voice>
 </phrase>
 <phrase>
@@ -2378,7 +2378,7 @@
   <dest>
     *: "Construint la base de dades... %d trobats (OFF per tornar)"
     iriverh100,iriverh120,iriverh300: "Construint la base de dades.... %d trobats (STOP per tornar)"
-    ipod*: "Construint la base de dades...Construint Base de dades... %d trobats (PREV per tornar)"
+    ipod*: "Construint la base de dades...Construint base de dades... %d trobats (PREV per tornar)"
     iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construint la base de dades... %d trobats (LEFT per tornar)"
     iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*,vibe500: "Construint la base de dades... %d trobats (PREV per tornar)"
     gogearsa9200: "Construint la base de dades... %d trobats (REW per tornar)"
@@ -2412,10 +2412,10 @@
     *: "Auto Update"
   </source>
   <dest>
-    *: "Actualització Automàtica"
+    *: "Actualització automàtica"
   </dest>
   <voice>
-    *: "Actualització Automàtica"
+    *: "Actualització automàtica"
   </voice>
 </phrase>
 <phrase>
@@ -2454,10 +2454,10 @@
     *: "Gather Runtime Data"
   </source>
   <dest>
-    *: "Recollir Runtime Data"
+    *: "Recollir informació del temps d'execució"
   </dest>
   <voice>
-    *: "Recollir Runtime Data"
+    *: "Recollir informació del temps d'execució"
   </voice>
 </phrase>
 <phrase>
@@ -2468,10 +2468,10 @@
     *: "Export Modifications"
   </source>
   <dest>
-    *: "Exportar Modificacions"
+    *: "Exportar modificacions"
   </dest>
   <voice>
-    *: "Exportar Modificacions"
+    *: "Exportar modificacions"
   </voice>
 </phrase>
 <phrase>
@@ -2482,10 +2482,10 @@
     *: "Import Modifications"
   </source>
   <dest>
-    *: "Importar Modificacions"
+    *: "Importar modificacions"
   </dest>
   <voice>
-    *: "Importar Modificacions"
+    *: "Importar modificacions"
   </voice>
 </phrase>
 <phrase>
@@ -2496,10 +2496,10 @@
     *: "Updating in background"
   </source>
   <dest>
-    *: "Actualitzant en segon plà"
+    *: "Actualitzant en segon pla"
   </dest>
   <voice>
-    *: "Actualitzant en segon plà"
+    *: "Actualitzant en segon pla"
   </voice>
 </phrase>
 <phrase>
@@ -2524,10 +2524,10 @@
     *: "Database is not ready"
   </source>
   <dest>
-    *: "Base de dades no llesta"
+    *: "La base de dades no està llesta"
   </dest>
   <voice>
-    *: "Base de dades no llesta"
+    *: "La base de dades no està llesta"
   </voice>
 </phrase>
 <phrase>
@@ -2572,7 +2572,7 @@
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Mostra tipus de lletra"
+    lcd_bitmap: "Mostra els tipus de lletra"
   </voice>
 </phrase>
 <phrase>
@@ -2614,10 +2614,10 @@
     *: "LCD Settings"
   </source>
   <dest>
-    *: "Opcions del LCD"
+    *: "Opcions de la LCD"
   </dest>
   <voice>
-    *: "Opcions del LCD"
+    *: "Opcions de la LCD"
   </voice>
 </phrase>
 <phrase>
@@ -2644,11 +2644,11 @@
   </source>
   <dest>
     *: none
-    charging: "Il·luminat mentre endollat"
+    charging: "Il·luminació mentres endollat"
   </dest>
   <voice>
     *: none
-    charging: "Il·luminat mentre endollat"
+    charging: "Il·luminació mentres endollat"
   </voice>
 </phrase>
 <phrase>
@@ -2661,11 +2661,11 @@
   </source>
   <dest>
     *: none
-    hold_button: "Llum quan Bloquejat"
+    hold_button: "Il·luminació mentres bloquejat"
   </dest>
   <voice>
     *: none
-    hold_button: "Llum quan Bloquejat"
+    hold_button: "Il·luminació mentres bloquejat"
   </voice>
 </phrase>
 <phrase>
@@ -2740,11 +2740,11 @@
   </source>
   <dest>
     *: none
-    lcd_sleep: "Dormir (Després d'apagar llum)"
+    lcd_sleep: "Dormir (després d'apagar il·luminació)"
   </dest>
   <voice>
     *: none
-    lcd_sleep: "Dormir després d'apagar llum"
+    lcd_sleep: "Dormir (després d'apagar la il·luminació)"
   </voice>
 </phrase>
 <phrase>
@@ -2809,7 +2809,7 @@
   </dest>
   <voice>
     *: none
-    lcd_invert,remote_lcd_invert: "Mode LCD"
+    lcd_invert,remote_lcd_invert: "Mode de la LCD"
   </voice>
 </phrase>
 <phrase>
@@ -2856,11 +2856,11 @@
   </source>
   <dest>
   *: none
-    lcd_bitmap: "Tipus de Selector de línia"
+    lcd_bitmap: "Tipus de selector de línia"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Tipus de Selector de línia"
+    lcd_bitmap: "Tipus de selector de línia"
   </voice>
 </phrase>
 <phrase>
@@ -3026,11 +3026,11 @@
   </source>
   <dest>
     *: none
-    remote: "Opcions de LCD remot"
+    remote: "Opcions de LCD remota"
     </dest>
   <voice>
     *: none
-    remote: "Opcions de LCD remot"
+    remote: "Opcions de LCD remota"
   </voice>
 </phrase>
 <phrase>
@@ -3848,7 +3848,7 @@
   </dest>
   <voice>
     *: none
-    button_light: "Apagat de llum de botons"
+    button_light: "Apagat de la llum de botons"
     sansafuze*,sansae200*: "Apagat de llum de la roda"
   </voice>
 </phrase>
@@ -3866,7 +3866,7 @@
   </dest>
   <voice>
     *: none
-    buttonlight_brightness: "Brillantor de la Llum dels Botons"
+    buttonlight_brightness: "Brillantor de la llum dels botons"
   </voice>
 </phrase>
 <phrase>
@@ -4065,11 +4065,11 @@
   </source>
   <dest>
     *: none
-    rtc: "Posar Hora/Data"
+    rtc: "Posa Hora/Data"
   </dest>
   <voice>
     *: none
-    rtc: "Posar Hora/Data"
+    rtc: "Posa Hora/Data"
   </voice>
 </phrase>
 <phrase>
@@ -4763,7 +4763,7 @@
     *: "Punt de pàgina en aturar"
   </dest>
   <voice>
-    *: "Punt de pàgina en Aturar"
+    *: "Punt de pàgina en aturar"
   </voice>
 </phrase>
 <phrase>
@@ -4774,10 +4774,10 @@
     *: "Yes - Recent only"
   </source>
   <dest>
-    *: "Si - Només recents"
+    *: "Sí - Només recents"
   </dest>
   <voice>
-    *: "Si - Només Recents"
+    *: "Sí - Només Recents"
   </voice>
 </phrase>
 <phrase>
@@ -4788,10 +4788,10 @@
     *: "Ask - Recent only"
   </source>
   <dest>
-    *: "Preguntar - Només Recents"
+    *: "Pregunta - Només Recents"
   </dest>
   <voice>
-    *: "Preguntar - Només Recents"
+    *: "Pregunta - Només Recents"
   </voice>
 </phrase>
 <phrase>
@@ -4802,10 +4802,10 @@
     *: "Load Last Bookmark"
   </source>
   <dest>
-    *: "Carregar darrer punt de pàgina"
+    *: "Carrega darrer punt de pàgina"
   </dest>
   <voice>
-    *: "Carregar darrer punt de pàgina"
+    *: "Carrega darrer punt de pàgina"
   </voice>
 </phrase>
 <phrase>
@@ -4914,10 +4914,10 @@
     *: "Use Directory .talk Clips"
   </source>
   <dest>
-    *: "Usar fitxers .talk dels directoris"
+    *: "Usa fitxers .talk dels directoris"
   </dest>
   <voice>
-    *: "Usar fitxers .talk dels directoris"
+    *: "Usa fitxers .talk dels directoris"
   </voice>
 </phrase>
 <phrase>
@@ -4942,10 +4942,10 @@
     *: "Use File .talk Clips"
   </source>
   <dest>
-    *: "Usar fitxers .talk"
+    *: "Usa fitxers .talk"
   </dest>
   <voice>
-    *: "Usar fitxers .talk"
+    *: "Usa fitxers .talk"
   </voice>
 </phrase>
 <phrase>
@@ -4998,10 +4998,10 @@
     *: "Manage Settings"
   </source>
   <dest>
-    *: "Gestionar Opcions"
+    *: "Gestiona Opcions"
   </dest>
   <voice>
-    *: "Gestionar opcions"
+    *: "Gestiona opcions"
   </voice>
 </phrase>
 <phrase>
@@ -5040,10 +5040,10 @@
     *: "Reset Settings"
   </source>
   <dest>
-    *: "Reiniciar opcions"
+    *: "Reinicia opcions"
   </dest>
   <voice>
-    *: "Reiniciar opcions"
+    *: "Reinicia opcions"
   </voice>
 </phrase>
 <phrase>
@@ -5208,11 +5208,11 @@
   </source>
   <dest>
     *: none
-    radio: "Editar presintonía"
+    radio: "Edita presintonía"
   </dest>
   <voice>
     *: none
-    radio: "Editar presintonía"
+    radio: "Edita presintonía"
   </voice>
 </phrase>
 <phrase>
@@ -5225,11 +5225,11 @@
   </source>
   <dest>
     *: none
-    radio: "Eliminar Sintonia"
+    radio: "Eliminar sintonia"
   </dest>
   <voice>
     *: none
-    radio: "Eliminar Sintonia"
+    radio: "Eliminar sintonia"
   </voice>
 </phrase>
 <phrase>
@@ -5259,11 +5259,11 @@
   </source>
   <dest>
     *: none
-    radio: "Llista de Sintonies plena"
+    radio: "Llista de sintonies plena"
   </dest>
   <voice>
     *: none
-    radio: "Llista de Sintonies plena"
+    radio: "Llista de sintonies plena"
   </voice>
 </phrase>
 <phrase>
@@ -5564,11 +5564,11 @@
   </source>
   <dest>
    *: none
-    radio: "No s'han trobat presintoníes, AutoScan?"
+    radio: "No s'han trobat presintoníes, escaneig auto.?"
   </dest>
   <voice>
     *: none
-    radio: "No s'han trobat presintoníes, AutoScan?"
+    radio: "No s'han trobat presintoníes, escanejar automàticament?"
   </voice>
 </phrase>
 <phrase>
@@ -6692,7 +6692,7 @@
     *: "Pantalla de seguiment"
   </dest>
   <voice>
-    *: "Pantalla de Seguiment"
+    *: "Pantalla de seguiment"
   </voice>
 </phrase>
 <phrase>
@@ -7425,7 +7425,7 @@
     *: "Show Track Info"
   </source>
   <dest>
-    *: "Mostra info de pista"
+    *: "Mostra info. de pista"
   </dest>
   <voice>
     *: "Mostra Informació de Pista"
@@ -8065,11 +8065,11 @@
   </source>
   <dest>
     *: "Final de la llista de cançons"
-    archosplayer: "Fi Llista"
+    archosplayer: "Final de llista"
   </dest>
   <voice>
     *: "Final de la llista de cançons"
-    archosplayer: "Fi Llista"
+    archosplayer: "Final de llista"
   </voice>
 </phrase>
 <phrase>
@@ -8369,11 +8369,11 @@
   </source>
   <dest>
     *: none
-    archosondio*: "Siusplau, retireu la targeta MMC inserida"
+    archosondio*: "Siusplau, retira la targeta MMC inserida"
   </dest>
   <voice>
     *: none
-    archosondio*: "Siusplau, retireu la targeta MMC inserida"
+    archosondio*: "Siusplau, retira la targeta MMC inserida"
   </voice>
 </phrase>
 <phrase>
@@ -11130,7 +11130,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Comptador de Saturació"
+    recording: "Comptador de saturació"
   </voice>
 </phrase>
 <phrase>
@@ -11513,7 +11513,7 @@
     *: "Desa preferències de so"
   </dest>
   <voice>
-    *: "Desa Preferències de So"
+    *: "Desa Preferències de so"
   </voice>
 </phrase>
 <phrase>
@@ -12514,7 +12514,7 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
+    *:none
     lcd_bitmap: "Base Skin"
   </source>
   <dest>
@@ -12794,7 +12794,7 @@
   desc: browse for the base skin in theme settings
   user: core
   <source>
-    *: none
+    *:none
     lcd_bitmap: "Remote Base Skin"
   </source>
   <dest>
@@ -13000,11 +13000,11 @@
   </source>
   <dest>
     *: none
-    swcodec: "Rebobina abans de continuar"
+    swcodec: "Rebobina abans de reprendre"
   </dest>
   <voice>
     *: none
-    swcodec: "Rebobina abans de continuar"
+    swcodec: "Rebobina abans de reprendre"
   </voice>
 </phrase>
 <phrase>
@@ -13259,23 +13259,6 @@
     lcd_bitmap: "Amplada de la barra de desplaçament"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_REMOTE_FMRADIO
-  desc: in the main menu
-  user: core
-  <source>
-    *: none
-    radio_remote: "Remote FM Radio"
-  </source>
-  <dest>
-    *: none
-    radio_remote: "Ràdio FM remota"
-  </dest>
-  <voice>
-    *: none
-    radio_remote: "Ràdio FM remota"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_FM_STATION_HEADER
   desc: in radio screen
@@ -13660,3 +13643,51 @@
     *: "Sense etiquetar"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_REMOTE_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *: none
+    radio_remote: "Remote Radio Screen"
+  </source>
+  <dest>
+    *: none
+    radio_remote: "Pantalla remota de ràdio"
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "Pantalla remota de ràdio"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *: none
+    radio: "Radio Screen"
+  </source>
+  <dest>
+    *: none
+    radio: "Pantalla de ràdio"
+  </dest>
+  <voice>
+    *: none
+    radio: "Pantalla de ràdio"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_COMPOSER
+  desc: in tag viewer
+  user: core
+  <source>
+    *: "Composer"
+  </source>
+  <dest>
+    *: "Compositor"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>

apps/lang/chinese-simp.lang

@@ -1,4 +1,4 @@
-#             __________               __   ___.
+#             __________               __   ___.
 #   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
 #   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
@@ -27,10 +27,10 @@
     *: "Yes"
   </source>
   <dest>
-    *: "是"
+    *: "确定"
   </dest>
   <voice>
-    *: "是"
+    *: "确定"
   </voice>
 </phrase>
 <phrase>
@@ -41,10 +41,10 @@
     *: "No"
   </source>
   <dest>
-    *: "不"
+    *: "取消"
   </dest>
   <voice>
-    *: "不"
+    *: "取消"
   </voice>
 </phrase>
 <phrase>
@@ -176,10 +176,10 @@
     *: "Failed"
   </source>
   <dest>
-    *: "已失败"
+    *: "操作失败"
   </dest>
   <voice>
-    *: "已失败"
+    *: "操作失败"
   </voice>
 </phrase>
 <phrase>
@@ -204,10 +204,10 @@
     *: "Sound Settings"
   </source>
   <dest>
-    *: "声音的设置"
+    *: "声音设置"
   </dest>
   <voice>
-    *: "声音的设置"
+    *: "声音设置"
   </voice>
 </phrase>
 <phrase>
@@ -246,10 +246,10 @@
     *: "Browse Theme Files"
   </source>
   <dest>
-    *: "浏览主题"
+    *: "主题"
   </dest>
   <voice>
-    *: "浏览主题"
+    *: "主题"
   </voice>
 </phrase>
 <phrase>
@@ -262,11 +262,11 @@
   </source>
   <dest>
     *: none
-    radio: "FM广播"
+    radio: "FM广播界面"
   </dest>
   <voice>
     *: none
-    radio: "FM广播"
+    radio: "FM广播界面"
   </voice>
 </phrase>
 <phrase>
@@ -279,11 +279,11 @@
   </source>
   <dest>
     *: none
-    recording: "录音"
+    recording: "录音界面"
   </dest>
   <voice>
     *: none
-    recording: "录音"
+    recording: "录音界面"
   </voice>
 </phrase>
 <phrase>
@@ -958,7 +958,7 @@
   </source>
   <dest>
     *: none
-    swcodec: "编辑模式:%s"
+    swcodec: "编辑:%s"
   </dest>
   <voice>
     *: none
@@ -1748,11 +1748,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "浏览字体"
+    lcd_bitmap: "字体"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "浏览字体"
+    lcd_bitmap: "字体"
   </voice>
 </phrase>
 <phrase>
@@ -1763,10 +1763,10 @@
     *: "While Playing Screen"
   </source>
   <dest>
-    *: "浏览WPS(正在播放界面)文件"
+    *: "音乐播放界面"
   </dest>
   <voice>
-    *: "浏览WPS(正在播放界面)文件"
+    *: "音乐播放界面"
   </voice>
 </phrase>
 <phrase>
@@ -1779,11 +1779,11 @@
   </source>
   <dest>
     *: none
-    remote: "浏览RWPS(线控正在播放界面)文件"
+    remote: "正在播放界面(线控器)"
   </dest>
   <voice>
     *: none
-    remote: "浏览RWPS(线控正在播放界面)文件"
+    remote: "正在线控器播放界面"
   </voice>
 </phrase>
 <phrase>
@@ -6991,16 +6991,19 @@
 </phrase>
 <phrase>
   id: LANG_FM_STATION
-  desc: deprecated
-  user:
+  desc: in radio screen
+  user: core
   <source>
     *: none
+    radio: "Station: %d.%02d MHz"
   </source>
   <dest>
     *: none
+    radio: "频道:%d.%02dMHz"
   </dest>
   <voice>
     *: none
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -12262,10 +12265,10 @@
     *: "As whole numbers"
   </source>
   <dest>
-    *: "以整个数字排"
+    *: "以整体数字排序"
   </dest>
   <voice>
-    *: "以整个数字排"
+    *: "以整体数字排序"
   </voice>
 </phrase>
 <phrase>
@@ -12321,10 +12324,10 @@
     *: "Prevent Track Skipping"
   </source>
   <dest>
-    *: "h"
+    *: "禁止曲目跳转"
   </dest>
   <voice>
-    *: "不要让歌化"
+    *: "禁止曲目跳转"
   </voice>
 </phrase>
 <phrase>
@@ -12371,11 +12374,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "触屏模式选择"
+    touchscreen: "触屏模式"
   </dest>
   <voice>
     *: none
-    touchscreen: "触屏模式选择"
+    touchscreen: "选择触屏模式"
   </voice>
 </phrase>
 <phrase>
@@ -12417,7 +12420,7 @@
     *: ""
   </dest>
   <voice>
-    *: "状态栏样式"
+    *: "状态栏"
   </voice>
 </phrase>
 <phrase>
@@ -12430,11 +12433,11 @@
   </source>
   <dest>
     *: none
-    swcodec: "编译时间"
+    swcodec: "Release Time"
   </dest>
   <voice>
     *: none
-    swcodec: "编译时间"
+    swcodec: "Release Time"
   </voice>
 </phrase>
 <phrase>
@@ -12495,11 +12498,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "浏览SBS(状态栏样式)文件"
+    lcd_bitmap: "状态栏"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "浏览SBS(状态栏样式)文件"
+    lcd_bitmap: "状态栏"
   </voice>
 </phrase>
 <phrase>
@@ -12512,11 +12515,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Scroll Bar Position"
+    lcd_bitmap: "滚动栏位置"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Scroll bar position"
+    lcd_bitmap: "滚动栏位置"
   </voice>
 </phrase>
 <phrase>
@@ -12529,11 +12532,11 @@
   </source>
   <dest>
     *: none
-    remote: "Remote Statusbar"
+    remote: "线控状态栏"
   </dest>
   <voice>
     *: none
-    remote: "Remote Statusbar"
+    remote: "线控状态栏"
   </voice>
 </phrase>
 <phrase>
@@ -12577,11 +12580,11 @@
   </source>
   <dest>
     *: none
-    swcodec: "Auto"
+    swcodec: "自动"
   </dest>
   <voice>
     *: none
-    swcodec: "Auto"
+    swcodec: "自动"
   </voice>
 </phrase>
 <phrase>
@@ -12592,10 +12595,10 @@
     *: "Insert Last Shuffled"
   </source>
   <dest>
-    *: "Insert Last Shuffled"
+    *: "随机插入到播放列表最后"
   </dest>
   <voice>
-    *: "Insert Last Shuffled"
+    *: "随机插入到播放列表的最后位置"
   </voice>
 </phrase>
 <phrase>
@@ -12623,10 +12626,10 @@
     *: "Next:"
   </source>
   <dest>
-    *: "Next:"
+    *: "下一曲:"
   </dest>
   <voice>
-    *: "Next:"
+    *: "下一曲:"
   </voice>
 </phrase>
 <phrase>
@@ -12656,11 +12659,11 @@
   </source>
   <dest>
     *: none
-    usb_hid: "USB Keypad Mode"
+    usb_hid: "USB键盘模式"
   </dest>
   <voice>
     *: none
-    usb_hid: "USB Keypad Mode"
+    usb_hid: "USB键盘模式"
   </voice>
 </phrase>
 <phrase>
@@ -12690,7 +12693,7 @@
   </source>
   <dest>
     *: none
-    quickscreen: "Set as Top Quickscreen Item"
+    quickscreen: "设为快屏上键"
   </dest>
   <voice>
     *: none
@@ -12724,11 +12727,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "浏览RSBS(线控状态栏样式)文件"
+    lcd_bitmap: "线控状态栏"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "浏览RSBS(线控状态栏样式)文件"
+    lcd_bitmap: "线控状态栏"
   </voice>
 </phrase>
 <phrase>
@@ -12758,7 +12761,7 @@
   </source>
   <dest>
     *: none
-    usb_hid: "USB HID"
+    usb_hid: "开启USB HID"
   </dest>
   <voice>
     *: none
@@ -12857,11 +12860,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "Calibrate"
+    touchscreen: "校准触摸屏"
   </dest>
   <voice>
     *: none
-    touchscreen: "Calibrate"
+    touchscreen: "校准触摸屏"
   </voice>
 </phrase>
 <phrase>
@@ -12891,11 +12894,11 @@
   </source>
   <dest>
     *: none
-    morse_input: "Use Morse Code Input"
+    morse_input: "使用莫尔斯电码输入"
   </dest>
   <voice>
     *: none
-    morse_input: "Use Morse Code Input"
+    morse_input: "使用莫尔斯电码输入"
   </voice>
 </phrase>
 <phrase>
@@ -12908,11 +12911,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "Reset Calibration"
+    touchscreen: "重置校准"
   </dest>
   <voice>
     *: none
-    touchscreen: "Reset Calibration"
+    touchscreen: "重置触摸屏校准"
   </voice>
 </phrase>
 <phrase>
@@ -12976,11 +12979,11 @@
   </source>
   <dest>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "多媒体模式"
   </dest>
   <voice>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "多媒体模式
   </voice>
 </phrase>
 <phrase>
@@ -12991,10 +12994,10 @@
     *: "Custom"
   </source>
   <dest>
-    *: "Custom"
+    *: "自定义"
   </dest>
   <voice>
-    *: "Custom"
+    *: "自定义"
   </voice>
 </phrase>
 <phrase>
@@ -13007,11 +13010,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Scroll Bar Width"
+    lcd_bitmap: "滚动栏宽度"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Scroll bar width"
+    lcd_bitmap: "滚动栏宽度"
   </voice>
 </phrase>
 <phrase>
@@ -13052,11 +13055,11 @@
   </source>
   <dest>
     *: none
-    crossfade: "Automatic Track Change Only"
+    crossfade: "仅在自动跳变曲目时"
   </dest>
   <voice>
     *: none
-    crossfade: "Automatic Track Change Only"
+    crossfade: "仅在曲目自动跳变时"
   </voice>
 </phrase>
 <phrase>
@@ -13067,10 +13070,10 @@
     *: "Bottom"
   </source>
   <dest>
-    *: "Bottom"
+    *: "底部"
   </dest>
   <voice>
-    *: "Bottom"
+    *: "屏幕底部"
   </voice>
 </phrase>
 <phrase>
@@ -13083,11 +13086,11 @@
   </source>
   <dest>
     *: none
-    swcodec: "Timestretch"
+    swcodec: "音调/音速"
   </dest>
   <voice>
     *: none
-    swcodec: "Timestretch"
+    swcodec: "音调/音速"
   </voice>
 </phrase>
 <phrase>
@@ -13148,11 +13151,11 @@
   </source>
   <dest>
     *: none
-    touchscreen: "Touchscreen Settings"
+    touchscreen: "触屏设置"
   </dest>
   <voice>
     *: none
-    touchscreen: "Touchscreen Settings"
+    touchscreen: "触摸屏设置"
   </voice>
 </phrase>
 <phrase>
@@ -13163,10 +13166,10 @@
     *: "Top"
   </source>
   <dest>
-    *: "Top"
+    *: "顶部"
   </dest>
   <voice>
-    *: "Top"
+    *: "屏幕顶部"
   </voice>
 </phrase>
 <phrase>
@@ -13227,11 +13230,11 @@
   </source>
   <dest>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "普通模式"
   </dest>
   <voice>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "普通模式"
   </voice>
 </phrase>
 <phrase>

apps/lang/czech.lang

@@ -623,10 +623,10 @@
     *: "Bookmark Empty"
   </source>
   <dest>
-    *: "Prázdná záložka"
+    *: "Prázdné záložky"
   </dest>
   <voice>
-    *: "Prázdná záložka"
+    *: "Prázdné záložky"
   </voice>
 </phrase>
 <phrase>
@@ -2087,10 +2087,10 @@
     *: "Last.fm Log"
   </source>
   <dest>
-    *: "Poslední FM záznam"
+    *: "Logovací soubor pro Last.fm"
   </dest>
   <voice>
-    *: "Poslední EFEM záznam"
+    *: "Logovací soubor pro Last tečka efem"
   </voice>
 </phrase>
 <phrase>
@@ -7032,10 +7032,10 @@
     *: "Top Time"
   </source>
   <dest>
-    *: "Nejdelší doba"
+    *: "Nejdelší doba běhu"
   </dest>
   <voice>
-    *: "Nejdelší doba"
+    *: "Nejdelší doba běhu"
   </voice>
 </phrase>
 <phrase>
@@ -7940,7 +7940,7 @@
     *: "Otevřít v..."
   </dest>
   <voice>
-    *: "Otevřít v"
+    *: "Otevřít ve"
   </voice>
 </phrase>
 <phrase>
@@ -7968,7 +7968,7 @@
     *: "Vlastnosti"
   </dest>
   <voice>
-    *: "Vlastnosti"
+    *: "Vlastnosti, neozvučené"
   </voice>
 </phrase>
 <phrase>
@@ -13254,15 +13254,15 @@
   desc: in the main menu
   user: core
   <source>
-    *: none
+    *:none
     remote: "Main Screen"
   </source>
   <dest>
-    *: none
+    *:none
     remote: "Hlavní displej"
   </dest>
   <voice>
-    *: none
+    *:none
     remote: "Hlavní dysplej"
   </voice>
 </phrase>
@@ -13271,15 +13271,15 @@
   desc: in the main menu
   user: core
   <source>
-    *: none
+    *:none
     remote: "Remote Screen"
   </source>
   <dest>
-    *: none
+    *:none
     remote: "Dálkový displej"
   </dest>
   <voice>
-    *: none
+    *:none
     remote: "Dálkový dysplej"
   </voice>
 </phrase>
@@ -13454,20 +13454,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_FMRADIO
-  desc: in the main menu
+  id: LANG_REMOTE_RADIOSCREEN
+  desc: in the theme menu
   user: core
   <source>
     *:none
-    radio_remote: "Remote FM Radio"
+    radio_remote: "Remote Radio Screen"
   </source>
   <dest>
     *:none
-    radio_remote: "Dálkové FM rádio"
+    radio_remote: "Obrazovka dálkové rádia"
   </dest>
   <voice>
     *:none
-    radio_remote: "Dálkové EFEM rádio"
+    radio_remote: "Obrazovka dálkové rádia"
   </voice>
 </phrase>
 <phrase>
@@ -13671,3 +13671,34 @@
     *: "Bez popisu"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *:none
+    radio: "Radio Screen"
+  </source>
+  <dest>
+    *:none
+    radio: "Obrazovka rádia"
+  </dest>
+  <voice>
+    *:none
+    radio: "Obrazovka rádia"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_COMPOSER
+  desc: in tag viewer
+  user: core
+  <source>
+    *: "Composer"
+  </source>
+  <dest>
+    *: "Skladatel"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>

apps/lang/deutsch.lang

@@ -12944,15 +12944,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Browser Mode"
+    usb_hid: "Browser"
   </source>
   <dest>
     *: none
-    usb_hid: "Browser-Modus"
+    usb_hid: "Browser"
   </dest>
   <voice>
     *: none
-    usb_hid: "Browser-Modus"
+    usb_hid: "Browser"
   </voice>
 </phrase>
 <phrase>
@@ -13063,15 +13063,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Mouse Mode"
+    usb_hid: "Mouse"
   </source>
   <dest>
     *: none
-    usb_hid: "Mausmodus"
+    usb_hid: "Maus"
   </dest>
   <voice>
     *: none
-    usb_hid: "Mausmodus"
+    usb_hid: "Maus"
   </voice>
 </phrase>
 <phrase>
@@ -13097,15 +13097,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "Multimedia"
   </source>
   <dest>
     *: none
-    usb_hid: "Multimediamodus"
+    usb_hid: "Multimedia"
   </dest>
   <voice>
     *: none
-    usb_hid: "Multimediamodus"
+    usb_hid: "Multimedia"
   </voice>
 </phrase>
 <phrase>
@@ -13207,15 +13207,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "Presentation"
   </source>
   <dest>
     *: none
-    usb_hid: "Präsentationsmodus"
+    usb_hid: "Präsentation"
   </dest>
   <voice>
     *: none
-    usb_hid: "Präsentationsmodus"
+    usb_hid: "Präsentation"
   </voice>
 </phrase>
 <phrase>
@@ -13317,3 +13317,405 @@
     lineout_poweroff: "Analogausgang"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_HOTKEY_WPS
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "WPS Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Hotkeyfunktion im WPS"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Hotkeyfunktion im WPS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *:none
+    radio_remote: "Remote Radio Screen"
+  </source>
+  <dest>
+    *:none
+    radio_remote: "Fernbedienungsradioanzeige"
+  </dest>
+  <voice>
+    *:none
+    radio_remote: "Fernbedienungsradioanzeige"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_GAIN
+  desc: in sound_menu, hardware equalizer tone controls filter gain
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Gain"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Verstärkung Band %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Bandverstärkung"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_FMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio: ""
+  </source>
+  <dest>
+    *: none
+    radio: ""
+  </dest>
+  <voice>
+    *: none
+    radio: "Radioanzeige"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_WIDE
+  desc: in sound_menu, hardware equalizer tone controls wide bandwidth setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Wide"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Weit"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Weit"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_RFMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio_remote: ""
+  </source>
+  <dest>
+    *: none
+    radio_remote: ""
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "Fernbedienungsradioanzeige"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_NARROW
+  desc: in sound_menu, hardware equalizer tone controls narrow bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Narrow"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Schmal"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Schmal"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIEW_HOTKEY
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_FILE_BROWSER
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "File Browser Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Hotkeyfunktion im Browser"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Hotkeyfunktion im Browser"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESUME_REWIND
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Rewind Before Resume"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Zurückspulen vor dem Fortsetzen"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Zurückspulen vor dem Fortsetzen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_UNTAGGED
+  desc: "<untagged>" entry in tag browser
+  user: core
+  <source>
+    *: "<Untagged>"
+  </source>
+  <dest>
+    *: "<Unbekannt>"
+  </dest>
+  <voice>
+    *: "Unbekannt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS_ADVANCED
+  desc: in sound_menu, advanced settings for hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Advanced Tone Control Settings"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Erweiterte Klangeinstellungen"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Erweiterte Klangeinstellungen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEPTH_3D
+  desc: in sound_menu, amount of 3D enhancement effect
+  user: core
+  <source>
+    *: none
+    gigabeats: "3-D Enhancement"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Raumklangverbesserung"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Raumklangverbesserung"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_COMPOSER
+  desc: in tag viewer
+  user: core
+  <source>
+    *: "Composer"
+  </source>
+  <dest>
+    *: "Komponist"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_FREQUENCY
+  desc: in sound_menu, hardware equalizer tone controls shelf filter cutoff frequency
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Frequency"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Grenzfrequenz Band %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Grenzfrequenz"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH
+  desc: in sound_menu, hardware equalizer tone controls peak bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Width"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Bandbreite Band %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Bandbreite"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_STATION_HEADER
+  desc: in radio screen
+  user: core
+  <source>
+    *: none
+    radio: "Station:"
+  </source>
+  <dest>
+    *: none
+    radio: "Sender:"
+  </dest>
+  <voice>
+    *: none
+    radio: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_ASSIGNED
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *:none
+    radio: "Radio Screen"
+  </source>
+  <dest>
+    *:none
+    radio: "Radioanzeige"
+  </dest>
+  <voice>
+    *:none
+    radio: "Radioanzeige"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS
+  desc: in sound_menu, hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Tone Controls"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Klangregelung"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Klangregelung"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Hotkeyfunktion"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Hotkeyfunktion"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_NOT_SET
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_HOTKEY_QUESTION
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_HISTOGRAM_INTERVAL
+  desc: in record settings menu
+  user: core
+  <source>
+    *: none
+    recording_histogram: "Histogram interval"
+  </source>
+  <dest>
+    *: none
+    recording_histogram: "Histogrammintervall"
+  </dest>
+  <voice>
+    *: none
+    recording_histogram: "Histogrammintervall"
+  </voice>
+</phrase>

apps/lang/espanol.lang

@@ -1537,13 +1537,13 @@
   desc: "talkbox" mode for directories + files
   user: core
   <source>
-    *: ".talk mp3 clip"
+    *: ".talk Clip"
   </source>
   <dest>
     *: "Archivo mp3 (.talk)"
   </dest>
   <voice>
-    *: "Archivo m p 3, t a l k"
+    *: "Archivo m p 3, punto t a l k"
   </voice>
 </phrase>
 <phrase>
@@ -12493,11 +12493,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Base Skin"
+    lcd_bitmap: "Aspecto predeterminado"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Base Skin"
+    lcd_bitmap: "Aspecto predeterminado"
   </voice>
 </phrase>
 <phrase>
@@ -12722,11 +12722,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Remote Base Skin"
+    lcd_bitmap: "Aspecto predeterminado del mando"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Remote Base Skin"
+    lcd_bitmap: "Aspecto predeterminado del mando"
   </voice>
 </phrase>
 <phrase>
@@ -12735,15 +12735,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Browser Mode"
+    usb_hid: "Browser"
   </source>
   <dest>
     *: none
-    usb_hid: "Browser Mode"
+    usb_hid: "Modo de navegador"
   </dest>
   <voice>
     *: none
-    usb_hid: "Browser Mode"
+    usb_hid: "Modo de navegador"
   </voice>
 </phrase>
 <phrase>
@@ -12936,15 +12936,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Mouse Mode"
+    usb_hid: "Mouse"
   </source>
   <dest>
     *: none
-    usb_hid: "Mouse Mode"
+    usb_hid: "Modo del ratón"
   </dest>
   <voice>
     *: none
-    usb_hid: "Mouse Mode"
+    usb_hid: "Modo del ratón"
   </voice>
 </phrase>
 <phrase>
@@ -12970,15 +12970,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "Multimedia"
   </source>
   <dest>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "Modo multimedia"
   </dest>
   <voice>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "Modo multimedia"
   </voice>
 </phrase>
 <phrase>
@@ -13221,15 +13221,15 @@
   user: core
   <source>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "Presentation"
   </source>
   <dest>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "Modo presentación"
   </dest>
   <voice>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "Modo presentación"
   </voice>
 </phrase>
 <phrase>
@@ -13246,3 +13246,424 @@
     *: "of"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_HOTKEY_WPS
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "WPS Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Tecla rápida de la WPS"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Tecla rápida de la WPS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_GAIN
+  desc: in sound_menu, hardware equalizer tone controls filter gain
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Gain"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Ganancia de la banda %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Ganancia de la banda"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LINEOUT_ONOFF
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    lineout_poweroff: "Line Out"
+  </source>
+  <dest>
+    *: none
+    lineout_poweroff: "Salida de línea"
+  </dest>
+  <voice>
+    *: none
+    lineout_poweroff: "Salida de línea"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_FMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio: ""
+  </source>
+  <dest>
+    *: none
+    radio: ""
+  </dest>
+  <voice>
+    *: none
+    radio: "aspecto de la pantalla de radio"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_WIDE
+  desc: in sound_menu, hardware equalizer tone controls wide bandwidth setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Wide"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Ancha"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Ancha"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_RFMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio_remote: ""
+  </source>
+  <dest>
+    *: none
+    radio_remote: ""
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "aspecto de la pantalla del mando de la radio"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_SCREEN
+  desc: in the main menu
+  user: core
+  <source>
+    *: none
+    remote: "Remote Screen"
+  </source>
+  <dest>
+    *: none
+    remote: "Pantalla del mando"
+  </dest>
+  <voice>
+    *: none
+    remote: "Pantalla del mando"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_NARROW
+  desc: in sound_menu, hardware equalizer tone controls narrow bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Narrow"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Estrecha"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Estrecha"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIEW_HOTKEY
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_FILE_BROWSER
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "File Browser Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Tecla rápida del examinador de archivos"
+  </dest>
+  <voice>
+    *: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESUME_REWIND
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Rewind Before Resume"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Rebobinar antes de continuar"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Rebobinar antes de continuar"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_UNTAGGED
+  desc: "<untagged>" entry in tag browser
+  user: core
+  <source>
+    *: "<Untagged>"
+  </source>
+  <dest>
+    *: "<Untagged>"
+  </dest>
+  <voice>
+    *: "Untagged"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS_ADVANCED
+  desc: in sound_menu, advanced settings for hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Advanced Tone Control Settings"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Ajustes avanzados de control de tono"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Ajustes avanzados de control de tono"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEPTH_3D
+  desc: in sound_menu, amount of 3D enhancement effect
+  user: core
+  <source>
+    *: none
+    gigabeats: "3-D Enhancement"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Realce 3D"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Realce 3 D"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_FREQUENCY
+  desc: in sound_menu, hardware equalizer tone controls shelf filter cutoff frequency
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Frequency"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Frecuencia de la banda %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Frecuencia de la banda"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH
+  desc: in sound_menu, hardware equalizer tone controls peak bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Width"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Ancho de la banda %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Ancho de la banda"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_FMRADIO
+  desc: in the main menu
+  user: core
+  <source>
+    *: none
+    radio_remote: "Remote FM Radio"
+  </source>
+  <dest>
+    *: none
+    radio_remote: "Radio FM remota"
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "Radio F M remota"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_STATION_HEADER
+  desc: in radio screen
+  user: core
+  <source>
+    *: none
+    radio: "Station:"
+  </source>
+  <dest>
+    *: none
+    radio: "Emisora:"
+  </dest>
+  <voice>
+    *: none
+    radio: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_ASSIGNED
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAIN_SCREEN
+  desc: in the main menu
+  user: core
+  <source>
+    *: none
+    remote: "Main Screen"
+  </source>
+  <dest>
+    *: none
+    remote: "Pantalla principal"
+  </dest>
+  <voice>
+    *: none
+    remote: "Pantalla principal"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS
+  desc: in sound_menu, hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Tone Controls"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Controles de tono"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Controles de tono"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Tecla rápida"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Tecla rápida"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_NOT_SET
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_HOTKEY_QUESTION
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_HISTOGRAM_INTERVAL
+  desc: in record settings menu
+  user: core
+  <source>
+    *: none
+    recording_histogram: "Histogram interval"
+  </source>
+  <dest>
+    *: none
+    recording_histogram: "Intervalo del histograma"
+  </dest>
+  <voice>
+    *: none
+    recording_histogram: "Intervalo del histograma"
+  </voice>
+</phrase>

apps/lang/francais.lang

@@ -13367,7 +13367,7 @@
   desc: "<untagged>" entry in tag browser
   user: core
   <source>
-    *: "<Inconnu>"
+    *: "<Untagged>"
   </source>
   <dest>
     *: "<Inconnu>"
@@ -13393,3 +13393,68 @@
     radio: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_WIDE
+  desc: in sound_menu, hardware equalizer tone controls wide bandwidth setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Wide"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Large"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Large"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_NARROW
+  desc: in sound_menu, hardware equalizer tone controls narrow bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Narrow"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Réduit"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Réduit"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEPTH_3D
+  desc: in sound_menu, amount of 3D enhancement effect
+  user: core
+  <source>
+    *: none
+    gigabeats: "3-D Enhancement"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Amélioration 3-D"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Amélioration 3-D"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_COMPOSER
+  desc: in tag viewer
+  user: core
+  <source>
+    *: "Composer"
+  </source>
+  <dest>
+    *: "Compositeur"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>

apps/lang/italiano.lang

@@ -13453,20 +13453,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_REMOTE_FMRADIO
-  desc: in the main menu
+  id: LANG_REMOTE_RADIOSCREEN
+  desc: in the theme menu
   user: core
   <source>
     *:none
-    radio_remote: "Remote FM Radio"
+    radio_remote: "Remote Radio Screen"
   </source>
   <dest>
     *:none
-    radio_remote: "Telecomando Radio FM"
+    radio_remote: "Schermo Telecomando Radio"
   </dest>
   <voice>
     *:none
-    radio_remote: "Telecomando Radio FM"
+    radio_remote: "Schermo Telecomando Radio"
   </voice>
 </phrase>
 <phrase>
@@ -13670,3 +13670,34 @@
     *: "Nessun Tag"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *:none
+    radio: "Radio Screen"
+  </source>
+  <dest>
+    *:none
+    radio: "Schermo Radio"
+  </dest>
+  <voice>
+    *:none
+    radio: "Schermo Radio"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_COMPOSER
+  desc: in tag viewer
+  user: core
+  <source>
+    *: "Composer"
+  </source>
+  <dest>
+    *: "Compositore"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>

apps/lang/portugues-brasileiro.lang

@@ -4576,10 +4576,10 @@
     *: "Max Entries in File Browser"
   </source>
   <dest>
-    *: "Número Máx. de Arquivos no Explorador de Diretórios"
+    *: "Número Máx. de Arquivos no Navegador de Arquivos"
   </dest>
   <voice>
-    *: "Número Máximo de Arquivos no Explorador de Diretórios"
+    *: "Número Máximo de Arquivos no Navegador de Arquivos"
   </voice>
 </phrase>
 <phrase>
@@ -13241,3 +13241,275 @@
     lcd_bitmap: "Skin Base Remota"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_MAIN_SCREEN
+  desc: in the main menu
+  user: core
+  <source>
+    *:none
+    remote: "Main Screen"
+  </source>
+  <dest>
+    *:none
+    remote: "Tela Principal"
+  </dest>
+  <voice>
+    *:none
+    remote: "Tela Principal"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_SCREEN
+  desc: in the main menu
+  user: core
+  <source>
+    *:none
+    remote: "Remote Screen"
+  </source>
+  <dest>
+    *:none
+    remote: "Tela Remota"
+  </dest>
+  <voice>
+    *:none
+    remote: "Tela Remota"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_HISTOGRAM_INTERVAL
+  desc: in record settings menu
+  user: core
+  <source>
+    *: none
+    recording_histogram: "Histogram interval"
+  </source>
+  <dest>
+    *: none
+    recording_histogram: "Intervalo do Histograma"
+  </dest>
+  <voice>
+    *: none
+    recording_histogram: "Intervalo do Histograma"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LINEOUT_ONOFF
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    lineout_poweroff: "Line Out"
+  </source>
+  <dest>
+    *: none
+    lineout_poweroff: "Line Out"
+  </dest>
+  <voice>
+    *: none
+    lineout_poweroff: "Line Out"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_HOTKEY_QUESTION
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_ASSIGNED
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_NOT_SET
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Hotkey"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Hotkey"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIEW_HOTKEY
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_WPS
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "WPS Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Hotkey do WPS"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Hotkey do WPS"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_FILE_BROWSER
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "File Browser Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Hotkey do Navegador de Arquivos"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Hotkey do Navegador de arquivos"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESUME_REWIND
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Rewind Before Resume"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Rebobinar Antes de Retomar"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Rebobinar antes de retomar"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_FMRADIO
+  desc: in the main menu
+  user: core
+  <source>
+    *:none
+    radio_remote: "Remote FM Radio"
+  </source>
+  <dest>
+    *:none
+    radio_remote: "Rádio FM Remoto"
+  </dest>
+  <voice>
+    *:none
+    radio_remote: "Rádio FM Remoto"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_FMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio: ""
+  </source>
+  <dest>
+    *: none
+    radio: ""
+  </dest>
+  <voice>
+    *: none
+    radio: "pele de rádio remoto"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_RFMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio_remote: ""
+  </source>
+  <dest>
+    *: none
+    radio_remote: ""
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "pele de tela de rádio remoto"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_STATION_HEADER
+  desc: in radio screen
+  user: core
+  <source>
+    *: none
+    radio: "Station:"
+  </source>
+  <dest>
+    *: none
+    radio: "Estação:"
+  </dest>
+  <voice>
+    *: none
+    radio: ""
+  </voice>
+</phrase>

apps/lang/slovak.lang

@@ -8264,8 +8264,6 @@
     *: "Čas"
   </voice>
 </phrase>
-/* TODO: cleanup LANG_USB_CHARGING unless HAVE_USB_CHARGING_ENABLE defined,
- * the selector should probably be usb_charging_enable_enable as well. */
 <phrase>
   id: LANG_USB_CHARGING
   desc: in Battery menu
@@ -13434,23 +13432,6 @@
     hotkey: "Skratka prezerania súborov"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_REMOTE_FMRADIO
-  desc: in the main menu
-  user: core
-  <source>
-    *:none
-    radio_remote: "Remote FM Radio"
-  </source>
-  <dest>
-    *:none
-    radio_remote: "Vzdialené FM Rádio"
-  </dest>
-  <voice>
-    *:none
-    radio_remote: "Vzdialené fm rádio"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_FM_STATION_HEADER
   desc: in radio screen
@@ -13519,3 +13500,187 @@
     hotkey: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_REMOTE_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *: none
+    radio_remote: "Remote Radio Screen"
+  </source>
+  <dest>
+    *: none
+    radio_remote: "Vzdialená Obrazovka Rádia"
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "Vzdialená obrazovka rádia"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_GAIN
+  desc: in sound_menu, hardware equalizer tone controls filter gain
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Gain"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Šírka Pásma %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Šírka pásma"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_WIDE
+  desc: in sound_menu, hardware equalizer tone controls wide bandwidth setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Wide"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Široké"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Široké"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_NARROW
+  desc: in sound_menu, hardware equalizer tone controls narrow bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Narrow"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Úzke"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Úzke"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_UNTAGGED
+  desc: "<untagged>" entry in tag browser
+  user: core
+  <source>
+    *: "<Untagged>"
+  </source>
+  <dest>
+    *: "<Netagované>"
+  </dest>
+  <voice>
+    *: "Netagované"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS_ADVANCED
+  desc: in sound_menu, advanced settings for hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Advanced Tone Control Settings"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Pokročilé Nastavenia Tónu"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Pokročilé nastavenia tónu"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEPTH_3D
+  desc: in sound_menu, amount of 3D enhancement effect
+  user: core
+  <source>
+    *: none
+    gigabeats: "3-D Enhancement"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "3-D Vylepšenie"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "3-D Vylepšenie"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_FREQUENCY
+  desc: in sound_menu, hardware equalizer tone controls shelf filter cutoff frequency
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Frequency"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Frekvencia Pásma %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Frekvencia pásma"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH
+  desc: in sound_menu, hardware equalizer tone controls peak bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Width"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Šírka Pásma %d"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Šírka pásma"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RADIOSCREEN
+  desc: in the theme menu
+  user: core
+  <source>
+    *: none
+    radio: "Radio Screen"
+  </source>
+  <dest>
+    *: none
+    radio: "Obrazovka Rádia"
+  </dest>
+  <voice>
+    *: none
+    radio: "Obrazovka rádia"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS
+  desc: in sound_menu, hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Tone Controls"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Nastavenia Tónu"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Nastavenia tónu"
+  </voice>
+</phrase>

apps/lang/turkce.lang

@@ -17,6 +17,7 @@
 # Turkish language file, translated by:
 # - Melih Özbek
 # - Brian Cloutier
+# - Altay Oz
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -7728,11 +7729,11 @@
   user: core
   <source>
     *: none
-    usb_hid: "Browser Mode"
+    usb_hid: "Browser"
   </source>
   <dest>
     *: none
-    usb_hid: "Browser Mode"
+    usb_hid: "Tarayıcı Kipi"
   </dest>
   <voice>
     *: none
@@ -10604,11 +10605,11 @@
   user: core
   <source>
     *: none
-    usb_hid: "Mouse Mode"
+    usb_hid: "Mouse"
   </source>
   <dest>
     *: none
-    usb_hid: "Mouse Mode"
+    usb_hid: "Fare Kipi"
   </dest>
   <voice>
     *: none
@@ -10773,11 +10774,11 @@
   user: core
   <source>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "Multimedia"
   </source>
   <dest>
     *: none
-    usb_hid: "Multimedia Mode"
+    usb_hid: "Çokluortam Kipi"
   </dest>
   <voice>
     *: none
@@ -12927,11 +12928,11 @@
   user: core
   <source>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "Presentation"
   </source>
   <dest>
     *: none
-    usb_hid: "Presentation Mode"
+    usb_hid: "Sunum Kipi"
   </dest>
   <voice>
     *: none
@@ -13239,3 +13240,423 @@
     masf: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_HOTKEY_WPS
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "WPS Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "WPS Hotkey"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "WPS Hotkey"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_GAIN
+  desc: in sound_menu, hardware equalizer tone controls filter gain
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Gain"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Band %d Gain"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Band Gain"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LINEOUT_ONOFF
+  desc: in system settings menu
+  user: core
+  <source>
+    *: none
+    lineout_poweroff: "Line Out"
+  </source>
+  <dest>
+    *: none
+    lineout_poweroff: "Çıkış"
+  </dest>
+  <voice>
+    *: none
+    lineout_poweroff: "Line Out"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_FMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio: ""
+  </source>
+  <dest>
+    *: none
+    radio: ""
+  </dest>
+  <voice>
+    *: none
+    radio: "radio screen skin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_WIDE
+  desc: in sound_menu, hardware equalizer tone controls wide bandwidth setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Wide"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Geniş"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Wide"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EXT_RFMS
+  desc: spoken only, for file extension
+  user: core
+  <source>
+    *: none
+    radio_remote: ""
+  </source>
+  <dest>
+    *: none
+    radio_remote: ""
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "remote radio screen skin"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_SCREEN
+  desc: in the main menu
+  user: core
+  <source>
+    *: none
+    remote: "Remote Screen"
+  </source>
+  <dest>
+    *: none
+    remote: "Uzak Ekran"
+  </dest>
+  <voice>
+    *: none
+    remote: "Remote Screen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH_NARROW
+  desc: in sound_menu, hardware equalizer tone controls narrow bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Narrow"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Dar"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Narrow"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VIEW_HOTKEY
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_FILE_BROWSER
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "File Browser Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Dosya Tarama Geçiş Tuşu"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "File Browser Hotkey"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESUME_REWIND
+  desc: in playback settings menu
+  user: core
+  <source>
+    *: none
+    swcodec: "Rewind Before Resume"
+  </source>
+  <dest>
+    *: none
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_UNTAGGED
+  desc: "<untagged>" entry in tag browser
+  user: core
+  <source>
+    *: "<Untagged>"
+  </source>
+  <dest>
+    *: "<Untagged>"
+  </dest>
+  <voice>
+    *: "Untagged"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS_ADVANCED
+  desc: in sound_menu, advanced settings for hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Advanced Tone Control Settings"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Advanced Tone Control Settings"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Advanced Tone Control Settings"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DEPTH_3D
+  desc: in sound_menu, amount of 3D enhancement effect
+  user: core
+  <source>
+    *: none
+    gigabeats: "3-D Enhancement"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "3-D Enhancement"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "3-D Enhancement"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_FREQUENCY
+  desc: in sound_menu, hardware equalizer tone controls shelf filter cutoff frequency
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Frequency"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Band %d Frequency"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Band Frequency"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_WIDTH
+  desc: in sound_menu, hardware equalizer tone controls peak bandwith setting
+  user: core
+  <source>
+    *: none
+    gigabeats: "Band %d Width"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Band %d Width"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Band Width"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_FMRADIO
+  desc: in the main menu
+  user: core
+  <source>
+    *: none
+    radio_remote: "Remote FM Radio"
+  </source>
+  <dest>
+    *: none
+    radio_remote: "Remote FM Radio"
+  </dest>
+  <voice>
+    *: none
+    radio_remote: "Remote FM Radio"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_STATION_HEADER
+  desc: in radio screen
+  user: core
+  <source>
+    *: none
+    radio: "Station:"
+  </source>
+  <dest>
+    *: none
+    radio: "Station:"
+  </dest>
+  <voice>
+    *: none
+    radio: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_ASSIGNED
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_MAIN_SCREEN
+  desc: in the main menu
+  user: core
+  <source>
+    *: none
+    remote: "Main Screen"
+  </source>
+  <dest>
+    *: none
+    remote: "Main Screen"
+  </dest>
+  <voice>
+    *: none
+    remote: "Main Screen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HW_EQ_TONE_CONTROLS
+  desc: in sound_menu, hardware equalizer tone controls
+  user: core
+  <source>
+    *: none
+    gigabeats: "Tone Controls"
+  </source>
+  <dest>
+    *: none
+    gigabeats: "Tone Controls"
+  </dest>
+  <voice>
+    *: none
+    gigabeats: "Tone Controls"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY
+  desc: hotkey menu
+  user: core
+  <source>
+    *: none
+    hotkey: "Hotkey"
+  </source>
+  <dest>
+    *: none
+    hotkey: "Hotkey"
+  </dest>
+  <voice>
+    *: none
+    hotkey: "Hotkey"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HOTKEY_NOT_SET
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_HOTKEY_QUESTION
+  desc: deprecated
+  user: core
+  <source>
+    *: none
+    hotkey: ""
+  </source>
+  <dest>
+    *: none
+    hotkey: ""
+  </dest>
+  <voice>
+    *: none
+    hotkey: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_HISTOGRAM_INTERVAL
+  desc: in record settings menu
+  user: core
+  <source>
+    *: none
+    recording_histogram: "Histogram interval"
+  </source>
+  <dest>
+    *: none
+    recording_histogram: "Histogram interval"
+  </dest>
+  <voice>
+    *: none
+    recording_histogram: "Histogram interval"
+  </voice>
+</phrase>

apps/plugins/alarmclock.c

@@ -125,7 +125,7 @@ enum plugin_status plugin_start(const void* parameter)
     while(!quit) {
         button = get_button();
 
-        if (button == PLA_EXIT || PLA_CANCEL)
+        if (button == PLA_EXIT || button == PLA_CANCEL)
             quit = true;
 
         FOR_NB_SCREENS(i) {
@@ -141,11 +141,18 @@ enum plugin_status plugin_start(const void* parameter)
             switch (button) {
                 case PLA_UP:
                 case PLA_UP_REPEAT:
+#ifdef HAVE_SCROLLWHEEL
+                case PLA_SCROLL_FWD:
+                case PLA_SCROLL_FWD_REPEAT:
+#endif
                     alarm[current] = (alarm[current] + 1) % maxval[current];
                     break;
-
                 case PLA_DOWN:
                 case PLA_DOWN_REPEAT:
+#ifdef HAVE_SCROLLWHEEL
+                case PLA_SCROLL_BACK:
+                case PLA_SCROLL_BACK_REPEAT:
+#endif
                     alarm[current] = (alarm[current] + maxval[current] - 1)
                         % maxval[current];
                     break;

docs/CREDITS

@@ -541,6 +541,11 @@ Andrew Rodland
 Luca Leonardo Scorcia
 Gerhard Zintel
 Adrián Cereto Massagué
+Chris Savery
+Raphaël Jakse
+Wincent Balin
+Aaron Rothbaum
+Nejc Lotric
 
 The libmad team
 The wavpack team
@@ -565,3 +570,5 @@ The robotfindskitten team
 The libmtp team
 The asap team
 The libpng team
+The Pure Data team (Miller Puckette and others)
+

firmware/export/config/ipod4g.h

@@ -188,7 +188,8 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1203
 #define HAVE_USB_HID_MOUSE

firmware/export/config/ipodcolor.h

@@ -172,7 +172,8 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1204
 #define HAVE_USB_HID_MOUSE

firmware/export/config/ipodmini1g.h

@@ -180,7 +180,8 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 #define HAVE_USB_HID_MOUSE

firmware/export/config/ipodmini2g.h

@@ -187,7 +187,8 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1205
 #define HAVE_USB_HID_MOUSE

firmware/export/config/ipodnano1g.h

@@ -175,7 +175,8 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x120a
 #define HAVE_USB_HID_MOUSE

firmware/export/config/ipodvideo.h

@@ -202,7 +202,8 @@
 
 /* enable these for the experimental usb stack */
 #define HAVE_USBSTACK
-#define USE_ROCKBOX_USB
+/*Disable USB for the release due to charging issues */
+/*#define USE_ROCKBOX_USB*/
 #define USB_VENDOR_ID 0x05ac
 #define USB_PRODUCT_ID 0x1209
 #define HAVE_USB_HID_MOUSE

firmware/firmware.make

@@ -44,5 +44,8 @@ $(BUILDDIR)/sysfont.o: $(SYSFONT) $(BUILDDIR)/sysfont.h
 	$(call PRINTS,CONVBDF $(subst $(ROOTDIR)/,,$<))$(TOOLSDIR)/convbdf -l $(MAXCHAR) -c -o $(BUILDDIR)/sysfont.c $<
 	$(call PRINTS,CC $(subst $(ROOTDIR)/,,$(BUILDDIR)/sysfont.c))$(CC) $(CFLAGS) -c $(BUILDDIR)/sysfont.c -o $@
 
-$(BUILDDIR)/version.c $(BUILDDIR)/version.h:
-	$(TOOLSDIR)/genversion.sh $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR)
+$(BUILDDIR)/version.c: $(BUILDDIR)/version.h
+	$(TOOLSDIR)/genversion.sh c $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR)
+
+$(BUILDDIR)/version.h:
+	$(TOOLSDIR)/genversion.sh h $(BUILDDIR) $(TOOLSDIR)/version.sh $(ROOTDIR)

firmware/target/arm/as3525/pcm-as3525.c

@@ -39,21 +39,28 @@ static unsigned char *dma_start_addr;
 static size_t      dma_size;   /* in 4*32 bits */
 static void dma_callback(void);
 static int locked = 0;
-
-static int play_irq_state;
+static bool is_playing = false;
+static bool play_callback_pending = false;
 
 /* Mask the DMA interrupt */
 void pcm_play_lock(void)
 {
-    if(++locked == 1)
-        play_irq_state = disable_irq_save();
+    ++locked;
 }
 
 /* Unmask the DMA interrupt if enabled */
 void pcm_play_unlock(void)
 {
-    if(--locked == 0)
-        restore_irq(play_irq_state);
+    if(--locked == 0 && is_playing)
+    {
+        int old = disable_irq_save();
+        if(play_callback_pending)
+        {
+            play_callback_pending = false;
+            dma_callback();
+        }
+        restore_irq(old);
+    }
 }
 
 static void play_start_pcm(void)
@@ -74,6 +81,12 @@ static void play_start_pcm(void)
 
 static void dma_callback(void)
 {
+    if(locked)
+    {
+        play_callback_pending = is_playing;
+        return;
+    }
+
     if(!dma_size)
     {
         pcm_play_get_more_callback((void **)&dma_start_addr, &dma_size);
@@ -95,11 +108,14 @@ void pcm_play_dma_start(const void *addr, size_t size)
 
     dma_retain();
 
+    is_playing = true;
+
     play_start_pcm();
 }
 
 void pcm_play_dma_stop(void)
 {
+    is_playing = false;
     dma_disable_channel(1);
     dma_size = 0;
 
@@ -111,6 +127,8 @@ void pcm_play_dma_stop(void)
 
 void pcm_play_dma_pause(bool pause)
 {
+    is_playing = !pause;
+
     if(pause)
         dma_disable_channel(1);
     else
@@ -192,6 +210,8 @@ void * pcm_dma_addr(void *addr)
 #ifdef HAVE_RECORDING
 
 static int rec_locked = 0;
+static bool is_recording = false;
+static bool rec_callback_pending = false;
 static unsigned char *rec_dma_start_addr;
 static size_t rec_dma_size, rec_dma_transfer_size;
 static void rec_dma_callback(void);
@@ -200,19 +220,25 @@ static void rec_dma_callback(void);
 static int16_t *mono_samples;
 #endif
 
-static int rec_irq_state;
 
 void pcm_rec_lock(void)
 {
-    if(++rec_locked == 1)
-        rec_irq_state = disable_irq_save();
+    ++rec_locked;
 }
 
 
 void pcm_rec_unlock(void)
 {
-    if(--rec_locked == 0)
-        restore_irq(rec_irq_state);
+    if(--rec_locked == 0 && is_recording)
+    {
+        int old = disable_irq_save();
+        if(rec_callback_pending)
+        {
+            rec_callback_pending = false;
+            rec_dma_callback();
+        }
+        restore_irq(old);
+    }
 }
 
 
@@ -231,10 +257,10 @@ static void rec_dma_start(void)
 }
 
 
+#if CONFIG_CPU == AS3525
 /* if needed, duplicate samples of the working channel until the given bound */
 static inline void mono2stereo(int16_t *end)
 {
-#if CONFIG_CPU == AS3525
     if(audio_channels != 1) /* only for microphone */
         return;
 #if 0
@@ -255,24 +281,36 @@ static inline void mono2stereo(int16_t *end)
         "   strh %0, [%1], #2   \n" // copy it in the right-channel
         "   cmp %1, %2          \n" // are we finished?
         "   bne  1b             \n"
-        : "=r"(left), "+r"(mono_samples)
+        : "=&r"(left), "+r"(mono_samples)
         : "r"(end)
         : "memory"
     );
 #endif /* C / ASM */
-#else
-    /* microphone recording is stereo on as3525v2 */
-    (void)end;
-#endif
 }
+#endif /* CONFIG_CPU == AS3525 */
 
 static void rec_dma_callback(void)
 {
-    rec_dma_size -= rec_dma_transfer_size;
-    rec_dma_start_addr += rec_dma_transfer_size;
+    if(rec_dma_transfer_size)
+    {
+        rec_dma_size -= rec_dma_transfer_size;
+        rec_dma_start_addr += rec_dma_transfer_size;
 
-    /* the 2nd channel is silent when recording microphone on as3525v1 */
-    mono2stereo(AS3525_UNCACHED_ADDR((int16_t*)rec_dma_start_addr));
+        /* don't act like we just transferred data when we are called from
+         * pcm_rec_unlock() */
+        rec_dma_transfer_size = 0;
+
+#if CONFIG_CPU == AS3525
+        /* the 2nd channel is silent when recording microphone on as3525v1 */
+        mono2stereo(AS3525_UNCACHED_ADDR((int16_t*)rec_dma_start_addr));
+#endif
+
+        if(locked)
+        {
+            rec_callback_pending = is_recording;
+            return;
+        }
+    }
 
     if(!rec_dma_size)
     {
@@ -293,6 +331,7 @@ static void rec_dma_callback(void)
 
 void pcm_rec_dma_stop(void)
 {
+    is_recording = false;
     dma_disable_channel(1);
     dma_release();
     rec_dma_size = 0;
@@ -320,6 +359,8 @@ void pcm_rec_dma_start(void *addr, size_t size)
 
     I2SIN_CONTROL |= (1<<11)|(1<<5); /* enable dma, 14bits samples */
 
+    is_recording = true;
+
     rec_dma_start();
 }
 
@@ -347,12 +388,23 @@ void pcm_rec_dma_init(void)
 
 const void * pcm_rec_dma_get_peak_buffer(void)
 {
-    pcm_rec_lock();
+#if CONFIG_CPU == AS3525
+    /*
+     * We need to prevent the DMA callback from kicking in while we are
+     * faking the right channel with data from left channel.
+     */
+
+    int old = disable_irq_save();
     int16_t *addr = AS3525_UNCACHED_ADDR((int16_t *)DMAC_CH_DST_ADDR(1));
     mono2stereo(addr);
-    pcm_rec_unlock();
+    restore_irq(old);
 
     return addr;
+
+#else
+    /* Microphone recording is stereo on as3525v2 */
+    return AS3525_UNCACHED_ADDR((int16_t *)DMAC_CH_DST_ADDR(1));
+#endif
 }
 
 #endif /* HAVE_RECORDING */

firmware/target/arm/as3525/sd-as3525.c

@@ -819,11 +819,6 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
                                                   transfer_error[drive], drive);
     }
 
-    /* be sure the card has finished programming */
-    ret = sd_wait_for_tran_state(drive);
-    if (ret < 0)
-        ret -= 5*20;
-
 sd_transfer_error:
 
     dma_release();
@@ -883,12 +878,7 @@ void sd_enable(bool on)
         return; /* nothing to do */
     if(on)
     {
-        /*  Enable both NAF_CLOCK & IDE clk for internal SD */
-        CGU_PERI |= CGU_NAF_CLOCK_ENABLE;
-        CGU_IDE  |= (1<<6);     /* enable non AHB interface*/
 #ifdef HAVE_MULTIDRIVE
-        /* Enable MCI clk for uSD */
-        CGU_PERI |= CGU_MCI_CLOCK_ENABLE;
 #ifdef HAVE_BUTTON_LIGHT
         /* buttonlight AMSes need a bit of special handling for the buttonlight
          * here due to the dual mapping of GPIOD and XPD */
@@ -927,13 +917,7 @@ void sd_enable(bool on)
         if (buttonlight_is_on)
             _buttonlight_on();
 #endif /* HAVE_BUTTON_LIGHT */
-        /* Disable MCI clk for uSD */
-        CGU_PERI &= ~CGU_MCI_CLOCK_ENABLE;
 #endif /* HAVE_MULTIDRIVE */
-
-        /*  Disable both NAF_CLOCK & IDE clk for internal SD */
-        CGU_PERI &= ~CGU_NAF_CLOCK_ENABLE;
-        CGU_IDE &= ~(1<<6);       /* disable non AHB interface*/
     }
 }
 

manual/Makefile

@@ -14,6 +14,8 @@ INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDI
 .PHONY: all buildmanual clean
 MANFILE := rockbox-build
 
+VERSION= `$(TOOLSDIR)/version.sh $(ROOTDIR)`
+
 all: manual-pdf 
 
 features: $(OBJDIR)/features

manual/Makefile.pdflatex

@@ -6,6 +6,7 @@ HTLATEX := htlatex
 HTOPTS1 := rockbox-html,charset=utf-8,early_
 HTOPTS2 := " -utf8 -cmozhtf"
 HTOPTS3 := "-dhtml/ -cvalidate"
+VERSION=`$(TOOLSDIR)/version.sh $(ROOTDIR)`
 
 .PHONY: all cleaner buildmanual output
 

manual/appendix/album_art.tex

@@ -1,42 +0,0 @@
-% $Id$ %
-\chapter{\label{ref:album_art}Album Art}
-\section{Introduction}
-
-Rockbox allows you to put the album art, or another image related to the music
-on your \dap{} to display it in the PictureFlow plugin\opt{albumart}{ or in the
-WPS}. For this feature to work, you must observe a few rules.
-
-\section{Limitations}
-
-Rockbox does not support album art embedded in your files' tags, and will
-instead look for a picture located in the filesystem. In addition to this, the
-pictures must be in the BMP or JPEG formats. Rockbox does not support
-RLE-compressed BMP files, nor does it support progressive and multi-scan
-JPEG files. JPEG files must consist of a single scan with interleaved components, 
-as progessive and multi-scan images require much more memory to decode.
-
-\section{Where to put album art}
-
-The pictures can be named a number of different ways, and placed to a number of
-different locations. You can have pictures specific to the file or the album
-or use a generic picture. You can place the picture in the same directory
-as the file, in the parent directory or in a fixed directory named
-\fname{/.rockbox/albumart/}. The order Rockbox uses when looking for a picture
-is as follows (a list in braces means that those file extensions are tried in
-that order):
-
-\begin{enumerate}
-\item  \fname{./filename.\{jpeg,jpg,bmp\}}
-\item  \fname{./albumtitle.\{jpeg,jpg,bmp\}}
-\item  \fname{./cover.\{jpeg,jpg,bmp\}}
-\item  \fname{./folder.jpg}
-\item  \fname{/.rockbox/albumart/artist-albumtitle.\{jpeg,jpg,bmp\}}
-\item  \fname{../albumtitle.\{jpeg,jpg,bmp\}}
-\item  \fname{../cover.\{jpeg,jpg,bmp\}}
-\end{enumerate}
-
-The following characters will be replaced with an underscore (\_) when looking
-for albumtitle.bmp or artist-albumtitle.bmp: \textbackslash{} / : \textless{}
-\textgreater{} ? * \textbar{}. Doublequotes will be replaced by single quotes.
-See \wikilink{AlbumArt} in the wiki for more details and programs that will
-help you automate the process of putting album art on your \dap{}.

manual/appendix/appendix.tex

@@ -5,10 +5,6 @@
 
 \input{appendix/wps_tags.tex}
 
-\opt{lcd_bitmap}{\opt{tagcache}{
-\input{appendix/album_art.tex}
-}}
-
 \input{appendix/config_file_options.tex}
 
 \input{appendix/menu_structure.tex}

manual/appendix/wps_tags.tex

@@ -337,7 +337,51 @@ with image ID ``M'', and then reference the individual sub-images in a condition
 }
 
 \opt{albumart}{
-\section{Album Art}
+\section{\label{ref:album_art}Album Art}
+Rockbox allows you to put the album art, or another image related to the music
+on your \dap{} to display it in the PictureFlow plugin\opt{albumart}{ or in the
+theme}. For this feature to work, there are a few requirements.
+
+\subsection{Limitations}
+
+Rockbox does not support album art embedded in your files' tags, and will
+instead look for a picture located on disk. In addition to this, the
+pictures must be in either BMP or JPEG format. Rockbox does not support
+RLE-compressed BMP files, nor does it support progressive and multi-scan
+JPEG files. JPEG files must consist of a single scan with interleaved components, 
+as progessive and multi-scan images require much more memory to decode.
+
+\subsection{Where to put album art}
+
+The pictures can be named a number of different ways, and placed to a number of
+different locations. You can have pictures specific to the file or the album
+or use a generic picture. You can place the picture in the same directory
+as the file, in the parent directory or in a fixed directory named
+\fname{/.rockbox/albumart/}. The order Rockbox uses when looking for a picture
+is as follows (a list in braces means that those file extensions are tried in
+that order):
+
+\begin{enumerate}
+\item  \fname{./filename.\{jpeg,jpg,bmp\}}
+\item  \fname{./albumtitle.\{jpeg,jpg,bmp\}}
+\item  \fname{./cover.\{jpeg,jpg,bmp\}}
+\item  \fname{./folder.jpg}
+\item  \fname{/.rockbox/albumart/artist-albumtitle.\{jpeg,jpg,bmp\}}
+\item  \fname{../albumtitle.\{jpeg,jpg,bmp\}}
+\item  \fname{../cover.\{jpeg,jpg,bmp\}}
+\end{enumerate}
+
+The following characters will be replaced with an underscore (\_) when looking
+for albumtitle.bmp or artist-albumtitle.bmp: \textbackslash{} / : \textless{}
+\textgreater{} ? * \textbar{}. Doublequotes will be replaced by single quotes.
+See \wikilink{AlbumArt} in the wiki for programs that will
+help you automate the process of putting album art on your \dap{}.
+
+\subsection{How to display the album art}
+
+Once the album art files are present on your \dap, they can be displayed as
+follows.
+
   \begin{tagmap}
     \config{\%Cl{\textbar}x{\textbar}y{\textbar}[[l{\textbar}c{\textbar}r]maxwidth]{\textbar}[[t{\textbar}c{\textbar}b]maxheight]{\textbar}}
         & Define the settings for albumart\\
@@ -378,6 +422,7 @@ Examples:
 \end{enumerate}
 }
 
+\opt{radio}{
 \section{FM Radio}
   \begin{tagmap}
     \config{\%tp} & Does this target have a radio? If it doesn't, the ``true''
@@ -400,6 +445,14 @@ Examples:
     \config{\%tz} & RDS text.\\
   \end{tagmap}
 
+It is also possible to show ``Radio Art'' which can be used to display images
+associated with presets. The tags are exactly the same as for album art,
+described above. Images need to be placed in \fname{/.rockbox/fmpresets/},
+and must have the same name as the preset. They need to be in either
+\fname{.bmp} or \fname{.jpg} format, and the radio must be in preset mode
+and tuned to a preset (and not recording) in order for them to be shown.
+}
+
 \section{Alignment}
   \begin{tagmap}
     \config{\%al} & Align the text left\\

manual/platform/keymap-archosondio.tex

@@ -85,3 +85,17 @@
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonLeft}
 
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonOff}
+\newcommand{\PluginExit}{Long \ButtonOff}
+\newcommand{\PluginSelect}{\ButtonMenu}
+\newcommand{\PluginSelectRepeat}{Long \ButtonMenu}
+

manual/platform/keymap-archosplayer.tex

@@ -48,3 +48,17 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonPlay}
+\newcommand{\PluginDown}{\ButtonStop}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonPlay}
+\newcommand{\PluginDownRepeat}{Long \ButtonStop}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonMenu}
+\newcommand{\PluginExit}{Long \ButtonMenu}
+\newcommand{\PluginSelect}{\ButtonOn}
+\newcommand{\PluginSelectRepeat}{Long \ButtonOn}

manual/platform/keymap-archosrecorder.tex

@@ -113,3 +113,17 @@
 \newcommand{\ActionFMNext}{\ButtonRight}
 
 \newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonOn}
+\newcommand{\PluginExit}{\ButtonOff}
+\newcommand{\PluginSelect}{\ButtonPlay}
+\newcommand{\PluginSelectRepeat}{Long \ButtonPlay}

manual/platform/keymap-cowond2.tex

@@ -96,3 +96,17 @@
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{\TouchActionBmDelete}
 
+%Plugin lib actions
+\newcommand{\PluginUp}{\TouchTopMiddle}
+\newcommand{\PluginDown}{\TouchBottomMiddle}
+\newcommand{\PluginLeft}{\TouchMidLeft}
+\newcommand{\PluginRight}{\TouchMidRight}
+\newcommand{\PluginUpRepeat}{Long \TouchTopMiddle}
+\newcommand{\PluginDownRepeat}{Long \TouchBottomMiddle}
+\newcommand{\PluginLeftRepeat}{Long \TouchMidLeft}
+\newcommand{\PluginRightRepeat}{Long \TouchMidRight}
+\newcommand{\PluginCancel}{\ButtonPower{} or \TouchBottomRight}
+\newcommand{\PluginExit}{Long \ButtonPower}
+\newcommand{\PluginSelect}{\ButtonMinus{} or TouchCenter}
+\newcommand{\PluginSelectRepeat}{Long \ButtonMinus{} or Long \TouchCenter}
+

manual/platform/keymap-gigabeatfx.tex

@@ -86,4 +86,18 @@
 \newcommand{\ActionPsExit}{\ButtonPower}
 
 %Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonA}
+\newcommand{\ActionBmDelete}{\ButtonA}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonPower}
+\newcommand{\PluginExit}{Long \ButtonPower}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}

manual/platform/keymap-gigabeats.tex

@@ -118,3 +118,17 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{\ButtonBack{} + \ButtonSelect}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonBack}
+\newcommand{\PluginExit}{\ButtonMenu}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}

manual/platform/keymap-iaudiom3.tex

@@ -93,3 +93,17 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonRec}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonRec}
+\newcommand{\PluginExit}{Long \ButtonRec}
+\newcommand{\PluginSelect}{\ButtonMode}
+\newcommand{\PluginSelectRepeat}{Long \ButtonMode}

manual/platform/keymap-iaudiomx5.tex

@@ -91,6 +91,20 @@
 \newcommand{\ActionFMSettingsDec}{\ActionSettingDec}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
+
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonRec}
 
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonPower}
+\newcommand{\PluginExit}{\ButtonPlay + \ButtonSelect}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}

manual/platform/keymap-ipod1g2g.tex

@@ -82,3 +82,22 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonMenu}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonMenu}
+\newcommand{\PluginDown}{\ButtonPlay}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonMenu}
+\newcommand{\PluginDownRepeat}{Long \ButtonPlay}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonMenu + \ButtonSelect}
+\newcommand{\PluginExit}{\ButtonPlay + \ButtonSelect}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}
+
+\newcommand{\PluginScrollFwd}{\ButtonScrollFwd}
+\newcommand{\PluginScrollFwdRepeat}{Long \ButtonScrollFwd}
+\newcommand{\PluginScrollBack}{\ButtonScrollBack}
+\newcommand{\PluginScrollBackRepeat}{Long \ButtonScrollBack}

manual/platform/keymap-ipod3g.tex

@@ -82,3 +82,22 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonMenu}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonMenu}
+\newcommand{\PluginDown}{\ButtonPlay}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonMenu}
+\newcommand{\PluginDownRepeat}{Long \ButtonPlay}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonMenu + \ButtonSelect}
+\newcommand{\PluginExit}{\ButtonPlay + \ButtonSelect}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}
+
+\newcommand{\PluginScrollFwd}{\ButtonScrollFwd}
+\newcommand{\PluginScrollFwdRepeat}{Long \ButtonScrollFwd}
+\newcommand{\PluginScrollBack}{\ButtonScrollBack}
+\newcommand{\PluginScrollBackRepeat}{Long \ButtonScrollBack}

manual/platform/keymap-ipod4g.tex

@@ -105,3 +105,22 @@
 \newcommand{\ActionFMSettingsDec}{\ButtonScrollBack}
 \newcommand{\ActionFMPrev}{\ButtonLeft}
 \newcommand{\ActionFMNext}{\ButtonRight}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonMenu}
+\newcommand{\PluginDown}{\ButtonPlay}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonMenu}
+\newcommand{\PluginDownRepeat}{Long \ButtonPlay}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonMenu + \ButtonSelect}
+\newcommand{\PluginExit}{\ButtonPlay + \ButtonSelect}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}
+
+\newcommand{\PluginScrollFwd}{\ButtonScrollFwd}
+\newcommand{\PluginScrollFwdRepeat}{Long \ButtonScrollFwd}
+\newcommand{\PluginScrollBack}{\ButtonScrollBack}
+\newcommand{\PluginScrollBackRepeat}{Long \ButtonScrollBack}

manual/platform/keymap-iriverh10.tex

@@ -113,3 +113,16 @@
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonRew}
 
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonScrollUp}
+\newcommand{\PluginDown}{\ButtonScrollDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonScrollUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonScrollDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonRew}
+\newcommand{\PluginExit}{\ButtonPower}
+\newcommand{\PluginSelect}{\ButtonPlay}
+\newcommand{\PluginSelectRepeat}{Long \ButtonPlay}

manual/platform/keymap-iriverh100_h300.tex

@@ -108,4 +108,18 @@
 \newcommand{\ActionFMNext}{\ButtonRight}
 
 %Button actions, Bookmark screen context
-\newcommand{\ActionBmDelete}{\ButtonRec}
+\newcommand{\ActionBmDelete}{\ButtonRec}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonOff}
+\newcommand{\PluginExit}{\ButtonOn}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}

manual/platform/keymap-mrobe100.tex

@@ -88,3 +88,17 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{\ButtonDisplay}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonPower}
+\newcommand{\PluginExit}{Long \ButtonPower}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}

manual/platform/keymap-sansac200.tex

@@ -109,3 +109,16 @@
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{\ButtonRec}
 
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonPower}
+\newcommand{\PluginExit}{Long \ButtonPower}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}

manual/platform/keymap-sansaclip.tex

@@ -114,3 +114,17 @@
 \newcommand{\ActionAlarmCancel}{\ButtonPower}
 \newcommand{\ActionAlarmHoursInc}{\ButtonRight}
 \newcommand{\ActionAlarmHoursDec}{\ButtonLeft}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonPower}
+\newcommand{\PluginExit}{Long \ButtonPower}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}

manual/platform/keymap-sansae200.tex

@@ -113,3 +113,22 @@
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{\ButtonRec}
 
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonPower}
+\newcommand{\PluginExit}{Long \ButtonPower}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}
+
+\newcommand{\PluginScrollFwd}{\ButtonScrollFwd}
+\newcommand{\PluginScrollFwdRepeat}{Long \ButtonScrollFwd}
+\newcommand{\PluginScrollBack}{\ButtonScrollBack}
+\newcommand{\PluginScrollBackRepeat}{Long \ButtonScrollBack}
+

manual/platform/keymap-sansafuze.tex

@@ -116,3 +116,22 @@
 \newcommand{\ActionAlarmCancel}{\ButtonLeft}
 \newcommand{\ActionAlarmHoursInc}{\ButtonDown}
 \newcommand{\ActionAlarmHoursDec}{\ButtonUp}
+
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonHome}
+\newcommand{\PluginExit}{Long \ButtonHome}
+\newcommand{\PluginSelect}{\ButtonSelect}
+\newcommand{\PluginSelectRepeat}{Long \ButtonSelect}
+
+\newcommand{\PluginScrollFwd}{\ButtonScrollFwd}
+\newcommand{\PluginScrollFwdRepeat}{Long \ButtonScrollFwd}
+\newcommand{\PluginScrollBack}{\ButtonScrollBack}
+\newcommand{\PluginScrollBackRepeat}{Long \ButtonScrollBack}

manual/platform/keymap-vibe500.tex

@@ -98,3 +98,17 @@
 %Button actions, Bookmark screen context
 \newcommand{\ActionBmDelete}{Long \ButtonCancel}
 
+%Plugin lib actions
+\newcommand{\PluginUp}{\ButtonUp}
+\newcommand{\PluginDown}{\ButtonDown}
+\newcommand{\PluginLeft}{\ButtonLeft}
+\newcommand{\PluginRight}{\ButtonRight}
+\newcommand{\PluginUpRepeat}{Long \ButtonUp}
+\newcommand{\PluginDownRepeat}{Long \ButtonDown}
+\newcommand{\PluginLeftRepeat}{Long \ButtonLeft}
+\newcommand{\PluginRightRepeat}{Long \ButtonRight}
+\newcommand{\PluginCancel}{\ButtonMenu}
+\newcommand{\PluginExit}{Long \ButtonRec}
+\newcommand{\PluginSelect}{\ButtonOK}
+\newcommand{\PluginSelectRepeat}{Long \ButtonOK}
+

manual/platform/remote-keymap-gigabeat.tex

@@ -102,3 +102,16 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionRCBmDelete}{Long \ButtonRCDsp}
+
+%Plugin lib actions
+\newcommand{\PluginRCUp}{\ButtonRCFF}
+\newcommand{\PluginRCDown}{\ButtonRCRew}
+\newcommand{\PluginRCLeft}{\ButtonRCVolDown}
+\newcommand{\PluginRCRight}{\ButtonRCVolUp}
+\newcommand{\PluginRCUpRepeat}{Long \ButtonRCFF}
+\newcommand{\PluginRCDownRepeat}{Long \ButtonRCRew}
+\newcommand{\PluginRCLeftRepeat}{Long \ButtonRCVolDown}
+\newcommand{\PluginRCRightRepeat}{Long \ButtonRCVolUp}
+\newcommand{\PluginRCCancel}{}
+\newcommand{\PluginRCSelect}{}
+\newcommand{\PluginRCSelectRepeat}{}

manual/platform/remote-keymap-iaudio.tex

@@ -31,8 +31,8 @@
 \newcommand{\ActionRCWpsSeekFwd}{Long \ButtonRCRight}
 \newcommand{\ActionRCWpsVolDown}{\ButtonRCDown}
 \newcommand{\ActionRCWpsVolUp}{\ButtonRCUp}
-\newcommand{\ActionRCWpsQuickScreen}{Long \ButtonRCMenu{} (Main: Long \ButtonRec}
-\newcommand{\ActionRCWpsMenu}{\ButtonRCMenu{} (Main: \ButtonRec)}
+\newcommand{\ActionRCWpsQuickScreen}{Long \ButtonRCMenu}
+\newcommand{\ActionRCWpsMenu}{\ButtonRCMenu}
 \newcommand{\ActionRCWpsContext}{Long \ButtonRCMode}
 \newcommand{\ActionRCWpsBrowse}{\ButtonRCMode}
 
@@ -76,7 +76,7 @@
 \newcommand{\ActionRCRecSettingsDec}{\ButtonRCLeft}
 \newcommand{\ActionRCRecPrev}{\ButtonRCUp}
 \newcommand{\ActionRCRecNext}{\ButtonRCDown}
-\newcommand{\ActionRCRecMenu}{\ButtonRCMenu{} (Main: Long \ButtonRec)}
+\newcommand{\ActionRCRecMenu}{\ButtonRCMenu}
 \newcommand{\ActionRCRecExit}{Long \ButtonRCPlay}
 
 %Button actions, FM radio context
@@ -84,7 +84,7 @@
 \newcommand{\ActionRCFMMenu}{Long \ButtonRCMode}
 \newcommand{\ActionRCFMMode}{Long \ButtonRCRec}
 \newcommand{\ActionRCFMStop}{Long \ButtonPlay}
-\newcommand{\ActionRCFMExit}{\ButtonRCMenu{} (Main: \ButtonRec)}
+\newcommand{\ActionRCFMExit}{\ButtonRCMenu}
 \newcommand{\ActionRCFMPlay}{\ButtonPlay}
 \newcommand{\ActionRCFMSettingsInc}{\ActionRCSettingInc}
 \newcommand{\ActionRCFMSettingsDec}{\ActionRCSettingDec}
@@ -93,3 +93,16 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionRCBmDelete}{Long \ButtonRec}
+
+%Plugin lib actions
+\newcommand{\PluginRCUp}{\ButtonRCRight}
+\newcommand{\PluginRCDown}{\ButtonRCLeft}
+\newcommand{\PluginRCLeft}{\ButtonRCDown}
+\newcommand{\PluginRCRight}{\ButtonRCUp}
+\newcommand{\PluginRCUpRepeat}{Long \ButtonRCRight}
+\newcommand{\PluginRCDownRepeat}{Long \ButtonRCLeft}
+\newcommand{\PluginRCLeftRepeat}{Long \ButtonRCDown}
+\newcommand{\PluginRCRightRepeat}{Long \ButtonRCUp}
+\newcommand{\PluginRCSelect}{\ButtonRCMode}
+\newcommand{\PluginRCSelectRepeat}{Long \ButtonRCMode}
+\newcommand{\PluginRCCancel}{}

manual/platform/remote-keymap-iriverh100.tex

@@ -78,7 +78,7 @@
 \newcommand{\ActionRCPsDecSmall}{\ButtonRCRew}
 \newcommand{\ActionRCPsDecBig}{Long \ButtonRCRew}
 \newcommand{\ActionRCPsNudgeLeft}{\ButtonRCSource}
-\newcommand{\ActionRCPsNudgeRight}{\ButtonRCBitratet}
+\newcommand{\ActionRCPsNudgeRight}{\ButtonRCBitrate}
 \newcommand{\ActionRCPsReset}{\ButtonRCSelect}
 \newcommand{\ActionRCPsExit}{\ButtonRCOn{} or \ButtonRCStop}
 
@@ -107,4 +107,17 @@
 \newcommand{\ActionRCFMVolDown}{\ButtonRCVolDown}
 
 %Button actions, Bookmark screen context
-\newcommand{\ActionRCBmDelete}{\ButtonRCRec}
+\newcommand{\ActionRCBmDelete}{\ButtonRCRec}
+
+%Plugin lib actions
+\newcommand{\PluginRCUp}{\ButtonRCBitrate}
+\newcommand{\PluginRCDown}{\ButtonRCSource}
+\newcommand{\PluginRCLeft}{\ButtonRCVolDown}
+\newcommand{\PluginRCRight}{\ButtonRCVolUp}
+\newcommand{\PluginRCUpRepeat}{Long \ButtonRCBitrate}
+\newcommand{\PluginRCDownRepeat}{Long \ButtonRCSource}
+\newcommand{\PluginRCLeftRepeat}{Long \ButtonRCVolDown}
+\newcommand{\PluginRCRightRepeat}{Long \ButtonRCVolUp}
+\newcommand{\PluginRCCancel}{\ButtonRCStop}
+\newcommand{\PluginRCSelect}{\ButtonRCOn}
+\newcommand{\PluginRCSelectRepeat}{Long \ButtonRCOn}

manual/platform/remote-keymap-mrobe100.tex

@@ -106,3 +106,16 @@
 
 %Button actions, Bookmark screen context
 \newcommand{\ActionRCBmDelete}{}
+
+%Plugin lib actions
+\newcommand{\PluginRCUp}{\ButtonRCPlay}
+\newcommand{\PluginRCDown}{\ButtonRCDisplay}
+\newcommand{\PluginRCLeft}{\ButtonRCRew}
+\newcommand{\PluginRCRight}{\ButtonRCFF}
+\newcommand{\PluginRCUpRepeat}{Long \ButtonRCPlay}
+\newcommand{\PluginRCDownRepeat}{Long \ButtonRCDisplay}
+\newcommand{\PluginRCLeftRepeat}{Long \ButtonRCRew}
+\newcommand{\PluginRCRightRepeat}{Long \ButtonRCFF}
+\newcommand{\PluginRCCancel}{}
+\newcommand{\PluginRCSelect}{}
+\newcommand{\PluginRCSelectRepeat}{}

manual/plugins/alarmclock.tex

@@ -4,41 +4,21 @@ This plugin is an alarm clock, which resumes a paused song at a given time.
 
 \subsubsection{Key configuration}
 \begin{btnmap}
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Switch between hours/minutes selection \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-      {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{scrollwheel}{\PluginScrollBack{} / \PluginScrollFwd{} or}
+    \PluginUp{} / \PluginDown 
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Increase/Decrease hours/minutes \\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      ,SANSA_FUZE_PAD}
-      {\ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK{}}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
     & Set the alarm \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu + \ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Exit \\
 \end{btnmap}
 

manual/plugins/bubbles.tex

@@ -9,56 +9,22 @@ entire board is shifted down every time a certain number of shots have been
 fired. Points are awarded depending on how quickly the level was completed.
 
     \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}
-           }
+    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
         & Pause game\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,IRIVER_H10_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-        {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus{} or \TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \nopt{scrollwheel}{\PluginLeft{} / \PluginRight}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Aim the bubble\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_FUZE_PAD}
-        {\ButtonSelect}
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{COWON_D2_PAD}{\ButtonMenu{}, \TouchCenter{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginUp}
+    \nopt{ONDIO_PAD,IRIVER_H10_PAD}{\PluginSelect}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Fire bubble\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonLeft+\ButtonRight}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{ONDIO_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonDown}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{COWON_D2_PAD}{\TouchTopLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
-        & Save game\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-            }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Exit to menu\\
     \end{btnmap}

manual/plugins/clock.tex

@@ -6,61 +6,25 @@ This is a fully featured analogue and digital clock plugin.
 \subsubsection{Key configuration}
 
 \begin{btnmap}
-    \opt{RECORDER_PAD,IAUDIO_X5_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,IRIVER_H10_PAD,SANSA_FUZE_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Cycle through modes \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp{} / \ButtonDown}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}
-      {\ButtonScrollFwd{} / \ButtonScrollBack}
-    \opt{SANSA_C200_PAD}{\ButtonVolUp{} / \ButtonVolDown}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp{} / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} / \ButtonPlus}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginUp{} / \PluginDown
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Cycle through skins \\
-    \opt{RECORDER_PAD}{\ButtonFOne}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-      {\ButtonMenu}
-    \opt{SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonDown}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{COWON_D2_PAD}{\ButtonMenu{} or \TouchTopLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Main Menu \\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-      ,SANSA_FUZE_PAD}
-      {\ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
     & Start / Stop Counter \\
-    \opt{RECORDER_PAD_PAD}{Long \ButtonPlay}%
-    \opt{IRIVER_H10_PAD}{Long \ButtonRew}%
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD,SANSA_C200_PAD%
-      ,SANSA_E200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_FUZE_PAD}
-      {Long \ButtonSelect}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or long \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{Long \ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelectRepeat
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelectRepeat}
     & Reset Counter \\
-    \opt{RECORDER_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu + \ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
-    & Save Settings (if enabled) and Exit \\
 \end{btnmap}
 
 \textbf{Clock Menu}

manual/plugins/codebuster.tex

@@ -10,32 +10,20 @@ a correct peg in the correct position, and a white peg signifies a correct
 peg in the wrong position.
 
   \begin{btnmap}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{IPOD_4G_PAD}{\ButtonMenu}
-    \opt{IRIVER_H300_PAD}{\ButtonOff}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{}, \ButtonMenu{} or \TouchTopRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonMenu{} or \ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Show menu \\
-    \opt{IRIVER_H300_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD}
-        {\ButtonSelect}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\ButtonMinus{}, \ButtonPlus{} or \TouchCenter}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK{} or \ButtonPlay}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Check suggestion and move to next line \\
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft\ / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Select a peg \\
-    \opt{IRIVER_H300_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,SANSA_C200_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,IPOD_4G_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle}
-      \opt{HAVEREMOTEKEYMAP}{& }
+
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
         & Change current peg \\
   \end{btnmap}

manual/plugins/demystify.tex

@@ -2,34 +2,18 @@
 \subsection{Demystify}
 \screenshot{plugins/images/ss-demystify}{Demystify}{img:demystify}
 Demystify is a screen saver like demo.\\
+
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD%
-        ,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,PBELL_VIBE500_PAD}
-        {\ButtonRight\ / \ButtonLeft}
-    \opt{COWON_D2_PAD}{\TouchMidRight{} / \TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \nopt{scrollwheel}{\PluginLeft{} / \PluginRight}
+    \opt{scrollwheel}{\PluginScrollBack{} / \PluginScrollFwd}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
     & Increase / decrease speed\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}
-        {\ButtonRight\ / \ButtonLeft}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{IAUDIO_X5_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{COWON_D2_PAD}{\TouchTopMiddle{} / \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginUp{} / \PluginDown
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Add / remove polygon\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{&
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-       }
+
+    \PluginCancel
+        \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}

manual/plugins/dice.tex

@@ -4,28 +4,11 @@ in a menu and start by choosing ``Roll Dice''. The result is shown as individual
 numbers as well as the total of the rolled dice.
 
 \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{PLAYER_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD}{\ButtonUp}
-    \opt{COWON_D2_PAD}{\ButtonMinus{} or \TouchCenter}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}
-        }
+    \PluginSelect
+          \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Roll dice again\\
-    \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu+\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD%
-        ,IRIVER_H10_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-        }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Quit\\
 \end{btnmap}

manual/plugins/fire.tex

@@ -3,41 +3,20 @@
 \screenshot{plugins/images/ss-fire}{Fire}{img:fire}
 Fire is a demo displaying a fire effect.
 \begin{btnmap}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchTopMiddle{} / \ButtonMinus{} or \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
     & Increase / decrease number of flames\\
-    \opt{RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonMode}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD%
-        ,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonLeft}
-    \opt{COWON_D2_PAD}{\TouchMidLeft}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft}
     & Toggle flame type\\
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IAUDIO_X5_PAD,IRIVER_H10_PAD%
-        ,SANSA_E200_PAD,SANSA_FUZE_PAD,SANSA_C200_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonRight}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCRight}
     & Toggle moving flames\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{&
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-       }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}

manual/plugins/frotz.tex

@@ -34,37 +34,19 @@ classic commercial Infocom games:
 \end{itemize}
 
 \begin{btnmap}
-    \opt{RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD,GIGABEAT_S_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_E200_PAD,SANSA_C200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCOn}
-           }
+    \PluginUp
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp}
         & Display keyboard to enter text\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,IPOD_3G_PAD%
-        ,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_FUZE_PAD}
-        {\ButtonSelect}
-    \opt{RECORDER_PAD}{\ButtonPlay}
-    \opt{ONDIO_PAD}{\ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{COWON_D2_PAD}{\ButtonMenu{}, \TouchCenter{} or \TouchBottomMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Press enter\\
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,PBELL_VIBE500_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,GIGABEAT_PAD,MROBE100_PAD}
-        {\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-       \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-            }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Open Frotz menu (not available at MORE prompts)\\
+
+    \PluginExit
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Quit\\
 \end{btnmap}

manual/plugins/jackpot.tex

@@ -5,33 +5,11 @@ This is a jackpot slot machine game. At the beginning of the game you
 have 20\$.  Payouts are given when three matching symbols come up.
 
 \begin{btnmap}
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonPlay}
-    \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,%
-      MROBE100_PAD,SANSA_CLIP_PAD,M200,IPOD_3G_PAD,IPOD_4G_PAD,%
-      SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
-    \opt{ONDIO_PAD}{\ButtonUp}
-    \opt{IRIVER_H10_PAD}{\ButtonRew}
-    \opt{IAUDIO_M3_PAD}{}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} or \TouchTopMiddle}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-      \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCSelect}
-          \opt{IAUDIO_RC_PAD}{\ButtonRCMode}
-        }
-    & Play \\
-    \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{IRIVER_H100_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
-    \opt{IPOD_3G_PAD,IPOD_4G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,GIGABEAT_PAD,SANSA_E200_PAD,SANSA_C200_PAD,%
-      SANSA_CLIP_PAD,IRIVER_H10_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{SANSA_FUZE_PAD}{\ButtonHome}
-    \opt{IAUDIO_M3_PAD}{}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-      \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-          \opt{IAUDIO_RC_PAD}{\ButtonRCRec}
-        }
+    \PluginSelect
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
+    & Play\\
+
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Exit the game \\
 \end{btnmap}

manual/plugins/mazezam.tex

@@ -13,30 +13,13 @@ You start the game with three lives.
 Luckily, there are checkpoints at levels four and eight.
 
 \begin{btnmap}
-    \opt{IPOD_4G_PAD}{\ButtonMenu, \ButtonPlay,}
-    \opt{IPOD_3G_PAD}{\ButtonScrollBack, \ButtonScrollFwd,}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD%
-        ,SANSA_E200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,ONDIO_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp, \ButtonDown,}%
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,SANSA_C200_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD,RECORDER_PAD,ONDIO_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{}, \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidLeft/\TouchMidRight/\TouchTopMiddle/\TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+    \opt{IPOD_3G_PAD}{\ButtonScrollBack, \ButtonScrollFwd, \ButtonLeft, \ButtonRight}
+    \nopt{IPOD_3G_PAD}{\PluginUp, \PluginDown, \PluginLeft, PluginRight}
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp, \PluginRCDown, \PluginRCLeft, PluginRCRight}
     & Move Character\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD}{\ButtonSelect+\ButtonMenu}
+
     \opt{IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD%
-        ,SANSA_FUZE_PAD,GIGABEAT_PAD,MROBE100_PAD,COWON_D2_PAD}
-        {\ButtonPower}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-       \opt{HAVEREMOTEKEYMAP}{&
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-        }
+    \nopt{IPOD_3G_PAD}{\PluginCancel}
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Menu\\
 \end{btnmap}

manual/plugins/metronome.tex

@@ -4,48 +4,29 @@ practice. Adjust the tempo through the interface or by tapping it out
 on the appropriate button.
 
 \begin{btnmap}
-    \opt{PLAYER_PAD}{\ButtonStop}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu}
-    \opt{IRIVER_H10_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{ONDIO_PAD,RECORDER_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOff}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{}, \ButtonMenu{} or \TouchTopRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
+    \PluginExit
        \opt{HAVEREMOTEKEYMAP}{& }
         & Exit plugin \\
-    \opt{PLAYER_PAD,RECORDER_PAD,IPOD_4G_PAD,IPOD_3G_PAD,IRIVER_H10_PAD%
-        ,IAUDIO_X5_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonPlay}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu\ (Long: Stop)}
-    \opt{GIGABEAT_PAD}{\ButtonA}
-    \opt{SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonUp}
-    \opt{COWON_D2_PAD}{\TouchCenter}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginCancel
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
         & Start / Stop \\
-    \opt{PLAYER_PAD,RECORDER_PAD}{\ButtonOn}
-    \opt{ONDIO_PAD}{\ButtonMenu\ (repeatedly)}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD%
-        ,GIGABEAT_S_PAD,MROBE100_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonSelect}
-    \opt{IRIVER_H10_PAD}{\ButtonFF}
-    \opt{IAUDIO_X5_PAD}{\ButtonRec}
-    \opt{COWON_D2_PAD}{\ButtonMinus{}, \ButtonPlus{} or \TouchCenter}
-    \opt{PBELL_VIBE500_PAD}{\ButtonOK}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginSelect
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
         & Tap tempo \\
-    \opt{PLAYER_PAD,RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD%
-        ,IPOD_4G_PAD,IPOD_3G_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,SANSA_E200_PAD,SANSA_FUZE_PAD,IRIVER_H10_PAD,IAUDIO_X5_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{} / \ButtonRight}
-    \opt{COWON_D2_PAD}{\TouchMidLeft{} / \TouchMidRight}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \PluginLeft{} / \PluginRight
+       \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft{} / \PluginRCRight}
         & Adjust tempo \\
-    \opt{PLAYER_PAD}{\ButtonOn+\ButtonLeft\ / \ButtonOn+\ButtonRight}
-    \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD%
-        ,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD,PBELL_VIBE500_PAD}{\ButtonUp\ / \ButtonDown}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,SANSA_FUZE_PAD}{\ButtonScrollFwd\ / \ButtonScrollBack}
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp\ / \ButtonScrollDown}
-    \opt{COWON_D2_PAD}{\ButtonPlus{} / \ButtonMinus{} or \TouchTopMiddle{} / \TouchBottomMiddle}
-       \opt{HAVEREMOTEKEYMAP}{& }
+
+    \opt{scrollwheel}{\PluginScrollFwd{} / \PluginScrollBack}
+    \nopt{scrollwheel}{\PluginUp{} / \PluginDown}
+        \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp{} / \PluginRCDown}
         & Adjust volume \\
+
+    \opt{h100,h300,e200}{
+      \ButtonRec
+        \opt{HAVEREMOTEKEYMAP}{& }
+        & Sync tap \\}
 \end{btnmap}

manual/plugins/pitch_detector.tex

@@ -6,3 +6,13 @@ With the Pitch Detector, you can play a note on a musical instrument,
 and the plugin will tell you what note it is (e.g. A, A\#, B, etc.) The
 frequency will also be displayed. This may be a great assistance when
 tuning a musical instrument.
+
+\begin{btnmap}
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
+    & Open menu\\
+
+    \PluginExit
+      \opt{HAVEREMOTEKEYMAP}{& }
+    & Exit\\
+\end{btnmap}

manual/plugins/robotfindskitten.tex

@@ -7,31 +7,11 @@ Robot must touch items to determine if they are kitten or not. The game
 ends when robotfindskitten.
 
 \begin{btnmap}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu, \ButtonPlay,}
-    \opt{SANSA_E200_PAD}{\ButtonScrollFwd, \ButtonScrollBack,}
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD%
-        ,RECORDER_PAD,SANSA_FUZE_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD%
-        ,MROBE100_PAD,PBELL_VIBE500_PAD}
-        {\ButtonUp, \ButtonDown,}%
-    \opt{IRIVER_H10_PAD}{\ButtonScrollUp, \ButtonScrollDown,}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD,SANSA_E200_PAD,IRIVER_H100_PAD%
-        ,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_C200_PAD,RECORDER_PAD%
-        ,SANSA_FUZE_PAD,ONDIO_PAD,GIGABEAT_PAD,GIGABEAT_S_PAD,MROBE100_PAD%
-        ,IRIVER_H10_PAD,PBELL_VIBE500_PAD}
-        {\ButtonLeft{}, \ButtonRight}
-    \opt{COWON_D2_PAD}
-        {\TouchTopMiddle, \TouchBottomMiddle, \TouchMidLeft, \TouchMidRight}
-      \opt{HAVEREMOTEKEYMAP}{& }
+    \PluginUp, \PluginDown, \PluginLeft, \PluginRight
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCUp, \PluginRCDown, \PluginRCLeft, \PluginRCRight}
     & Move robot\\
-    \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,RECORDER_PAD,ONDIO_PAD}{\ButtonOff}
-    \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonSelect+\ButtonMenu}
-    \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}{\ButtonPower}
-    \opt{SANSA_FUZE_PAD}{Long \ButtonHome}
-    \opt{GIGABEAT_S_PAD}{\ButtonBack}
-    \opt{COWON_D2_PAD}{\ButtonPower{} or \TouchBottomRight}
-    \opt{PBELL_VIBE500_PAD}{\ButtonRec}
-      \opt{HAVEREMOTEKEYMAP}{& 
-          \opt{IRIVER_RC_H100_PAD}{\ButtonRCStop}
-       }
+
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
     & Quit\\
 \end{btnmap}

manual/plugins/rocklife.tex

@@ -12,3 +12,25 @@ A \fname{.cells} file is a text file. A capital `O' marks a live cell, a dot
 marks a dead cell, all other characters are ignored. Everything on a line
 starting with an exclamation sign (and including it) is a comment and is
 ignored.
+
+\begin{btnmap}
+    \PluginSelect
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCSelect}
+    & Play/pause\\
+
+    \PluginDown
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCDown}
+    & Change growth mode\\
+
+    \PluginRight
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCRight}
+    & Next generation\\
+
+    \PluginLeft
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCLeft}
+    & Status (only when paused)\\
+
+    \PluginCancel
+      \opt{HAVEREMOTEKEYMAP}{& \PluginRCCancel}
+    & Exit\\
+\end{btnmap}

tools/builds.pm

@@ -1,8 +1,8 @@
-$publicrelease="3.5.1";
-$manualrelease="3.5";
-$voicerelease="3.5";
-$releasedate="March 4, 2010";
-$releasenotes="/wiki/ReleaseNotes351";
+$publicrelease="3.6";
+$manualrelease="3.6";
+$voicerelease="3.6";
+$releasedate="June 3, 2010";
+$releasenotes="/wiki/ReleaseNotes36";
 
 %builds = (
     'archosav300' => {

tools/genversion.sh

@@ -6,37 +6,40 @@
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
 
-# Usage: genversion.sh destination-dir path-to-version.sh [source-root]
+# Usage: genversion.sh c/h destination-dir path-to-version.sh [source-root]
 
-# Generate version.[ch] files
+# Generate version.[ch] files (if first argument is c or h)
 
-VERSION=`$2 $3`
+# XXX DO NOT TWEAK VERSION HERE, EDIT version.sh INSTEAD
 
-cat > "$1/_version.h" << EOF
+VERSION=`$3 $4`
+
+if [ "$1" = "h" ]; then
+    cat > "$2/_version.h" << EOF
 /* Generated by genversion.sh */
 extern const char rbversion[];
 #define RBVERSION "$VERSION"
 EOF
 
-if [ -f "$1/version.h" ]
-    then if diff "$1/_version.h" "$1/version.h" > /dev/null
-        then mv "$1/_version.h" "$1/version.h"
-        else rm -f "$1/_version.h"
+    if [ -f "$2/version.h" ]
+        then if diff "$2/_version.h" "$2/version.h" > /dev/null
+            then mv "$2/_version.h" "$2/version.h"
+            else rm -f "$2/_version.h"
+        fi
+        else mv "$2/_version.h" "$2/version.h"
     fi
-    else mv "$1/_version.h" "$1/version.h"
-fi
-
-
-cat > "$1/_version.c" << EOF
+elif [ "$1" = "c" ]; then
+    cat > "$2/_version.c" << EOF
 /* Generated by genversion.sh */
-const char rbversion[] = "$VERSION";
+#include "version.h"
+const char rbversion[] = RBVERSION;
 EOF
 
-if [ -f "$1/version.c" ]
-    then if diff "$1/_version.c" "$1/version.c" > /dev/null
-        then mv "$1/_version.c" "$1/version.c"
-        else rm -f "$1/_version.c"
+    if [ -f "$2/version.c" ]
+        then if diff "$2/_version.c" "$2/version.c" > /dev/null
+            then mv "$2/_version.c" "$2/version.c"
+            else rm -f "$2/_version.c"
+        fi
+        else mv "$2/_version.c" "$2/version.c"
     fi
-    else mv "$1/_version.c" "$1/version.c"
 fi
-

tools/release/bins.pl

@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-$version="3.5RC";
+$version="3.6";
 
 require "tools/builds.pm";
 
@@ -106,13 +106,13 @@ sub buildit {
     `$c`;
 
     print "Run 'make'\n" if($verbose);
-    `make -j 2>/dev/null`;
+    `make`;
 
     print "Run 'make zip'\n" if($verbose);
-    `make zip 2>/dev/null`;
+    `make zip`;
 
     print "Run 'make mapzip'\n" if($verbose);
-    `make mapzip 2>/dev/null`;
+    `make mapzip`;
 }
 
 sub buildfonts {
@@ -127,12 +127,12 @@ sub buildfonts {
     `$c`;
 
     print "Run 'make fontzip'\n" if($verbose);
-    `make fontzip 2>/dev/null`;
+    `make fontzip`;
 }
 
 # run make in tools first to make sure they're up-to-date
 print "cd tools && make\n" if($verbose);
-`(cd tools && make ) >/dev/null 2>&1`;
+`(cd tools && make ) >/dev/null`;
 
 for my $b (&stablebuilds) {
     my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b;

tools/release/manuals.pl

@@ -1,6 +1,8 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.6";
+
+require "tools/builds.pm";
 
 my $verbose;
 if($ARGV[0] eq "-v") {
@@ -57,7 +59,7 @@ sub buildit {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = "../tools/configure --target=$target --type=m";
+    my $c = "../tools/configure --target=$target --type=m --ram=0";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -73,7 +75,7 @@ sub buildit {
 `(cd tools && make ) >/dev/null 2>&1`;
 
 for my $b (&stablebuilds) {
-    next if ($builds{$b}{configname} < 3); # no variants
+    next if (length($builds{$b}{configname}) > 0); # no variants
 
     runone($b);
 }

tools/release/tarball.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version="3.0"
+version="3.6"
 
 srcdir=.
 tempdir=rockbox-temp
@@ -18,7 +18,12 @@ rbdir=$tempdir/rockbox-$version
 mkdir -p $rbdir
 
 # copy everything to the temp dir
-svn ls -R | xargs -Imoo cp --parents moo $rbdir 2>/dev/null
+
+# Only GNU cp accepts --long-options (and --parents)
+# If the system cp is POSIX cp, try gcp (works on OSX)
+CP=cp
+$CP --help >/dev/null 2>&1 || CP=gcp
+svn ls -R | xargs -Imoo $CP --parents moo $rbdir 2>/dev/null
 
 cd $tempdir
 

tools/release/voices.pl

@@ -1,6 +1,8 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.6";
+
+require "tools/builds.pm";
 
 my $verbose;
 if($ARGV[0] eq "-v") {
@@ -54,7 +56,7 @@ sub buildit {
 
     `rm -rf * >/dev/null 2>&1`;
 
-    my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f";
+    my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f --ram=0 --voice=0";
 
     print "C: $c\n" if($verbose);
     `$c`;
@@ -74,7 +76,7 @@ my $pool="$home/tmp/rockbox-voices-$version/voice-pool";
 $ENV{'POOL'}="$pool";
 
 for my $b (&stablebuilds) {
-    next if ($builds{$b}{configname} < 3); # no variants
+    next if (length($builds{$b}{configname}) > 0); # no variants
 
     runone($b);
 }

tools/version.sh

@@ -85,6 +85,10 @@ bzrversion() {
     echo "${version}${mod}"
 }
 
+# XXX: Don't run the scripts and just display the release version
+echo "3.6"
+exit 0
+
 #
 # First locate the top of the src tree (passed in usually)
 #