Index: talkbox/trunk/tools/genlang
===================================================================
--- talkbox.orig/trunk/tools/genlang	2007-10-11 12:51:32.000000000 +0200
+++ talkbox/trunk/tools/genlang	2007-10-14 10:34:15.000000000 +0200
@@ -529,6 +529,20 @@
 /* this contains the concatenation of all strings, separated by \\0 chars */
 extern const unsigned char language_builtin[];
 
+#include "${prefix}_enum.h"
+
+MOO
+    ;
+
+    close(HFILE);
+
+    open(HFILE, ">${prefix}_enum.h") ||
+        die "couldn't create file ${prefix}_enum.h\n";
+
+    print HFILE <<MOO
+/* This file was automatically generated using genlang */
+#ifndef _LANG_ENUM_H_
+#define _LANG_ENUM_H_
 /* The enum below contains all available strings */
 enum \{
 MOO
@@ -573,8 +587,13 @@
         printf HFILE ("    %s,\n", $name);
     }
 
-    # Output end of enum
-    print HFILE "\n};\n/* end of generated enum list */\n";
+    # Output end of lang_enum.h
+    print HFILE <<MOO
+};
+/* end of generated enum list */
+#endif /* _LANG_ENUM_H_ */
+MOO
+    ;
 
     # Output the target phrases for the source file
     for $i (1 .. $idcount) {
Index: talkbox/trunk/tools/configure
===================================================================
--- talkbox.orig/trunk/tools/configure	2007-10-12 09:40:13.000000000 +0200
+++ talkbox/trunk/tools/configure	2007-10-14 10:34:15.000000000 +0200
@@ -1895,7 +1895,8 @@
 
 clean:
 	\$(SILENT)echo Cleaning build directory
-	\$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.[ch]\
+	\$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim \
+	          lang.[ch] lang_enum.h \
                   manual *.pdf *.a credits.raw @OUTPUT@ bitmaps pluginbitmaps \
                   @ARCHOSROM@ @FLASHFILE@ UI256.bmp rockbox-full.zip \
 	          html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \
Index: talkbox/trunk/apps/plugin.c
===================================================================
--- talkbox.orig/trunk/apps/plugin.c	2007-10-14 10:21:02.000000000 +0200
+++ talkbox/trunk/apps/plugin.c	2007-10-14 10:44:16.000000000 +0200
@@ -147,6 +147,7 @@
     lcd_remote_set_drawmode,
     lcd_remote_get_drawmode,
     lcd_remote_setfont,
+    lcd_remote_setmargins,
     lcd_remote_getstringsize,
     lcd_remote_drawpixel,
     lcd_remote_drawline,
@@ -202,6 +205,7 @@
     button_get,
     button_get_w_tmo,
     button_status,
+    button_queue_count,
     button_clear_queue,
 #ifdef HAS_BUTTON_HOLD
     button_hold,
@@ -236,6 +240,18 @@
     mkdir,
     rmdir,
 
+    /* talking */
+    is_voice_queued,
+    talk_id,
+    talk_file,
+    talk_number,
+    talk_value,
+    talk_spell,
+    talk_menus_enabled,
+    talk_disable_menus,
+    talk_enable_menus,
+    do_shutup,
+
     /* kernel/ system */
     PREFIX(sleep),
     yield,
@@ -515,13 +531,7 @@
     flush_icache,
     invalidate_icache,
 #endif
-    talk_disable_menus,
-    talk_enable_menus,
 
-    button_queue_count,
-#ifdef HAVE_REMOTE_LCD
-    lcd_remote_setmargins,
-#endif
 };
 
 int plugin_load(const char* plugin, void* parameter)
Index: talkbox/trunk/apps/plugin.h
===================================================================
--- talkbox.orig/trunk/apps/plugin.h	2007-10-14 10:21:02.000000000 +0200
+++ talkbox/trunk/apps/plugin.h	2007-10-14 10:47:41.000000000 +0200
@@ -50,6 +50,9 @@
 #include "audio.h"
 #include "mp3_playback.h"
 #include "talk.h"
+#ifdef PLUGIN
+#include "lang_enum.h"
+#endif
 #ifdef RB_PROFILE
 #include "profile.h"
 #endif
