Plugin fixes: Correct button name for MODE key in help texts, conforming to the manual & wiki documentation (Ondio plugins). Alternate image is selected with MINUS, not MENU (rockbox_flash for player). Shortened some help lines that didn't fit on the display with the default font (solitaire). Fixed a number of typos.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5512 a1c6a512-1295-4272-9138-f99709370657

11 files changed, 36 insertions, 36 deletions

diff --git a/apps/plugins/euroconverter.c b/apps/plugins/euroconverter.c
index a75a5f055e..f98fc27db8 100644
--- a/apps/plugins/euroconverter.c
+++ b/apps/plugins/euroconverter.c
@@ -60,7 +60,7 @@ static int currency[12]={
                             4033990,    /*BEF Belgium*/
                             16638600,   /*ESP Spain*/
                             594573,     /*FIM Finland*/
-                            78756,      /*IEP Irland*/
+                            78756,      /*IEP Ireland*/
                             193627000,  /*ITL Italy*/
                             4033990,    /*LUF Luxemburg*/
                             220371,     /*NLG Netherlands*/
@@ -76,7 +76,7 @@ static int nb_digit[12]={
                             2,   /*BEF Belgium*/
                             0,   /*ESP Spain*/
                             2,   /*FIM Finland*/
-                            2,   /*IEP Irland*/
+                            2,   /*IEP Ireland*/
                             0,   /*ITL Italy*/
                             2,   /*LUF Luxemburg*/
                             2,   /*NLG Netherlands*/
@@ -86,15 +86,15 @@ static int nb_digit[12]={
 
 /* max euro to have home currency */
 static long long max_euro[12]={
-                                  99999999000LL,    /*FRF France      999 999.99 */
-                                  99999999000LL,    /*DEM Germany     999 999.99 */
-                                  99999999000LL,    /*ATS Austria     999 999.99 */
-                                  99999999000LL,    /*BEF Belgium     999 999.99 */
-                                  99999999000LL,    /*ESP Spain       99 999 999 */
-                                  99999999000LL,    /*FIM Finland     999 999.99 */
-                                  99999999000LL,    /*IEP Irland      999 999.99 */
-                                  51645690000LL,    /*ITL Italy       999 999 999 */
-                                  99999999000LL,    /*LUF Luxemburg   999 999.99 */
+                                  99999999000LL,   /*FRF France      999 999.99 */
+                                  99999999000LL,   /*DEM Germany     999 999.99 */
+                                  99999999000LL,   /*ATS Austria     999 999.99 */
+                                  99999999000LL,   /*BEF Belgium     999 999.99 */
+                                  99999999000LL,   /*ESP Spain       99 999 999 */
+                                  99999999000LL,   /*FIM Finland     999 999.99 */
+                                  99999999000LL,   /*IEP Ireland     999 999.99 */
+                                  51645690000LL,   /*ITL Italy       999 999 999 */
+                                  99999999000LL,   /*LUF Luxemburg   999 999.99 */
                                   99999999000LL,   /*NLG Netherlands 999 999.99 */
                                   99999999000LL,   /*PTE Portugal    99 999 999 */
                                   29347028000LL    /*GRD Greece      99 999 999 */
@@ -107,14 +107,14 @@ static long long max_curr[12]={
                                   99999999000LL,   /*DEM Germany     511291.88 */
                                   99999999000LL,   /*ATS Austria     72672.83 */
                                   99999999000LL,   /*BEF Belgium     24789.35 */
-                                  92233720300000LL, /*ESP Spain      5543358.23 */
+                                  92233720300000LL,/*ESP Spain       5543358.23 */
                                   99999999000LL,   /*FIM Finland     168187.92 */
-                                  9999999900LL,    /*IEP Irland      1269744.51 exact value=1269738.07 */
+                                  9999999900LL,    /*IEP Ireland     1269744.51 exact value=1269738.07 */
                                   92233720300000LL,/*ITL Italy       476347.41 */
                                   99999999000LL,   /*LUF Luxemburg   24789.35 */
                                   99999999000LL,   /*NLG Netherlands 453780.21 */
-                                  92233720300000LL, /*PTE Portugal    4600598.57 */
-                                  92233720300000LL  /*GRD Greece      2706777.69 */
+                                  92233720300000LL,/*PTE Portugal    4600598.57 */
+                                  92233720300000LL /*GRD Greece      2706777.69 */
                               };
 
 static unsigned char *abbrev_str[12] = {
@@ -124,7 +124,7 @@ static unsigned char *abbrev_str[12] = {
                                           "...BEF...",  /*Belgium*/
                                           "...ESP...",  /*Spain*/
                                           "...FIM...",  /*Finland*/
-                                          "...IEP...",  /*Irland*/
+                                          "...IEP...",  /*Ireland*/
                                           "...ITL...",  /*Italy*/
                                           "...LUF...",  /*Luxemburg*/
                                           "...NLG...",  /*Netherlands*/
diff --git a/apps/plugins/flipit.c b/apps/plugins/flipit.c
index 973e27e299..02867d9d8b 100644
--- a/apps/plugins/flipit.c
+++ b/apps/plugins/flipit.c
@@ -286,7 +286,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     rb->lcd_putsxy(2, 48, "[F3] step by step");
 #elif CONFIG_KEYPAD == ONDIO_PAD
     rb->lcd_putsxy(2, 8, "[OFF] to stop");
-    rb->lcd_putsxy(2, 18, "[MENU] toggle");
+    rb->lcd_putsxy(2, 18, "[MODE] toggle");
     rb->lcd_putsxy(2, 28, "[M-LEFT] shuffle");
     rb->lcd_putsxy(2, 38, "[M-UP] solution");
     rb->lcd_putsxy(2, 48, "[M-RIGHT] step by step");
diff --git a/apps/plugins/metronome.c b/apps/plugins/metronome.c
index cf93aa5b11..d2608d38a8 100644
--- a/apps/plugins/metronome.c
+++ b/apps/plugins/metronome.c
@@ -36,8 +36,8 @@
 #define METRONOME_PAUSE (BUTTON_MENU | BUTTON_REPEAT)
 #define METRONOME_VOL_UP BUTTON_UP
 #define METRONOME_VOL_DOWN BUTTON_DOWN
-#define METRONOME_MSG_START "start: menu"
-#define METRONOME_MSG_STOP "pause: hold menu"
+#define METRONOME_MSG_START "start: mode"
+#define METRONOME_MSG_STOP "pause: hold mode"
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
 #define METRONOME_QUIT BUTTON_STOP
diff --git a/apps/plugins/minesweeper.c b/apps/plugins/minesweeper.c
index 81ed24096a..b6636bbfb7 100644
--- a/apps/plugins/minesweeper.c
+++ b/apps/plugins/minesweeper.c
@@ -304,7 +304,7 @@ int minesweeper(void)
 #if CONFIG_KEYPAD == RECORDER_PAD
         rb->lcd_putsxy(1,44,"ON to start");
 #elif CONFIG_KEYPAD == ONDIO_PAD
-        rb->lcd_putsxy(1,44,"MENU to start");
+        rb->lcd_putsxy(1,44,"MODE to start");
 #endif
 
         rb->lcd_update();
diff --git a/apps/plugins/rockbox_flash.c b/apps/plugins/rockbox_flash.c
index 91d440e1e0..7d0f630474 100644
--- a/apps/plugins/rockbox_flash.c
+++ b/apps/plugins/rockbox_flash.c
@@ -966,7 +966,7 @@ void DoUserDialog(char* filename)
     {
         rb->snprintf(buf, sizeof(buf), "Verify fail! %d errors", rc);
         rb->lcd_puts_scroll(0, 0, buf);
-        rb->lcd_puts_scroll(0, 1, "Use safe image if booting hangs: [Menu] during power-on");
+        rb->lcd_puts_scroll(0, 1, "Use safe image if booting hangs: [-] during power-on");
         button = WaitForButton();
     }
 }
diff --git a/apps/plugins/sliding_puzzle.c b/apps/plugins/sliding_puzzle.c
index 789e8789e8..aaaf0f78cb 100644
--- a/apps/plugins/sliding_puzzle.c
+++ b/apps/plugins/sliding_puzzle.c
@@ -334,8 +334,8 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     rb->lcd_putsxy(3, 38, "[F2] change pic");
 #elif CONFIG_KEYPAD == ONDIO_PAD
     rb->lcd_putsxy(0, 18, "[OFF] to stop");
-    rb->lcd_putsxy(0, 28, "[MENU..] shuffle");
-    rb->lcd_putsxy(0, 38, "[MENU] change pic");
+    rb->lcd_putsxy(0, 28, "[MODE..] shuffle");
+    rb->lcd_putsxy(0, 38, "[MODE] change pic");
 #endif
     rb->lcd_update();
     rb->sleep(HZ*2);
diff --git a/apps/plugins/snake.c b/apps/plugins/snake.c
index 242c432e8b..3a672f9972 100644
--- a/apps/plugins/snake.c
+++ b/apps/plugins/snake.c
@@ -173,7 +173,7 @@ void game_pause (void) {
 #if CONFIG_KEYPAD == RECORDER_PAD
     rb->lcd_putsxy(3,22,"[Play] to resume");
 #elif CONFIG_KEYPAD == ONDIO_PAD
-    rb->lcd_putsxy(3,22,"[Menu] to resume");
+    rb->lcd_putsxy(3,22,"[Mode] to resume");
 #endif
     rb->lcd_putsxy(3,32,"[Off] to quit");
     rb->lcd_update();
@@ -279,7 +279,7 @@ void game_init(void) {
 #if CONFIG_KEYPAD == RECORDER_PAD
     rb->lcd_puts(0,3, "PLAY - start/pause");
 #elif CONFIG_KEYPAD == ONDIO_PAD
-    rb->lcd_puts(0,3, "MENU - start/pause");
+    rb->lcd_puts(0,3, "MODE - start/pause");
 #endif
     rb->lcd_puts(0,4, phscore);
     rb->lcd_update();
diff --git a/apps/plugins/sokoban.c b/apps/plugins/sokoban.c
index 6365e6c3ae..5b0eae1bc6 100644
--- a/apps/plugins/sokoban.c
+++ b/apps/plugins/sokoban.c
@@ -878,7 +878,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter)
     rb->lcd_putsxy(3, 46, "[F3] + Level");
 #elif CONFIG_KEYPAD == ONDIO_PAD
     rb->lcd_putsxy(3,  6, "[OFF] To Stop");
-    rb->lcd_putsxy(3, 16, "[MENU] To Undo");
+    rb->lcd_putsxy(3, 16, "[MODE] To Undo");
     rb->lcd_putsxy(3, 26, "[M-LEFT] - Level");
     rb->lcd_putsxy(3, 36, "[M-UP] Same Level");
     rb->lcd_putsxy(3, 46, "[M-RIGHT] + Level");
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c
index fa01fbd1cf..9e8347fb79 100644
--- a/apps/plugins/solitaire.c
+++ b/apps/plugins/solitaire.c
@@ -102,8 +102,8 @@ static struct plugin_api* rb;
 #define HELP_SOL_REM2STACK "F3: Put the card on top of the remains' stack on one of the 4 final color stacks."
 
 #elif CONFIG_KEYPAD == ONDIO_PAD
-#define HELP_SOL_MOVE "MENU: Select cards, Move cards, reveal hidden cards ..."
-#define HELP_SOL_DRAW "MENU..: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack."
+#define HELP_SOL_MOVE "MODE: Select cards, Move cards, reveal hidden cards ..."
+#define HELP_SOL_DRAW "MODE..: Un-select a card if it was selected. Else, draw 3 new cards out of the remains' stack."
 #define HELP_SOL_REM2CUR "LEFT..: Put the card on top of the remains' stack on top of the cursor."
 #define HELP_SOL_CUR2STACK "RIGHT..: Put the card under the cursor on one of the 4 final color stacks."
 #define HELP_SOL_REM2STACK "UP..: Put the card on top of the remains' stack on one of the 4 final color stacks."
@@ -341,13 +341,13 @@ int solitaire_help(void){
         rb->lcd_putsxy(0, 49, "be done using");
         rb->lcd_putsxy(0, 56, "arrows, ON and F2.");
 #elif CONFIG_KEYPAD == ONDIO_PAD
-        rb->lcd_putsxy(0, 0, "Press a key short or");
-        rb->lcd_putsxy(0, 7, "long to see it's role.");
-        rb->lcd_putsxy(0, 21, "Press OFF to");
+        rb->lcd_putsxy(0, 0, "Press a key short");
+        rb->lcd_putsxy(0, 7, "or long to see it's");
+        rb->lcd_putsxy(0, 21, "role. Press OFF to");
         rb->lcd_putsxy(0, 28, "return to menu.");
         rb->lcd_putsxy(0, 42, "All actions can be");
-        rb->lcd_putsxy(0, 49, "done using arows,");
-        rb->lcd_putsxy(0, 56, "short & long MENU.");
+        rb->lcd_putsxy(0, 49, "done using arrows,");
+        rb->lcd_putsxy(0, 56, "short & long MODE.");
 #endif
 
         rb->lcd_update();
diff --git a/apps/plugins/star.c b/apps/plugins/star.c
index e2f11a5c07..1b9dca8f40 100644
--- a/apps/plugins/star.c
+++ b/apps/plugins/star.c
@@ -808,7 +808,7 @@ static int star_menu(void)
                                           "[F3] Next level", true);
 #elif CONFIG_KEYPAD == ONDIO_PAD
                         star_display_text("KEYS\n\n"
-                                          "[MENU] Toggle Ctl\n"
+                                          "[MODE] Toggle Ctl\n"
                                           "[OFF] Exit\n"
                                           "[M <] Prev. level\n"
                                           "[M ^] Reset level\n"
diff --git a/apps/plugins/vu_meter.c b/apps/plugins/vu_meter.c
index 1cb37e4161..ba218903e7 100644
--- a/apps/plugins/vu_meter.c
+++ b/apps/plugins/vu_meter.c
@@ -119,7 +119,7 @@ void load_settings(void) {
 #if CONFIG_KEYPAD == RECORDER_PAD
         rb->splash(HZ, true, "Press ON for help");
 #elif CONFIG_KEYPAD == ONDIO_PAD
-        rb->splash(HZ, true, "Press MENU for help");
+        rb->splash(HZ, true, "Press MODE for help");
 #endif
     }
 }
@@ -448,7 +448,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) {
 #if CONFIG_KEYPAD == RECORDER_PAD
                 rb->lcd_puts(0, 1, "F1: Settings");
 #elif CONFIG_KEYPAD == ONDIO_PAD
-                rb->lcd_puts(0, 1, "MENU..: Settings");
+                rb->lcd_puts(0, 1, "MODE..: Settings");
 #endif
                 rb->lcd_puts(0, 2, "UP/DOWN: Volume");
                 rb->lcd_update();