oops, bad merge

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10490 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rani Hod 2006-08-08 22:32:56 +00:00
parent c9f59e6f75
commit a27ab7206d

View file

@ -8805,6 +8805,8 @@
</dest>
<voice>
*: "(Vol- : Re-enable)"
</voice>
</phrase>
<phrase>
id: LANG_BACKLIGHT_ON_BUTTON_HOLD_NORMAL
desc: in lcd settings
@ -8860,8 +8862,6 @@
<voice>
*: "Sleep after backlight off"
</voice>
</phrase>
</voice>
</phrase>
<phrase>
id: LANG_SYSFONT_SET_BOOL_YES