@@ -112,12 +115,12 @@
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 81
+#define PLUGIN_API_VERSION 82
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 76
+#define PLUGIN_MIN_API_VERSION 82
 
 /* plugin return codes */
 enum plugin_status {
@@ -225,6 +228,7 @@
     void (*lcd_remote_set_drawmode)(int mode);
     int  (*lcd_remote_get_drawmode)(void);
     void (*lcd_remote_setfont)(int font);
+    void (*lcd_remote_setmargins)(int x, int y);
     int  (*lcd_remote_getstringsize)(const unsigned char *str, int *w, int *h);
     void (*lcd_remote_drawpixel)(int x, int y);
     void (*lcd_remote_drawline)(int x1, int y1, int x2, int y2);
@@ -288,6 +294,7 @@
     long (*button_get)(bool block);
     long (*button_get_w_tmo)(int ticks);
     int (*button_status)(void);
+    int (*button_queue_count)(void);
     void (*button_clear_queue)(void);
 #ifdef HAS_BUTTON_HOLD
     bool (*button_hold)(void);
@@ -324,6 +331,18 @@
     int (*mkdir)(const char *name);
     int (*rmdir)(const char *name);
 
+    /* talking */
+    bool (*is_voice_queued)(void);
+    int (*talk_id)(long id, bool enqueue);
+    int (*talk_file)(const char* filename, bool enqueue);
+    int (*talk_number)(long n, bool enqueue);
+    int (*talk_value)(long n, int unit, bool enqueue);
+    int (*talk_spell)(const char* spell, bool enqueue);
+    bool (*talk_menus_enabled)(void);
+    void (*talk_disable_menus)(void);
+    void (*talk_enable_menus)(void);
+    int (*do_shutup)(void);
+
     /* kernel/ system */
     void (*PREFIX(sleep))(int ticks);
     void (*yield)(void);
@@ -633,13 +652,6 @@
     void (*invalidate_icache)(void);
 #endif
 
-    void (*talk_disable_menus)(void);
-    void (*talk_enable_menus)(void);
-
-    int (*button_queue_count)(void);   
-#ifdef HAVE_REMOTE_LCD
-    void (*lcd_remote_setmargins)(int x, int y);
-#endif
 };
 
 /* plugin header */
Index: talkbox/trunk/apps/plugins/dice.c
===================================================================
--- talkbox.orig/trunk/apps/plugins/dice.c	2007-10-11 12:51:32.000000000 +0200
+++ talkbox/trunk/apps/plugins/dice.c	2007-10-14 10:34:15.000000000 +0200
@@ -49,14 +49,14 @@
 static int sides_index;
 
 static struct opt_items nb_sides_option[8] = {
-    { "3", -1 },
-    { "4", -1 },
-    { "6", -1 },
-    { "8", -1 },
-    { "10", -1 },
-    { "12", -1 },
-    { "20", -1 },
-    { "100", -1 }
+    { "3", TALK_ID(3, UNIT_INT) },
+    { "4", TALK_ID(4, UNIT_INT) },
+    { "6", TALK_ID(6, UNIT_INT) },
+    { "8", TALK_ID(8, UNIT_INT) },
+    { "10", TALK_ID(10, UNIT_INT) },
+    { "12", TALK_ID(12, UNIT_INT) },
+    { "20", TALK_ID(20, UNIT_INT) },
+    { "100", TALK_ID(100, UNIT_INT) }
 };
 static int nb_sides_values[] = { 3, 4, 6, 8, 10, 12, 20, 100 };
 static char *sides_conf[] = {"3", "4", "6", "8", "10", "12", "20", "100" };
