diff options
author | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-03-12 17:32:24 +0000 |
---|---|---|
committer | Torne Wuff <torne@wolfpuppy.org.uk> | 2010-03-12 17:32:24 +0000 |
commit | 86dc6c1204b2adc3e64238c4dfdd65a473f0ce4c (patch) | |
tree | 369ff0445a5b697198b0a46715ba6d6d08e8ea15 /apps | |
parent | 2a9c42d1ed265f67d5dfb15b01c3ca1235127197 (diff) | |
download | rockbox-86dc6c1204b2adc3e64238c4dfdd65a473f0ce4c.tar.gz rockbox-86dc6c1204b2adc3e64238c4dfdd65a473f0ce4c.zip |
Change USB HID mode string from just "Multimedia Mode" (or similar) to say "USB keypad mode: Multimedia" (or similar).
This will hopefully reduce the huge confusion from new users who think that multimedia mode means it's doing MTP or some other thing which is not MSC.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25132 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/gui/usb_screen.c | 7 | ||||
-rw-r--r-- | apps/lang/english.lang | 24 |
2 files changed, 18 insertions, 13 deletions
diff --git a/apps/gui/usb_screen.c b/apps/gui/usb_screen.c index a92ecac27f..52f9f994f1 100644 --- a/apps/gui/usb_screen.c +++ b/apps/gui/usb_screen.c @@ -30,6 +30,7 @@ #include "usb_core.h" #ifdef USB_ENABLE_HID #include "usb_keymaps.h" +#include "sprintf.h" #endif #endif #include "settings.h" @@ -211,9 +212,13 @@ static void usb_screens_draw(struct usb_screen_vps_t *usb_screen_vps_ar) #ifdef USB_ENABLE_HID if (usb_hid) { + char modestring[100]; screen->set_viewport(&usb_screen_vps->title); usb_screen_vps->title.flags |= VP_FLAG_ALIGN_CENTER; - screen->puts_scroll(0, 0, str(keypad_mode_name_get())); + snprintf(modestring, sizeof(modestring), "%s: %s", + str(LANG_USB_KEYPAD_MODE), + str(keypad_mode_name_get())); + screen->puts_scroll(0, 0, modestring); } #endif /* USB_ENABLE_HID */ } diff --git a/apps/lang/english.lang b/apps/lang/english.lang index b1cf47ca11..ab5b6b59cf 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang @@ -12688,15 +12688,15 @@ user: core <source> *: none - usb_hid: "Multimedia Mode" + usb_hid: "Multimedia" </source> <dest> *: none - usb_hid: "Multimedia Mode" + usb_hid: "Multimedia" </dest> <voice> *: none - usb_hid: "Multimedia Mode" + usb_hid: "Multimedia" </voice> </phrase> <phrase> @@ -12705,15 +12705,15 @@ user: core <source> *: none - usb_hid: "Presentation Mode" + usb_hid: "Presentation" </source> <dest> *: none - usb_hid: "Presentation Mode" + usb_hid: "Presentation" </dest> <voice> *: none - usb_hid: "Presentation Mode" + usb_hid: "Presentation" </voice> </phrase> <phrase> @@ -12722,15 +12722,15 @@ user: core <source> *: none - usb_hid: "Browser Mode" + usb_hid: "Browser" </source> <dest> *: none - usb_hid: "Browser Mode" + usb_hid: "Browser" </dest> <voice> *: none - usb_hid: "Browser Mode" + usb_hid: "Browser" </voice> </phrase> <phrase> @@ -12739,15 +12739,15 @@ user: core <source> *: none - usb_hid: "Mouse Mode" + usb_hid: "Mouse" </source> <dest> *: none - usb_hid: "Mouse Mode" + usb_hid: "Mouse" </dest> <voice> *: none - usb_hid: "Mouse Mode" + usb_hid: "Mouse" </voice> </phrase> <phrase> |