Index: apps/plugins/battery_bench.c
===================================================================
--- apps/plugins/battery_bench.c	(revision 18656)
+++ apps/plugins/battery_bench.c	(working copy)
@@ -39,6 +39,7 @@
 #define BATTERY_OFF BUTTON_OFF
 #define BATTERY_ON_TXT  "PLAY - start"
 #define BATTERY_OFF_TXT "OFF  - quit"
+#define BATTERY_OFF_MSG "Press OFF to cancel the test"
 
 #if BUTTON_REMOTE != 0
 #define BATTERY_RC_ON BUTTON_RC_PLAY
@@ -51,6 +52,7 @@
 #define BATTERY_OFF BUTTON_OFF
 #define BATTERY_ON_TXT  "RIGHT - start"
 #define BATTERY_OFF_TXT "OFF   - quit"
+#define BATTERY_OFF_MSG "Press OFF to cancel the test"
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
 
@@ -71,6 +73,7 @@
 
 #define BATTERY_ON_TXT  "PLAY - start"
 #define BATTERY_OFF_TXT "STOP - quit"
+#define BATTERY_OFF_MSG "Press STOP to cancel the test"
 
 #elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
       (CONFIG_KEYPAD == IPOD_3G_PAD) || \
@@ -80,6 +83,7 @@
 #define BATTERY_OFF BUTTON_MENU
 #define BATTERY_ON_TXT  "PLAY - start"
 #define BATTERY_OFF_TXT "MENU - quit"
+#define BATTERY_OFF_MSG "Press MENU to cancel the test"
 
 #elif CONFIG_KEYPAD == IAUDIO_X5M5_PAD
 
@@ -87,6 +91,7 @@
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_ON_TXT  "SELECT - start"
 #define BATTERY_OFF_TXT "POWER  - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 
 #elif CONFIG_KEYPAD == IRIVER_IFP7XX_PAD
 
@@ -94,6 +99,7 @@
 #define BATTERY_OFF BUTTON_PLAY
 #define BATTERY_ON_TXT  "SELECT - start"
 #define BATTERY_OFF_TXT "PLAY   - quit"
+#define BATTERY_OFF_MSG "Press PLAY to cancel the test"
 
 #elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
 (CONFIG_KEYPAD == SANSA_C200_PAD)
@@ -101,6 +107,7 @@
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_ON_TXT  "SELECT - start"
 #define BATTERY_OFF_TXT "POWER  - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 
 #elif CONFIG_KEYPAD == IRIVER_H10_PAD
 
@@ -108,6 +115,7 @@
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_ON_TXT  "PLAY  - start"
 #define BATTERY_OFF_TXT "POWER - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 
 #elif CONFIG_KEYPAD == GIGABEAT_PAD
 
@@ -115,6 +123,7 @@
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_ON_TXT  "SELECT - start"
 #define BATTERY_OFF_TXT "POWER  - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 
 #elif CONFIG_KEYPAD == GIGABEAT_S_PAD
 
@@ -122,6 +131,7 @@
 #define BATTERY_OFF BUTTON_BACK
 #define BATTERY_ON_TXT  "SELECT - start"
 #define BATTERY_OFF_TXT "BACK  - quit"
+#define BATTERY_OFF_MSG "Press BACK to cancel the test"
 
 #elif CONFIG_KEYPAD == MROBE500_PAD
 
@@ -129,6 +139,7 @@
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_ON_TXT  "PLAY - start"
 #define BATTERY_OFF_TXT "POWER  - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 
 #elif CONFIG_KEYPAD == MROBE100_PAD
 
@@ -136,6 +147,7 @@
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_ON_TXT  "SELECT - start"
 #define BATTERY_OFF_TXT "POWER  - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 
 #elif CONFIG_KEYPAD == IAUDIO_M3_PAD
 
@@ -145,16 +157,19 @@
 #define BATTERY_RC_OFF BUTTON_RC_REC
 #define BATTERY_ON_TXT  "PLAY - start"
 #define BATTERY_OFF_TXT "REC  - quit"
+#define BATTERY_OFF_MSG "Press REC to cancel the test"
 
 #elif CONFIG_KEYPAD == COWOND2_PAD
 
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_OFF_TXT "POWER  - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 
 #elif CONFIG_KEYPAD == IAUDIO67_PAD
 
 #define BATTERY_OFF BUTTON_POWER
 #define BATTERY_OFF_TXT "POWER  - quit"
+#define BATTERY_OFF_MSG "Press POWER to cancel the test"
 #define BATTERY_ON BUTTON_PLAY
 #define BATTERY_ON_TXT  "PLAY - start"
 #else
@@ -173,6 +188,7 @@
 #endif
 #ifndef BATTERY_OFF_TXT
 #define BATTERY_OFF_TXT "TOPLEFT  - quit"
+#define BATTERY_OFF_MSG "Press TOPLEFT to cancel the test"
 #endif
 #endif
 
@@ -216,7 +232,7 @@
     (void)reenter;
     rb->lcd_clear_display();
     rb->lcd_puts_scroll(0, 0, "Batt.Bench is currently running.");
-    rb->lcd_puts_scroll(0, 1, "Press OFF to cancel the test");
+    rb->lcd_puts_scroll(0, 1, BATTERY_OFF_MSG);
 #ifdef HAVE_LCD_BITMAP
     rb->lcd_puts_scroll(0, 2, "Anything else will resume");
 #endif