Index: talkbox/trunk/apps/plugins/fireworks.c
===================================================================
--- talkbox.orig/trunk/apps/plugins/fireworks.c	2007-10-11 22:18:16.000000000 +0200
+++ talkbox/trunk/apps/plugins/fireworks.c	2007-10-14 10:34:15.000000000 +0200
@@ -140,35 +140,35 @@
 #endif
 
 static const struct opt_items autofire_delay_settings[15] = {
-    { "Off",   NULL },
-    { "50ms",  NULL },
-    { "100ms", NULL },
-    { "200ms", NULL },
-    { "300ms", NULL },
-    { "400ms", NULL },
-    { "500ms", NULL },
-    { "600ms", NULL },
-    { "700ms", NULL },
-    { "800ms", NULL },
-    { "900ms", NULL },
-    { "1s",    NULL },
-    { "2s",    NULL },
-    { "3s",    NULL },
-    { "4s",    NULL }
+    { STR(LANG_OFF) },
+    { "50ms",  TALK_ID(50, UNIT_MS) },
+    { "100ms", TALK_ID(100, UNIT_MS) },
+    { "200ms", TALK_ID(200, UNIT_MS) },
+    { "300ms", TALK_ID(300, UNIT_MS) },
+    { "400ms", TALK_ID(400, UNIT_MS) },
+    { "500ms", TALK_ID(500, UNIT_MS) },
+    { "600ms", TALK_ID(600, UNIT_MS) },
+    { "700ms", TALK_ID(700, UNIT_MS) },
+    { "800ms", TALK_ID(800, UNIT_MS) },
+    { "900ms", TALK_ID(900, UNIT_MS) },
+    { "1s",    TALK_ID(1, UNIT_SEC) },
+    { "2s",    TALK_ID(2, UNIT_SEC) },
+    { "3s",    TALK_ID(3, UNIT_SEC) },
+    { "4s",    TALK_ID(4, UNIT_SEC) }
 };
 
 int autofire_delay_values[15] = {
     0, 5, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 200, 300, 400 };
 
 static const struct opt_items particle_settings[8] = {
-    { "5",  NULL },
-    { "10", NULL },
-    { "15", NULL },
-    { "20", NULL },
-    { "25", NULL },
-    { "30", NULL },
-    { "35", NULL },
-    { "40", NULL },
+    { "5",  TALK_ID(5, UNIT_INT) },
+    { "10", TALK_ID(10, UNIT_INT) },
+    { "15", TALK_ID(15, UNIT_INT) },
+    { "20", TALK_ID(20, UNIT_INT) },
+    { "25", TALK_ID(25, UNIT_INT) },
+    { "30", TALK_ID(30, UNIT_INT) },
+    { "35", TALK_ID(35, UNIT_INT) },
+    { "40", TALK_ID(40, UNIT_INT) },
 };
 
 int particle_values[8] = {
@@ -190,7 +190,7 @@
     20, 30, 40, 50, 60, 70, 80, 90, 100 };
 
 static const struct opt_items gravity_settings[4] = {
-    { "Off",      NULL },
+    { STR(LANG_OFF)    },
     { "Weak",     NULL },
     { "Moderate", NULL },
     { "Strong",   NULL },
@@ -212,8 +212,8 @@
 #else
 
 static const struct opt_items rocket_settings[2] = {
-    { "No", NULL },
-    { "Yes",  NULL },
+    { STR(LANG_SET_BOOL_NO) },
+    { STR(LANG_SET_BOOL_YES) },
 };
 int rocket_values[4] = {
     1, 0 };
Index: talkbox/trunk/apps/plugins/jpeg.c
===================================================================
--- talkbox.orig/trunk/apps/plugins/jpeg.c	2007-10-11 12:51:32.000000000 +0200
+++ talkbox/trunk/apps/plugins/jpeg.c	2007-10-14 10:34:15.000000000 +0200
@@ -2498,18 +2498,18 @@
     };
 
     static const struct opt_items timeout[12] = {
-        { "1 second", -1 },
-        { "2 seconds", -1 },
-        { "3 seconds", -1 },
-        { "4 seconds", -1 },
-        { "5 seconds", -1 },
-        { "6 seconds", -1 },
-        { "7 seconds", -1 },
-        { "8 seconds", -1 },
-        { "9 seconds", -1 },
-        { "10 seconds", -1 },
-        { "15 seconds", -1 },
-        { "20 seconds", -1 },
+        { "1 second", TALK_ID(1, UNIT_SEC) },
+        { "2 seconds", TALK_ID(2, UNIT_SEC) },
+        { "3 seconds", TALK_ID(3, UNIT_SEC) },
+        { "4 seconds", TALK_ID(4, UNIT_SEC) },
+        { "5 seconds", TALK_ID(5, UNIT_SEC) },
+        { "6 seconds", TALK_ID(6, UNIT_SEC) },
+        { "7 seconds", TALK_ID(7, UNIT_SEC) },
+        { "8 seconds", TALK_ID(8, UNIT_SEC) },
+        { "9 seconds", TALK_ID(9, UNIT_SEC) },
+        { "10 seconds", TALK_ID(10, UNIT_SEC) },
+        { "15 seconds", TALK_ID(15, UNIT_SEC) },
+        { "20 seconds", TALK_ID(20, UNIT_SEC) },
     };
 
     m = menu_init(rb, items, sizeof(items) / sizeof(*items),
Index: talkbox/trunk/apps/plugins/wavrecord.c
===================================================================
--- talkbox.orig/trunk/apps/plugins/wavrecord.c	2007-10-11 12:51:32.000000000 +0200
+++ talkbox/trunk/apps/plugins/wavrecord.c	2007-10-14 10:34:15.000000000 +0200
@@ -3689,19 +3689,19 @@
     bool done = false;
 
     static const struct opt_items freqs[9] = {
-        { "8000Hz", -1 },
-        { "11025Hz", -1 },
-        { "12000Hz", -1 },
-        { "16000Hz", -1 },
-        { "22050Hz", -1 },
-        { "24000Hz", -1 },
-        { "32000Hz", -1 },
-        { "44100Hz", -1 },
-        { "48000Hz", -1 },
+        { "8000Hz", TALK_ID(8, UNIT_KHZ) },
+        { "11025Hz", TALK_ID(11, UNIT_KHZ) },
+        { "12000Hz", TALK_ID(12, UNIT_KHZ) },
+        { "16000Hz", TALK_ID(16, UNIT_KHZ) },
+        { "22050Hz", TALK_ID(22, UNIT_KHZ) },
+        { "24000Hz", TALK_ID(24, UNIT_KHZ) },
+        { "32000Hz", TALK_ID(32, UNIT_KHZ) },
+        { "44100Hz", TALK_ID(44, UNIT_KHZ) },
+        { "48000Hz", TALK_ID(48, UNIT_KHZ) },
     };
     static const struct opt_items chans[2] = {
-        { "Mono", -1 },
-        { "Stereo", -1 },
+        { STR(LANG_CHANNEL_MONO) },
+        { STR(LANG_CHANNEL_STEREO) },
     };
     static const struct opt_items srcs[WAV_NUM_SRC] = {
         { "Line In", -1 },
Index: talkbox/trunk/apps/plugins/wormlet.c
===================================================================
--- talkbox.orig/trunk/apps/plugins/wormlet.c	2007-10-11 12:51:32.000000000 +0200
+++ talkbox/trunk/apps/plugins/wormlet.c	2007-10-14 10:34:15.000000000 +0200
@@ -2154,9 +2154,9 @@
 {
     bool ret;
     static const struct opt_items num_worms_option[3] = {
-        { "1", -1 },
-        { "2", -1 },
-        { "3", -1 },
+        { "1", TALK_ID(1, UNIT_INT) },
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) },
     };
 
     ret = rb->set_option("Number Of Worms", &worm_count,INT, num_worms_option, 3, NULL);
@@ -2173,10 +2173,10 @@
 {
     bool ret;
     static const struct opt_items num_players_option[4] = {
-        { "0", -1 },
-        { "1", -1 },
-        { "2", -1 },
-        { "3", -1 }
+        { "0", TALK_ID(0, UNIT_INT) },
+        { "1", TALK_ID(1, UNIT_INT) },
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) }
     };
 
     ret = rb->set_option("Number of Players", &players, INT,num_players_option , 4, NULL);
