diff options
author | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 12:41:09 +0000 |
---|---|---|
committer | Tomer Shalev <shalev.tomer@gmail.com> | 2009-09-30 12:41:09 +0000 |
commit | 3d1b26cddcc5a98acc260bb450ac8261f6cf0c5a (patch) | |
tree | 4942afe8b8a5e5890559e99288e5d478fdd6178c | |
parent | 363c116fc7f4b5189f863004d4ac0d2f1a48ec89 (diff) | |
download | rockbox-3d1b26cddcc5a98acc260bb450ac8261f6cf0c5a.tar.gz rockbox-3d1b26cddcc5a98acc260bb450ac8261f6cf0c5a.zip |
Fix delta in targets without HAVE_USBSTACK and USE_ROCKBOX_USB caused by
redundant strings in lang file
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@22856 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/features.txt | 3 | ||||
-rw-r--r-- | apps/lang/english.lang | 45 |
2 files changed, 33 insertions, 15 deletions
diff --git a/apps/features.txt b/apps/features.txt index 91acdc5f4e..f2822da4b7 100644 --- a/apps/features.txt +++ b/apps/features.txt | |||
@@ -196,6 +196,9 @@ usb_charging | |||
196 | 196 | ||
197 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) | 197 | #if defined(HAVE_USBSTACK) && defined(USE_ROCKBOX_USB) |
198 | usbstack | 198 | usbstack |
199 | #if defined(USB_ENABLE_HID) | ||
200 | usb_hid | ||
201 | #endif | ||
199 | #endif | 202 | #endif |
200 | 203 | ||
201 | #if defined(HAVE_WHEEL_ACCELERATION) | 204 | #if defined(HAVE_WHEEL_ACCELERATION) |
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index 541e7ffbe0..c77ebbc427 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
@@ -12658,13 +12658,16 @@ | |||
12658 | desc: in settings_menu | 12658 | desc: in settings_menu |
12659 | user: core | 12659 | user: core |
12660 | <source> | 12660 | <source> |
12661 | *: "USB Keypad Mode:" | 12661 | *: none |
12662 | usb_hid: "USB Keypad Mode:" | ||
12662 | </source> | 12663 | </source> |
12663 | <dest> | 12664 | <dest> |
12664 | *: "USB Keypad Mode:" | 12665 | *: none |
12666 | usb_hid: "USB Keypad Mode:" | ||
12665 | </dest> | 12667 | </dest> |
12666 | <voice> | 12668 | <voice> |
12667 | *: "USB Keypad Mode" | 12669 | *: none |
12670 | usb_hid: "USB Keypad Mode" | ||
12668 | </voice> | 12671 | </voice> |
12669 | </phrase> | 12672 | </phrase> |
12670 | <phrase> | 12673 | <phrase> |
@@ -12672,13 +12675,16 @@ | |||
12672 | desc: in settings_menu | 12675 | desc: in settings_menu |
12673 | user: core | 12676 | user: core |
12674 | <source> | 12677 | <source> |
12675 | *: "Multimedia" | 12678 | *: none |
12679 | usb_hid: "Multimedia" | ||
12676 | </source> | 12680 | </source> |
12677 | <dest> | 12681 | <dest> |
12678 | *: "Multimedia" | 12682 | *: none |
12683 | usb_hid: "Multimedia" | ||
12679 | </dest> | 12684 | </dest> |
12680 | <voice> | 12685 | <voice> |
12681 | *: "Multimedia" | 12686 | *: none |
12687 | usb_hid: "Multimedia" | ||
12682 | </voice> | 12688 | </voice> |
12683 | </phrase> | 12689 | </phrase> |
12684 | <phrase> | 12690 | <phrase> |
@@ -12686,13 +12692,16 @@ | |||
12686 | desc: in settings_menu | 12692 | desc: in settings_menu |
12687 | user: core | 12693 | user: core |
12688 | <source> | 12694 | <source> |
12689 | *: "Presentation" | 12695 | *: none |
12696 | usb_hid: "Presentation" | ||
12690 | </source> | 12697 | </source> |
12691 | <dest> | 12698 | <dest> |
12692 | *: "Presentation" | 12699 | *: none |
12700 | usb_hid: "Presentation" | ||
12693 | </dest> | 12701 | </dest> |
12694 | <voice> | 12702 | <voice> |
12695 | *: "Presentation" | 12703 | *: none |
12704 | usb_hid: "Presentation" | ||
12696 | </voice> | 12705 | </voice> |
12697 | </phrase> | 12706 | </phrase> |
12698 | <phrase> | 12707 | <phrase> |
@@ -12700,13 +12709,16 @@ | |||
12700 | desc: in settings_menu | 12709 | desc: in settings_menu |
12701 | user: core | 12710 | user: core |
12702 | <source> | 12711 | <source> |
12703 | *: "Browser" | 12712 | *: none |
12713 | usb_hid: "Browser" | ||
12704 | </source> | 12714 | </source> |
12705 | <dest> | 12715 | <dest> |
12706 | *: "Browser" | 12716 | *: none |
12717 | usb_hid: "Browser" | ||
12707 | </dest> | 12718 | </dest> |
12708 | <voice> | 12719 | <voice> |
12709 | *: "Browser" | 12720 | *: none |
12721 | usb_hid: "Browser" | ||
12710 | </voice> | 12722 | </voice> |
12711 | </phrase> | 12723 | </phrase> |
12712 | <phrase> | 12724 | <phrase> |
@@ -12714,13 +12726,16 @@ | |||
12714 | desc: in settings_menu | 12726 | desc: in settings_menu |
12715 | user: core | 12727 | user: core |
12716 | <source> | 12728 | <source> |
12717 | *: "Mouse" | 12729 | *: none |
12730 | usb_hid: "Mouse" | ||
12718 | </source> | 12731 | </source> |
12719 | <dest> | 12732 | <dest> |
12720 | *: "Mouse" | 12733 | *: none |
12734 | usb_hid: "Mouse" | ||
12721 | </dest> | 12735 | </dest> |
12722 | <voice> | 12736 | <voice> |
12723 | *: "Mouse" | 12737 | *: none |
12738 | usb_hid: "Mouse" | ||
12724 | </voice> | 12739 | </voice> |
12725 | </phrase> | 12740 | </phrase> |
12726 | <phrase> | 12741 | <phrase> |