diff options
| author | Rani Hod <raenye@gmail.com> | 2006-08-08 22:32:56 +0000 |
|---|---|---|
| committer | Rani Hod <raenye@gmail.com> | 2006-08-08 22:32:56 +0000 |
| commit | a27ab7206df88b90a0cb0ad16f6524b5846d157e (patch) | |
| tree | dd4a5cf842d423e9d9e6244744763e4d024691d9 /apps | |
| parent | c9f59e6f75bcfa25a563fedd77bfa77b3617f133 (diff) | |
| download | rockbox-a27ab7206df88b90a0cb0ad16f6524b5846d157e.tar.gz rockbox-a27ab7206df88b90a0cb0ad16f6524b5846d157e.zip | |
oops, bad merge
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10490 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/lang/english.lang | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang index a723c1cc0e..50cdb20432 100644 --- a/apps/lang/english.lang +++ b/apps/lang/english.lang | |||
| @@ -8805,6 +8805,8 @@ | |||
| 8805 | </dest> | 8805 | </dest> |
| 8806 | <voice> | 8806 | <voice> |
| 8807 | *: "(Vol- : Re-enable)" | 8807 | *: "(Vol- : Re-enable)" |
| 8808 | </voice> | ||
| 8809 | </phrase> | ||
| 8808 | <phrase> | 8810 | <phrase> |
| 8809 | id: LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL | 8811 | id: LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL |
| 8810 | desc: in lcd settings | 8812 | desc: in lcd settings |
| @@ -8861,8 +8863,6 @@ | |||
| 8861 | *: "Sleep after backlight off" | 8863 | *: "Sleep after backlight off" |
| 8862 | </voice> | 8864 | </voice> |
| 8863 | </phrase> | 8865 | </phrase> |
| 8864 | </voice> | ||
| 8865 | </phrase> | ||
| 8866 | <phrase> | 8866 | <phrase> |
| 8867 | id: LANG_SYSFONT_SET_BOOL_YES | 8867 | id: LANG_SYSFONT_SET_BOOL_YES |
| 8868 | desc: bool true representation | 8868 | desc: bool true representation |