@@ -2195,17 +2195,17 @@
 bool set_worm_argh_size(void)
 {
     static const struct opt_items argh_size_option[11] = {
-        { "0", -1 },
-        { "1", -1 },
-        { "2", -1 },
-        { "3", -1 },
-        { "4", -1 },
-        { "5", -1 },
-        { "6", -1 },
-        { "7", -1 },
-        { "8", -1 },
-        { "9", -1 },
-        { "10", -1 }
+        { "0", TALK_ID(0, UNIT_INT) },
+        { "1", TALK_ID(1, UNIT_INT) },
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) },
+        { "4", TALK_ID(4, UNIT_INT) },
+        { "5", TALK_ID(5, UNIT_INT) },
+        { "6", TALK_ID(6, UNIT_INT) },
+        { "7", TALK_ID(7, UNIT_INT) },
+        { "8", TALK_ID(8, UNIT_INT) },
+        { "9", TALK_ID(9, UNIT_INT) },
+        { "10", TALK_ID(10, UNIT_INT) }
     };
 
     return rb->set_option("Argh Size", &argh_size,INT,argh_size_option , 11, NULL);
@@ -2217,17 +2217,17 @@
 bool set_worm_food(void)
 {
     static const struct opt_items worm_food_option[11] = {
-        { "0", -1 },
-        { "1", -1 },
-        { "2", -1 },
-        { "3", -1 },
-        { "4", -1 },
-        { "5", -1 },
-        { "6", -1 },
-        { "7", -1 },
-        { "8", -1 },
-        { "9", -1 },
-        { "10", -1 }
+        { "0", TALK_ID(0, UNIT_INT) },
+        { "1", TALK_ID(1, UNIT_INT) },
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) },
+        { "4", TALK_ID(4, UNIT_INT) },
+        { "5", TALK_ID(5, UNIT_INT) },
+        { "6", TALK_ID(6, UNIT_INT) },
+        { "7", TALK_ID(7, UNIT_INT) },
+        { "8", TALK_ID(8, UNIT_INT) },
+        { "9", TALK_ID(9, UNIT_INT) },
+        { "10", TALK_ID(10, UNIT_INT) }
     };
     return rb->set_option("Worm Growth Per Food", &worm_food,INT,worm_food_option , 11, NULL);
 }
