devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

fixed engligh.lang conflicts

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10790 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2006-08-28 22:43:46 +00:00
parent 4fc717a4c1
commit 25c0f4c6c3
1 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

31
apps/lang/english.lang
View file

@ -9661,22 +9661,6 @@
*: "Full Path" *: "Full Path"
</voice> </voice>
</phrase> </phrase>
<<<<<<< english.lang
<phrase>
id: VOICE_KBIT_PER_SEC
desc: spoken only, for file extension
user:
<source>
*: ""
</source>
<dest>
*: ""
</dest>
<voice>
*: "kilobits per second"
</voice>
</phrase>
=======
<phrase> <phrase>
id: LANG_RECORD_AGC_PRESET id: LANG_RECORD_AGC_PRESET
desc: automatic gain control in record settings desc: automatic gain control in record settings
@ -9794,4 +9778,17 @@
*: "AGC maximum gain" *: "AGC maximum gain"
</voice> </voice>
</phrase> </phrase>
>>>>>>> 1.267 <phrase>
id: VOICE_KBIT_PER_SEC
desc: spoken only, for file extension
user:
<source>
*: ""
</source>
<dest>
*: ""
</dest>
<voice>
*: "kilobits per second"
</voice>
</phrase>