@@ -2238,11 +2238,11 @@
 bool set_argh_per_food(void)
 {
     static const struct opt_items argh_food_option[5] = {
-        { "0", -1 },
-        { "1", -1 },
-        { "2", -1 },
-        { "3", -1 },
-        { "4", -1 },
+        { "0", TALK_ID(0, UNIT_INT) },
+        { "1", TALK_ID(1, UNIT_INT) },
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) },
+        { "4", TALK_ID(4, UNIT_INT) },
     };
     return rb->set_option("Arghs Per Food", &arghs_per_food,INT,argh_food_option , 5, NULL);
 }
@@ -2405,14 +2405,14 @@
     /* Setup screen */
 
     static const struct opt_items noyes[2] = {
-        { "No", -1 },
-        { "Yes", -1 },
+        { STR(LANG_SET_BOOL_NO) },
+        { STR(LANG_SET_BOOL_YES) },
     };
 
     static const struct opt_items num_worms_option[3] = {
-        { "1", -1 },
-        { "2", -1 },
-        { "3", -1 }
+        { "1", TALK_ID(1, UNIT_INT) },
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) }
     };
 
 #ifdef MULTIPLAYER
@@ -2420,36 +2420,36 @@
 #else
     static const struct opt_items num_players_option[2] = {
 #endif
-        { "0", -1 },
-        { "1", -1 }
+        { "0", TALK_ID(0, UNIT_INT) },
+        { "1", TALK_ID(1, UNIT_INT) }
 #ifdef MULTIPLAYER
-        ,{ "2", -1 },
-        { "3", -1 }
+        ,{ "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) }
 #endif
     };
 
     static const struct opt_items argh_size_option[9] = {
-        { "2", -1 },
-        { "3", -1 },
-        { "4", -1 },
-        { "5", -1 },
-        { "6", -1 },
-        { "7", -1 },
-        { "8", -1 },
-        { "9", -1 },
-        { "10", -1 }
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) },
+        { "4", TALK_ID(4, UNIT_INT) },
+        { "5", TALK_ID(5, UNIT_INT) },
+        { "6", TALK_ID(6, UNIT_INT) },
+        { "7", TALK_ID(7, UNIT_INT) },
+        { "8", TALK_ID(8, UNIT_INT) },
+        { "9", TALK_ID(9, UNIT_INT) },
+        { "10", TALK_ID(10, UNIT_INT) }
     };
 
     static const struct opt_items food_size_option[9] = {
-        { "2", -1 },
-        { "3", -1 },
-        { "4", -1 },
-        { "5", -1 },
-        { "6", -1 },
-        { "7", -1 },
-        { "8", -1 },
-        { "9", -1 },
-        { "10", -1 }
+        { "2", TALK_ID(2, UNIT_INT) },
+        { "3", TALK_ID(3, UNIT_INT) },
+        { "4", TALK_ID(4, UNIT_INT) },
+        { "5", TALK_ID(5, UNIT_INT) },
+        { "6", TALK_ID(6, UNIT_INT) },
+        { "7", TALK_ID(7, UNIT_INT) },
+        { "8", TALK_ID(8, UNIT_INT) },
+        { "9", TALK_ID(9, UNIT_INT) },
+        { "10", TALK_ID(10, UNIT_INT) }
     };
 
     static const struct opt_items worm_food_option[16] = {