Index: tools/release/voices.pl =================================================================== --- tools/release/voices.pl (revision 23734) +++ tools/release/voices.pl (working copy) @@ -1,6 +1,7 @@ #!/usr/bin/perl -$version="3.4"; +require "../builds.pm"; +my $version = $publicrelease; my $verbose; if($ARGV[0] eq "-v") { @@ -16,7 +17,7 @@ # made once for all targets sub runone { - my ($dir, $select, $newl)=@_; + my ($dir)=@_; my $a; if($doonly && ($doonly ne $dir)) { @@ -28,7 +29,7 @@ print "Build in buildv-$dir\n" if($verbose); # build the manual(s) - $a = buildit($dir, $select, $newl); + $a = buildit($dir); chdir ".."; @@ -50,13 +51,11 @@ }; sub buildit { - my ($dir, $select, $newl)=@_; + my ($model)=@_; `rm -rf * >/dev/null 2>&1`; - # V (voice), F (festival), L (lame), [blank] (English) - my $c = sprintf('printf "%s\n%sa\nv\n\n\nf\n\n" | ../tools/configure', - $select, $newl?'\n':""); + my $c = "../tools/configure --type=av --target=$model --language=0 --tts=f"; print "C: $c\n" if($verbose); `$c`; @@ -75,31 +74,8 @@ `rm -f $pool/*`; $ENV{'POOL'}="$pool"; -runone("player", "player", 1); -runone("recorder", "recorder", 1); -runone("fmrecorder", "fmrecorder", 1); -runone("recorderv2", "recorderv2", 1); -runone("ondiosp", "ondiosp", 1); -runone("ondiofm", "ondiofm", 1); -runone("h100", "h100"); -runone("h120", "h120"); -runone("h300", "h300"); -runone("ipodcolor", "ipodcolor"); -runone("ipodnano", "ipodnano"); -runone("ipod4gray", "ipod4g"); -runone("ipodvideo", "ipodvideo", 1); -runone("ipod3g", "ipod3g"); -runone("ipod1g2g", "ipod1g2g"); -runone("iaudiox5", "x5"); -runone("iaudiom5", "m5"); -runone("iaudiom3", "m3"); -runone("ipodmini2g", "ipodmini2g"); -runone("ipodmini1g", "ipodmini"); -runone("h10", "h10"); -runone("h10_5gb", "h10_5gb"); -runone("gigabeatf", "gigabeatf"); -runone("sansae200", "e200"); -runone("sansac200", "c200"); -runone("mrobe100", "mrobe100"); -#runone("cowond2", "cowond2"); +for my $b (&stablebuilds) { + next if ($builds{$b}{configname} < 3); # no variants + runone($b); +} Index: tools/release/bins.pl =================================================================== --- tools/release/bins.pl (revision 23734) +++ tools/release/bins.pl (working copy) @@ -1,7 +1,9 @@ #!/usr/bin/perl -$version="3.4"; +require "../builds.pm"; +$version=$publicrelease; + my $verbose; if($ARGV[0] eq "-v") { $verbose =1; @@ -73,7 +75,7 @@ chdir "build-$dir"; print "Build fonts in build-$dir\n" if($verbose); - # build the manual(s) + # build the fonts $a = buildfonts($dir, $confnum, $newl); chdir ".."; @@ -98,8 +100,8 @@ `rm -rf * >/dev/null 2>&1`; - my $c = sprintf('printf "%s\n%sn\n" | ../tools/configure', - $confnum, $extra); + my $ram = $extra ? $extra : -1; + my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; print "C: $c\n" if($verbose); `$c`; @@ -119,8 +121,8 @@ `rm -rf * >/dev/null 2>&1`; - my $c = sprintf("printf '%s\n%sn\n' | ../tools/configure", - $confnum, $newl?'\n':''); + my $ram = $extra ? $extra : -1; + my $c = "../tools/configure --type=n --target=$confnum --ram=$ram"; print "C: $c\n" if($verbose); `$c`; @@ -133,37 +135,10 @@ print "cd tools && make\n" if($verbose); `(cd tools && make ) >/dev/null 2>&1`; -runone("player", "player", '\n'); -runone("recorder", "recorder", '\n'); -runone("recorder8mb", "recorder", '8\n'); -runone("fmrecorder", "fmrecorder", '\n'); -runone("fmrecorder8mb", "fmrecorder", '8\n'); -runone("recorderv2", "recorderv2", '\n'); -runone("ondiosp", "ondiosp", '\n'); -runone("ondiofm", "ondiofm", '\n'); -runone("h100", "h100"); -runone("h120", "h120"); -runone("h300", "h300"); -runone("ipodcolor", "ipodcolor"); -runone("ipodnano", "ipodnano"); -runone("ipod4gray", "ipod4g"); -runone("ipodvideo", "ipodvideo", '32\n'); -runone("ipodvideo64mb", "ipodvideo", '64\n'); -runone("ipod3g", "ipod3g"); -runone("ipod1g2g", "ipod1g2g"); -runone("iaudiox5", "x5"); -runone("iaudiom5", "m5"); -runone("iaudiom3", "m3"); -runone("ipodmini1g", "ipodmini"); -runone("ipodmini2g", "ipodmini2g"); -runone("h10", "h10"); -runone("h10_5gb", "h10_5gb"); -runone("gigabeatf", "gigabeatf"); -runone("sansae200", "e200"); -runone("sansac200", "c200"); -#runone("mrobe500", "mrobe500"); -runone("mrobe100", "mrobe100"); -runone("cowond2", "cowond2"); -fonts("fonts", "x5"); +for my $b (&stablebuilds) { + my $configname = $builds{b}{configname} ? $builds{b}{configname} : $b; + runone($b, $configname, $builds{b}{ram}); +} +fonts("fonts", "iaudiox5"); Index: tools/release/sims.pl =================================================================== --- tools/release/sims.pl (revision 23734) +++ tools/release/sims.pl (working copy) @@ -4,6 +4,8 @@ use File::Path; use Cwd; +require "../builds.pm"; + my $verbose, $strip, $update, $doonly, $version; my @doonly; @@ -88,7 +90,7 @@ # made once for all targets sub runone { - my ($dir, $confnum, $extra)=@_; + my ($dir)=@_; my $a; if(@doonly > 0 && !grep(/^$dir$/, @doonly)) { @@ -100,7 +102,7 @@ print "Build in build-$dir\n" if($verbose); # build the target - $a = buildit($dir, $confnum, $extra); + $a = buildit($dir); if ($strip) { print "Stripping binaries\n" if ($verbose); @@ -149,12 +151,11 @@ }; sub buildit { - my ($target, $confnum, $extra)=@_; + my ($target)=@_; `rm -rf * >/dev/null 2>&1`; - my $c = sprintf('printf "%s\n%ss\n" | ../tools/configure', - $confnum, $extra); + my $c = "../tools/configure --type=s --target=$target"; print "C: $c\n" if($verbose); `$c`; @@ -166,52 +167,9 @@ `make install 2>/dev/null`; } -runone("player", "player", '\n'); -runone("recorder", "recorder", '\n'); -#runone("recorder8mb", "recorder", '8\n'); -runone("fmrecorder", "fmrecorder", '\n'); -#runone("fmrecorder8mb", "fmrecorder", '8\n'); -runone("recorderv2", "recorderv2", '\n'); -runone("ondiosp", "ondiosp", '\n'); -runone("ondiofm", "ondiofm", '\n'); -runone("h100", "h100"); -runone("h120", "h120"); -runone("h300", "h300"); -runone("ipodcolor", "ipodcolor"); -runone("ipodnano", "ipodnano"); -runone("ipod4gray", "ipod4g"); -runone("ipodvideo", "ipodvideo", '32\n'); -#runone("ipodvideo64mb", "ipodvideo", '64\n'); -runone("ipod3g", "ipod3g"); -runone("ipod1g2g", "ipod1g2g"); -runone("iaudiox5", "x5"); -runone("iaudiom5", "m5"); -runone("iaudiom3", "m3"); -runone("ipodmini1g", "ipodmini"); -runone("ipodmini2g", "ipodmini2g"); -runone("h10", "h10"); -runone("h10_5gb", "h10_5gb"); -runone("gigabeatf", "gigabeatf"); -runone("gigabeats", "gigabeats"); -runone("sansae200", "e200"); -runone("sansae200v2", "e200v2"); -runone("sansac200", "c200"); -runone("mrobe500", "mrobe500"); -runone("mrobe100", "mrobe100"); -runone("cowond2", "cowond2"); -runone("clip", "clip"); -runone("zvm30gb", "creativezvm30gb"); -runone("zvm60gb", "creativezvm60gb"); -runone("zenvision", "creativezenvision"); -runone("hdd1630", "hdd1630"); -runone("fuze", "fuze"); -runone("m200v4", "m200v4"); -runone("sa9200", "sa9200"); -runone("sansac200v2", "c200v2"); -runone("yh820", "yh_820"); -runone("yh920", "yh_920"); -runone("yh925", "yh_925"); -runone("ondavx747", "ondavx747"); -runone("ondavx747p", "ondavx747p"); -runone("ondavx777", "ondavx777"); -runone("ifp7xx", "ifp7xx"); +for my $b (keys %builds) { + next if ($builds{$b}{status} < 3); # only stable builds + next if ($builds{$b}{configname} < 3); # no memsize variants + + runone($b); +} Index: tools/release/manuals.pl =================================================================== --- tools/release/manuals.pl (revision 23734) +++ tools/release/manuals.pl (working copy) @@ -1,6 +1,7 @@ #!/usr/bin/perl -$version="3.4"; +require "../builds.pm"; +my $version = $publicrelease; my $verbose; if($ARGV[0] eq "-v") { @@ -16,7 +17,7 @@ # made once for all targets sub runone { - my ($dir, $conf, $nl)=@_; + my ($dir)=@_; my $a; if($doonly && ($doonly ne $dir)) { @@ -28,7 +29,7 @@ print "Build in buildm-$dir\n" if($verbose); # build the manual(s) - $a = buildit($dir, $conf, $nl); + $a = buildit($dir); chdir ".."; @@ -53,12 +54,11 @@ }; sub buildit { - my ($target, $confnum, $newl)=@_; + my ($target)=@_; `rm -rf * >/dev/null 2>&1`; - my $c = sprintf('printf "%s\n%sm\n" | ../tools/configure', - $confnum, $newl?'\n':''); + my $c = "../tools/configure --target=$target --type=m"; print "C: $c\n" if($verbose); `$c`; @@ -73,27 +73,8 @@ # run make in tools first to make sure they're up-to-date `(cd tools && make ) >/dev/null 2>&1`; -runone("player", "player", 1); -runone("recorder", "recorder", 1); -runone("fmrecorder", "fmrecorder", 1); -runone("recorderv2", "recorderv2", 1); -runone("ondiosp", "ondiosp", 1); -runone("ondiofm", "ondiofm", 1); -runone("h100", "h100"); -#runone("h120", 9); -runone("h300", "h300"); -runone("ipodcolor", "ipodcolor"); -runone("ipodnano", "ipodnano"); -runone("ipod4gray", "ipod4g"); -runone("ipodvideo", "ipodvideo", 1); -runone("ipod3g", "ipod3g"); -runone("ipod1g2g", "ipod1g2g"); -runone("iaudiox5", "x5"); -runone("iaudiom5", "m5"); -runone("ipodmini2g", "ipodmini2g"); -runone("h10", "h10"); -runone("h10_5gb", "h10_5gb"); -runone("gigabeatf", "gigabeatf"); -runone("sansae200", "e200"); -runone("sansac200", "c200"); -runone("mrobe100", "mrobe100"); +for my $b (&stablebuilds) { + next if ($builds{$b}{configname} < 3); # no variants + + runone($b); +} Index: tools/configure =================================================================== --- tools/configure (revision 23734) +++ tools/configure (working copy) @@ -315,16 +315,16 @@ if [ "$memory" = "2" ]; then printf ", (8)MB MOD" fi - if [ "$modelname" = "player" ]; then + if [ "$modelname" = "archosplayer" ]; then printf ", Use (A)TA poweroff" fi if [ "$t_model" = "ondio" ]; then printf ", (B)acklight MOD" fi - if [ "$modelname" = "m5" ]; then + if [ "$modelname" = "iaudiom5" ]; then printf ", (F)M radio MOD" fi - if [ "$modelname" = "h120" ]; then + if [ "$modelname" = "iriverh120" ]; then printf ", (R)TC MOD" fi echo "" @@ -375,7 +375,7 @@ fi ;; [Aa]) - if [ "$modelname" = "player" ]; then + if [ "$modelname" = "archosplayer" ]; then have_ata_poweroff="#define HAVE_ATA_POWEROFF" echo "ATA poweroff enabled" fi @@ -387,13 +387,13 @@ fi ;; [Ff]) - if [ "$modelname" = "m5" ]; then + if [ "$modelname" = "iaudiom5" ]; then have_fmradio_in="#define HAVE_FMRADIO_IN" echo "FM radio functions enabled" fi ;; [Rr]) - if [ "$modelname" = "h120" ]; then + if [ "$modelname" = "iriverh120" ]; then config_rtc="#define CONFIG_RTC RTC_DS1339_DS3231" have_rtc_alarm="#define HAVE_RTC_ALARM" echo "RTC functions enabled (DS1339/DS3231)" @@ -928,9 +928,9 @@ case $buildfor in - 0|player) + 0|archosplayer) target_id=1 - modelname="player" + modelname="archosplayer" target="-DARCHOS_PLAYER" shcc tool="$rootdir/tools/scramble" @@ -954,9 +954,9 @@ t_model="player" ;; - 1|recorder) + 1|archosrecorder) target_id=2 - modelname="recorder" + modelname="archosrecorder" target="-DARCHOS_RECORDER" shcc tool="$rootdir/tools/scramble" @@ -976,9 +976,9 @@ t_model="recorder" ;; - 2|fmrecorder) + 2|archosfmrecorder) target_id=3 - modelname="fmrecorder" + modelname="archosfmrecorder" target="-DARCHOS_FMRECORDER" shcc tool="$rootdir/tools/scramble -fm" @@ -998,9 +998,9 @@ t_model="fm_v2" ;; - 3|recorderv2) + 3|archosrecorderv2) target_id=4 - modelname="recorderv2" + modelname="archosrecorderv2" target="-DARCHOS_RECORDERV2" shcc tool="$rootdir/tools/scramble -v2" @@ -1020,9 +1020,9 @@ t_model="fm_v2" ;; - 4|ondiosp) + 4|archosondiosp) target_id=7 - modelname="ondiosp" + modelname="archosondiosp" target="-DARCHOS_ONDIOSP" shcc tool="$rootdir/tools/scramble -osp" @@ -1042,9 +1042,9 @@ t_model="ondio" ;; - 5|ondiofm) + 5|archosondiofm) target_id=8 - modelname="ondiofm" + modelname="archosondiofm" target="-DARCHOS_ONDIOFM" shcc tool="$rootdir/tools/scramble -ofm" @@ -1062,9 +1062,9 @@ t_model="ondio" ;; - 6|av300) + 6|archosav300) target_id=38 - modelname="av300" + modelname="archosav300" target="-DARCHOS_AV300" memory=16 # always arm7tdmicc @@ -1084,9 +1084,9 @@ t_model="av300" ;; - 10|h120) + 10|iriverh120) target_id=9 - modelname="h120" + modelname="iriverh120" target="-DIRIVER_H120" memory=32 # always coldfirecc @@ -1108,9 +1108,9 @@ t_model="h100" ;; - 11|h300) + 11|iriverh300) target_id=10 - modelname="h300" + modelname="iriverh300" target="-DIRIVER_H300" memory=32 # always coldfirecc @@ -1131,9 +1131,9 @@ t_model="h300" ;; - 12|h100) + 12|iriverh100) target_id=11 - modelname="h100" + modelname="iriverh100" target="-DIRIVER_H100" memory=16 # always coldfirecc @@ -1155,9 +1155,9 @@ t_model="h100" ;; - 13|ifp7xx) + 13|iriverifp7xx) target_id=19 - modelname="ifp7xx" + modelname="iriverifp7xx" target="-DIRIVER_IFP7XX" memory=1 arm7tdmicc short @@ -1176,9 +1176,9 @@ t_model="iriver-ifp7xx" ;; - 14|h10) + 14|iriverh10) target_id=22 - modelname="h10" + modelname="iriverh10" target="-DIRIVER_H10" memory=32 # always arm7tdmicc @@ -1200,9 +1200,9 @@ t_model="h10" ;; - 15|h10_5gb) + 15|iriverh10_5gb) target_id=24 - modelname="h10_5gb" + modelname="iriverh10_5gb" target="-DIRIVER_H10_5GB" memory=32 # always arm7tdmicc @@ -1247,9 +1247,9 @@ t_model="color" ;; - 21|ipodnano) + 21|ipodnano1g) target_id=14 - modelname="ipodnano" + modelname="ipodnano1g" target="-DIPOD_NANO" memory=32 # always arm7tdmicc @@ -1338,9 +1338,9 @@ t_model="4g" ;; - 25|ipodmini) + 25|ipodmini1g) target_id=18 - modelname="ipodmini" + modelname="ipodmini1g" target="-DIPOD_MINI" memory=32 # always arm7tdmicc @@ -1431,9 +1431,9 @@ t_model="ipodnano2g" ;; - 30|x5) + 30|iaudiox5) target_id=12 - modelname="x5" + modelname="iaudiox5" target="-DIAUDIO_X5" memory=16 # always coldfirecc @@ -1455,9 +1455,9 @@ t_model="x5" ;; - 31|m5) + 31|iaudiom5) target_id=28 - modelname="m5" + modelname="iaudiom5" target="-DIAUDIO_M5" memory=16 # always coldfirecc @@ -1524,9 +1524,9 @@ t_model="cowond2" ;; - 34|m3) + 34|iaudiom3) target_id=37 - modelname="m3" + modelname="iaudiom3" target="-DIAUDIO_M3" memory=16 # always coldfirecc @@ -1546,9 +1546,9 @@ t_model="m3" ;; - 40|gigabeatf) + 40|gigabeatfx) target_id=20 - modelname="gigabeatf" + modelname="gigabeatfx" target="-DGIGABEAT_F" memory=32 # always arm9tdmicc @@ -1664,9 +1664,9 @@ t_model="logikdax" ;; - 90|creativezvm30gb) + 90|zenvisionm30gb) target_id=35 - modelname="creativezvm30" + modelname="zenvisionm30gb" target="-DCREATIVE_ZVM" memory=64 arm926ejscc @@ -1687,9 +1687,9 @@ t_model="creative-zvm" ;; - 91|creativezvm60gb) + 91|zenvisionm60gb) target_id=40 - modelname="creativezvm60" + modelname="creativezvm60gb" target="-DCREATIVE_ZVM60GB" memory=64 arm926ejscc @@ -1710,9 +1710,9 @@ t_model="creative-zvm" ;; - 92|creativezenvision) + 92|zenvision) target_id=39 - modelname="creativezv" + modelname="zenvision" target="-DCREATIVE_ZV" memory=64 arm926ejscc @@ -1733,9 +1733,9 @@ t_model="creative-zvm" ;; - 50|e200) + 50|sansae200) target_id=23 - modelname="e200" + modelname="sansae200" target="-DSANSA_E200" memory=32 # supposedly arm7tdmicc @@ -1757,12 +1757,12 @@ t_model="sansa-e200" ;; - 51|e200r) + 51|sansae200r) # the e200R model is pretty much identical to the e200, it only has a # different option to the scramble tool when building a bootloader and # makes the bootloader output file name in all lower case. target_id=27 - modelname="e200r" + modelname="sansae200r" target="-DSANSA_E200" memory=32 # supposedly arm7tdmicc @@ -1784,9 +1784,9 @@ t_model="sansa-e200" ;; - 52|c200) + 52|sansac200) target_id=30 - modelname="c200" + modelname="sansac200" target="-DSANSA_C200" memory=32 # supposedly arm7tdmicc @@ -1808,9 +1808,9 @@ t_model="sansa-c200" ;; - 53|m200) + 53|sansam200) target_id=48 - modelname="m200" + modelname="sansam200" target="-DSANSA_M200" memory=1 # always arm946cc @@ -1832,9 +1832,9 @@ t_model="m200" ;; - 54|c100) + 54|sansac100) target_id=42 - modelname="c100" + modelname="sansac100" target="-DSANSA_C100" memory=2 arm946cc @@ -1856,9 +1856,9 @@ t_model="c100" ;; - 55|Clip|clip) + 55|sansaclip) target_id=50 - modelname="clip" + modelname="sansaclip" target="-DSANSA_CLIP" memory=2 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" @@ -1877,9 +1877,9 @@ ;; - 56|e200v2) + 56|sansae200v2) target_id=51 - modelname="e200v2" + modelname="sansae200v2" target="-DSANSA_E200V2" memory=8 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" @@ -1898,9 +1898,9 @@ ;; - 57|m200v4) + 57|sansam200v4) target_id=52 - modelname="m200v4" + modelname="sansam200v4" target="-DSANSA_M200V4" memory=2 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" @@ -1919,9 +1919,9 @@ ;; - 58|fuze) + 58|sansafuze) target_id=53 - modelname="fuze" + modelname="sansafuze" target="-DSANSA_FUZE" memory=8 bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" @@ -1940,9 +1940,9 @@ ;; - 59|c200v2) + 59|sansac200v2) target_id=55 - modelname="c200v2" + modelname="sansac200v2" target="-DSANSA_C200V2" memory=2 # as per OF diagnosis mode bmp2rb_mono="$rootdir/tools/bmp2rb -f 0" @@ -1963,11 +1963,11 @@ arm9tdmicc ;; - 60|Clipv2|clipv2) + 60|sansaclipv2) echo "Sansa Clipv2 is not yet supported !" exit 1 target_id=60 - modelname="clipv2" + modelname="sansaclipv2" target="-DSANSA_CLIPV2" memory=8 arm926ejscc @@ -1985,11 +1985,11 @@ t_model="sansa-clipv2" ;; - 61|view) + 61|sansaview) echo "Sansa View is not yet supported!" exit 1 target_id=63 - modelname="view" + modelname="sansaview" target="-DSANSA_VIEW" memory=32 arm1176jzscc @@ -2009,10 +2009,10 @@ t_model="sansa-view" ;; - 150|tpj1022) + 150|tatungtpj1022) target_id=25 - modelname="tpj1022" - target="-DELIO_TPJ1022" + modelname="tatungtpj1022" + target="-DTATUNG_TPJ1022" memory=32 # always arm7tdmicc tool="$rootdir/tools/scramble -add tpj2" @@ -2033,9 +2033,9 @@ t_model="tpj1022" ;; - 100|sa9200) + 100|gogearsa9200) target_id=41 - modelname="sa9200" + modelname="gogearsa9200" target="-DPHILIPS_SA9200" memory=32 # supposedly arm7tdmicc @@ -2057,9 +2057,9 @@ t_model="sa9200" ;; - 101|hdd1630) + 101|gogearhdd1630) target_id=43 - modelname="hdd1630" + modelname="gogearhdd1630" target="-DPHILIPS_HDD1630" memory=32 # supposedly arm7tdmicc @@ -2235,9 +2235,9 @@ t_model="onda_vx747" ;; - 130|lyre_proto1) + 130|lyreproto1) target_id=56 - modelname="lyre_proto1" + modelname="lyreproto1" target="-DLYRE_PROTO1" memory=64 arm926ejscc @@ -2257,9 +2257,9 @@ t_model="lyre_proto1" ;; - 140|yh820) + 140|samsungyh820) target_id=57 - modelname="yh820" + modelname="samsungyh820" target="-DSAMSUNG_YH820" memory=32 # always arm7tdmicc @@ -2281,9 +2281,9 @@ t_model="yh820" ;; - 141|yh920) + 141|samsungyh920) target_id=58 - modelname="yh920" + modelname="samsungyh920" target="-DSAMSUNG_YH920" memory=32 # always arm7tdmicc @@ -2305,9 +2305,9 @@ t_model="yh920" ;; - 142|yh925) + 142|samsungyh925) target_id=59 - modelname="yh925" + modelname="samsungyh925" target="-DSAMSUNG_YH925" memory=32 # always arm7tdmicc @@ -2329,9 +2329,9 @@ t_model="yh925" ;; - 143|yps3) + 143|samsungyps3) target_id=60 - modelname="yps3" + modelname="samsungyps3" target="-DSAMSUNG_YPS3" memory=16 # always arm940tbecc @@ -2415,13 +2415,13 @@ # the ifp7x0 is the only platform that supports building a gdb stub like # this case $modelname in - ifp7xx) + iriverifp7xx) gdbstub="(G)DB stub, " ;; - e200r|e200) + sansae200r|sansae200) gdbstub="(I)nstaller, " ;; - c200) + sansac200) gdbstub="(E)raser, " ;; *) @@ -2498,7 +2498,7 @@ appsdir='\$(ROOTDIR)/gdb' apps="stub" case $modelname in - ifp7xx) + iriverifp7xx) output="stub.wma" ;; *) @@ -2523,7 +2523,7 @@ echo "CheckWPS build selected" ;; *) - if [ "$modelname" = "e200r" ]; then + if [ "$modelname" = "sansae200r" ]; then echo "Do not use the e200R target for regular builds. Use e200 instead." exit 8 fi @@ -2535,17 +2535,17 @@ esac # to be able running "make manual" from non-manual configuration case $modelname in - fmrecorder) - manualdev="recorderv2fm" + archosfmrecorder) + manualdev="archosrecorderv2fm" ;; - recorderv2) - manualdev="recorderv2fm" + archosrecorderv2) + manualdev="archosrecorderv2fm" ;; - h1??) - manualdev="h100" + iriverh1??) + manualdev="iriverh100" ;; ipodmini2g) - manualdev="ipodmini" + manualdev="ipodmini1g" ;; *) manualdev=$modelname Index: tools/builds.pm =================================================================== --- tools/builds.pm (revision 0) +++ tools/builds.pm (revision 0) @@ -0,0 +1,313 @@ +$publicrelease="3.4"; +$releasedate="September 24, 2009"; +$releasenotes="/wiki/ReleaseNotes34"; + +%builds = ( + 'archosav300' => { + name => 'Archos AV300', + status => 1, # 3=stable, 2=unstable, 1=unusable + }, + 'archosfmrecorder' => { + name => 'Archos FM Recorder', + status => 3, + }, + 'archosondiofm' => { + name => 'Archos Ondio FM', + status => 3, + }, + 'archosondiosp' => { + name => 'Archos Ondio SP', + status => 3, + }, + 'archosplayer' => { + name => 'Archos Player/Studio', + status => 3, + }, + 'archosrecorder' => { + name => 'Archos Recorder v1', + status => 3, + }, + 'archosrecorderv2' => { + name => 'Archos Recorder v2', + status => 3, + }, + 'cowond2' => { + name => 'Cowon D2', + status => 2, + }, + 'gigabeatfx' => { + name => 'Toshiba Gigabeat F/X', + status => 3, + }, + 'gigabeats' => { + name => 'Toshiba Gigabeat S', + status => 2, + }, + 'gogearhdd1630' => { + name => 'Philips GoGear HDD1630', + status => 1, + }, + 'gogearsa9200' => { + name => 'Philips GoGear SA9200', + status => 1, + }, + 'iaudio7' => { + name => 'iAudio 7', + status => 1, + }, + 'iaudiom3' => { + name => 'iAudio M3', + status => 3, + }, + 'iaudiom5' => { + name => 'iAudio M5', + status => 3, + }, + 'iaudiox5' => { + name => 'iAudio X5', + status => 3, + }, + 'ipod1g2g' => { + name => 'iPod 1st and 2nd gen', + status => 3, + }, + 'ipod3g' => { + name => 'iPod 3rd gen', + status => 3, + }, + 'ipod4g' => { + name => 'iPod 4th gen Grayscale', + status => 3, + }, + 'ipodcolor' => { + name => 'iPod color/Photo', + status => 3, + }, + 'ipodmini1g' => { + name => 'iPod Mini 1st gen', + status => 3, + manual => 'ipodmini2g', + }, + 'ipodmini2g' => { + name => 'iPod Mini 2nd gen', + status => 3, + icon => 'ipodmini1g', + }, + 'ipodnano1g' => { + name => 'iPod Nano 1st gen', + status => 3, + }, + 'ipodnano2g' => { + name => 'iPod Nano 2nd gen', + status => 3, + }, + 'ipodvideo' => { + name => 'iPod Video 30GB', + status => 3, + }, + 'ipodvideo64mb' => { + name => 'iPod Video 60/80GB', + status => 3, + icon => 'ipodvideo', + manual => 'ipodvideo', + voice => 'ipodvideo', + configname => 'ipodvideo', + ram => 64 + }, + 'iriverh10' => { + name => 'iriver H10 20GB', + status => 3, + }, + 'iriverh10_5gb' => { + name => 'iriver H10 5GB', + status => 3, + manual => 'iriverh10', + }, + 'iriverh100' => { + name => 'iriver H100/115', + status => 3, + }, + 'iriverh120' => { + name => 'iriver H120/140', + status => 3, + icon => 'iriverh100', + manual => 'iriverh100', + }, + 'iriverh300' => { + name => 'iriver H320/340', + status => 3, + }, + 'iriverifp7xx' => { + name => 'iriver iFP-7xx', + status => 1, + }, + 'logikdax' => { + name => 'Logik DAX', + status => 1, + }, + 'lyreproto1' => { + name => 'Lyre Prototype 1', + status => 1, + }, + 'mini2440' => { + name => 'Mini 2440', + status => 1, + }, + 'meizum3' => { + name => 'Meizu M3', + status => 1, + }, + 'meizum6sl' => { + name => 'Meizu M6SL', + status => 1, + }, + 'meizum6sp' => { + name => 'Meizu M6SP', + status => 1, + }, + 'mrobe100' => { + name => 'Olympus M-Robe 100', + status => 3, + }, + 'mrobe500' => { + name => 'Olympus M-Robe 500', + status => 2, + }, + 'ondavx747' => { + name => 'Onda VX747', + status => 1, + }, + 'ondavx747p' => { + name => 'Onda VX747+', + status => 1, + }, + 'ondavx767' => { + name => 'Onda VX767', + status => 1, + }, + 'ondavx777' => { + name => 'Onda VX777', + status => 1, + }, + 'samsungyh820' => { + name => 'Samsung YH-820', + status => 2, + }, + 'samsungyh920' => { + name => 'Samsung YH-920', + status => 2, + }, + 'samsungyh925' => { + name => 'Samsung YH-925', + status => 2, + }, + 'samsungyps3' => { + name => 'Samsung YP-S3', + status => 1, + }, + 'sansac100' => { + name => 'SanDisk Sansa c100', + status => 1, + }, + 'sansac200' => { + name => 'SanDisk Sansa c200', + status => 3, + }, + 'sansac200v2' => { + name => 'SanDisk Sansa c200 v2', + status => 1, + icon => 'sansac200', + }, + 'sansaclip' => { + name => 'SanDisk Sansa Clip', + status => 2, + }, + 'sansaclipv2' => { + name => 'SanDisk Sansa Clip v2', + status => 1, + }, + 'sansae200' => { + name => 'SanDisk Sansa e200', + status => 3, + }, + 'sansae200r' => { + name => 'SanDisk Sansa e200R', + status => 3, + icon => 'sansae200', + }, + 'sansae200v2' => { + name => 'SanDisk Sansa e200 v2', + status => 3, + icon => 'sansae200', + }, + 'sansafuze' => { + name => 'SanDisk Sansa Fuze', + status => 2, + }, + 'sansam200' => { + name => 'SanDisk Sansa m200', + status => 1, + }, + 'sansam200v4' => { + name => 'SanDisk Sansa m200 v4', + status => 1, + }, + 'sansaview' => { + name => 'SanDisk Sansa View', + status => 1, + }, + 'tatungtpj1022' => { + name => 'Tatung Elio TPJ-1022', + status => 1, + }, + 'zenvision' => { + name => 'Creative Zen Vision', + status => 1, + }, + 'zenvisionm30gb' => { + name => 'Creative Zen Vision:M 30GB', + status => 1, + }, + 'zenvisionm60gb' => { + name => 'Creative Zen Vision:M 60GB', + status => 1, + }, +); + +sub manualname { + my $m = shift @_; + + return $builds{$m}{manual} ? "$builds{$m}{manual}" : $m; +} + +sub voicename { + my $m = shift @_; + + return $builds{$m}{voice} ? "$builds{$m}{voice}" : $m; +} + +sub byname { + return $builds{$a}{name} cmp $builds{$b}{name}; +} + +sub usablebuilds { + my @list; + + for my $b (sort byname keys %builds) { + push @list, $b if ($builds{$b}{status} >= 2); + } + + return @list; +} + +sub stablebuilds { + my @list; + + for my $b (sort byname keys %builds) { + push @list, $b if ($builds{$b}{status} >= 3); + } + + return @list; +} + +1; Index: tools/checkwps/targets.txt =================================================================== --- tools/checkwps/targets.txt (revision 23734) +++ tools/checkwps/targets.txt (working copy) @@ -1,39 +1,39 @@ -ARCHOS_RECORDER recorder -ARCHOS_FMRECORDER fmrecorder -ARCHOS_RECORDERV2 recorderv2 -ARCHOS_ONDIOSP ondiosp -ARCHOS_ONDIOFM ondiofm -IRIVER_H120 h120 -IRIVER_H300 h300 -IRIVER_H100 h100 -IRIVER_IFP7XX ifp7xx -IRIVER_H10 h10 -IRIVER_H10_5GB h10_5gb +ARCHOS_RECORDER archosrecorder +ARCHOS_FMRECORDER archosfmrecorder +ARCHOS_RECORDERV2 archosrecorderv2 +ARCHOS_ONDIOSP archosondiosp +ARCHOS_ONDIOFM archosondiofm +IRIVER_H120 iriverh120 +IRIVER_H300 iriverh300 +IRIVER_H100 iriverh100 +IRIVER_IFP7XX iriverifp7xx +IRIVER_H10 iriverh10 +IRIVER_H10_5GB iriverh10_5gb IPOD_COLOR ipodcolor -IPOD_NANO ipodnano +IPOD_NANO ipodnano1g IPOD_VIDEO ipodvideo IPOD_3G ipod3g IPOD_4G ipod4g -IPOD_MINI ipodmini +IPOD_MINI ipodmini1g IPOD_MINI2G ipodmini2g IPOD_1G2G ipod1g2g -IAUDIO_X5 x5 -IAUDIO_M5 m5 +IAUDIO_X5 iaudiox5 +IAUDIO_M5 iaudiom5 COWON_D2 cowond2 -IAUDIO_M3 m3 -GIGABEAT_F gigabeatf +IAUDIO_M3 iaudiom3 +GIGABEAT_F gigabeatfx GIGABEAT_S gigabeats MROBE_500 mrobe500 MROBE_100 mrobe100 LOGIK_DAX logikdax -CREATIVE_ZVM creativezvm30gb -CREATIVE_ZVM60GB creativezvm60gb -CREATIVE_ZV creativezenvision -SANSA_E200 e200 -SANSA_E200 e200r -SANSA_C200 c200 -SANSA_M200 m200 -SANSA_C100 c100 -ELIO_TPJ1022 tpj1022 +CREATIVE_ZVM zenvisionm30gb +CREATIVE_ZVM60GB zenvisionm60gb +CREATIVE_ZV zenvision +SANSA_E200 sansae200 +SANSA_E200 sansae200r +SANSA_C200 sansac200 +SANSA_M200 sansam200 +SANSA_C100 sansac100 +ELIO_TPJ1022 tatungtpj1022 ONDA_VX747 ondavx747 ONDA_VX777 ondavx777 Index: rbutil/ipodpatcher/ipodpatcher.c =================================================================== --- rbutil/ipodpatcher/ipodpatcher.c (revision 23734) +++ rbutil/ipodpatcher/ipodpatcher.c (working copy) @@ -37,10 +37,10 @@ #include "ipod1g2g.h" #include "ipod3g.h" #include "ipod4g.h" -#include "ipodmini.h" +#include "ipodmini1g.h" #include "ipodmini2g.h" #include "ipodcolor.h" -#include "ipodnano.h" +#include "ipodnano1g.h" #include "ipodvideo.h" #endif @@ -1224,7 +1224,7 @@ ipod->modelstr="1st Generation Nano"; ipod->modelnum = 4; ipod->modelname = "nano"; - ipod->targetname = "ipodnano"; + ipod->targetname = "ipodnano1g"; #ifdef WITH_BOOTOBJS ipod->bootloader = ipodnano; ipod->bootloader_len = LEN_ipodnano; Index: rbutil/ipodpatcher/Makefile =================================================================== --- rbutil/ipodpatcher/Makefile (revision 23734) +++ rbutil/ipodpatcher/Makefile (working copy) @@ -1,13 +1,13 @@ CFLAGS=-Wall -W -BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini.h ipodmini2g.h ipodnano.h ipodvideo.h +BOOT_H = ipod1g2g.h ipod3g.h ipod4g.h ipodcolor.h ipodmini1g.h ipodmini2g.h ipodnano1g.h ipodvideo.h # Uncomment the next two lines to build with embedded bootloaders and the # --install option and interactive mode. You need the full set of Rockbox # bootloaders in this directory - download them from # http://download.rockbox.org/bootloader/ipod/bootloaders.zip -#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini.c ipodmini2g.c ipodnano.c ipodvideo.c +#BOOTSRC = ipod1g2g.c ipod3g.c ipod4g.c ipodcolor.c ipodmini1g.c ipodmini2g.c ipodnano1g.c ipodvideo.c #CFLAGS += -DWITH_BOOTOBJS ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN) @@ -69,14 +69,14 @@ ipodcolor.c: bootloader-ipodcolor.ipod ipod2c ./ipod2c bootloader-ipodcolor.ipod ipodcolor -ipodmini.c: bootloader-ipodmini.ipod ipod2c - ./ipod2c bootloader-ipodmini.ipod ipodmini +ipodmini1g.c: bootloader-ipodmini1g.ipod ipod2c + ./ipod2c bootloader-ipodmini1g.ipod ipodmini1g ipodmini2g.c: bootloader-ipodmini2g.ipod ipod2c ./ipod2c bootloader-ipodmini2g.ipod ipodmini2g -ipodnano.c: bootloader-ipodnano.ipod ipod2c - ./ipod2c bootloader-ipodnano.ipod ipodnano +ipodnano1g.c: bootloader-ipodnano1g.ipod ipod2c + ./ipod2c bootloader-ipodnano1g.ipod ipodnano1g ipodvideo.c: bootloader-ipodvideo.ipod ipod2c ./ipod2c bootloader-ipodvideo.ipod ipodvideo Index: rbutil/rbutilqt/rbutil.ini =================================================================== --- rbutil/rbutilqt/rbutil.ini (revision 23734) +++ rbutil/rbutilqt/rbutil.ini (working copy) @@ -16,20 +16,20 @@ rbutil_url=http://download.rockbox.org/rbutil/ [platforms] -platform01=player -platform02=recorder -platform03=recorder8mb -platform04=recorderv2 -platform05=fmrecorder -platform06=fmrecorder8mb -platform07=ondiosp -platform08=ondiofm -platform10=h100 -platform11=h120 -platform12=h300 -platform13=h10_5gbums -platform14=h10_5gbmtp -platform15=h10 +platform01=archosplayer +platform02=archosrecorder +platform03=archosrecorder8mb +platform04=archosrecorderv2 +platform05=archosfmrecorder +platform06=archosfmrecorder8mb +platform07=archosondiosp +platform08=archosondiofm +platform10=iriverh100 +platform11=iriverh120 +platform12=iriverh300 +platform13=iriverh10_5gbums +platform14=iriverh10_5gbmtp +platform15=iriverh10 platform20=ipod1g2g platform21=ipod3g platform22=ipod4gray @@ -38,12 +38,12 @@ platform25=ipodvideo64mb platform26=ipodmini1g platform27=ipodmini2g -platform28=ipodnano +platform28=ipodnano1g platform30=iaudiox5 platform31=iaudiom5 platform32=iaudiox5v platform33=iaudiom3 -platform40=gigabeatf +platform40=gigabeatfx platform44=ondavx747 platform45=ondavx747p platform46=ondavx777 @@ -54,154 +54,154 @@ platform54=sansam200v4 platform55=sansaclip platform60=mrobe100 -platform70=smsgyh820 -platform71=smsgyh920 -platform72=smsgyh925 +platform70=samsungyh820 +platform71=samsungyh920 +platform72=samsungyh925 -[player] +[archosplayer] name="Jukebox Player 6000 / Jukebox Studio 5 / 10 / 20" -buildserver_modelname=player +buildserver_modelname=archosplayer bootloadermethod=none bootloadername= manualname= brand=Archos -configure_modelname=player +configure_modelname=archosplayer encoder=lame -[recorder] +[archosrecorder] name="Jukebox Recorder 6 / 10 / 15 / 20" -buildserver_modelname=recorder +buildserver_modelname=archosrecorder bootloadermethod=none bootloadername= manualname= brand=Archos -configure_modelname=recorder +configure_modelname=archosrecorder encoder=lame -[recorder8mb] +[archosrecorder8mb] name="Jukebox Recorder 6 / 10 / 15 / 20 (with 8MiB memory)" -buildserver_modelname=recorder8mb +buildserver_modelname=archosrecorder8mb bootloadermethod=none bootloadername= -manualname=rockbox-recorder +manualname=rockbox-archosrecorder brand=Archos -configure_modelname=recorder +configure_modelname=archosrecorder encoder=lame -[recorderv2] +[archosrecorderv2] name="Jukebox Recorder v2 (20GB)" -buildserver_modelname=recorderv2 +buildserver_modelname=archosrecorderv2 bootloadermethod=none bootloadername= manualname= brand=Archos -configure_modelname=recorderv2 +configure_modelname=archosrecorderv2 encoder=lame -[fmrecorder] +[archosfmrecorder] name="Jukebox Recorder FM" -buildserver_modelname=fmrecorder +buildserver_modelname=archosfmrecorder bootloadermethod=none bootloadername= manualname= brand=Archos -configure_modelname=fmrecorder +configure_modelname=archosfmrecorder encoder=lame -[fmrecorder8mb] +[archosfmrecorder8mb] name="Jukebox Recorder FM (with 8MiB memory)" -buildserver_modelname=fmrecorder8mb +buildserver_modelname=archosfmrecorder8mb bootloadermethod=none bootloadername= -manualname=rockbox-fmrecorder +manualname=rockbox-archosfmrecorder brand=Archos -configure_modelname=fmrecorder +configure_modelname=archosfmrecorder encoder=lame -[ondiosp] +[iriverondiosp] name="Ondio SP" -buildserver_modelname=ondiosp +buildserver_modelname=archosondiosp bootloadermethod=none bootloadername= manualname= brand=Archos -configure_modelname=ondiosp +configure_modelname=archosondiosp encoder=lame -[ondiofm] +[iriverondiofm] name="Ondio FM" -buildserver_modelname=ondiofm +buildserver_modelname=archosondiofm bootloadermethod=none bootloadername= manualname= brand=Archos -configure_modelname=ondiofm +configure_modelname=archosondiofm encoder=lame -[h100] +[iriverh100] name="iHP100 / iHP110" -buildserver_modelname=h100 +buildserver_modelname=iriverh100 bootloadermethod=hex bootloadername=/iriver/bootloader-h100.bin bootloaderfile=/ihp_100.hex -manualname=rockbox-h100 +manualname=rockbox-iriverh100 brand=Iriver usbid=0x10063001 -configure_modelname=h100 +configure_modelname=iriverh100 encoder=rbspeex -[h120] +[iriverh120] name="iHP120 / iHP140 / H120 / H140" -buildserver_modelname=h120 +buildserver_modelname=iriverh120 bootloadermethod=hex bootloadername=/iriver/bootloader-h120.bin bootloaderfile=/ihp_120.hex -manualname=rockbox-h100 +manualname=rockbox-iriverh100 brand=Iriver usbid=0x10063002 -configure_modelname=h120 +configure_modelname=iriverh120 encoder=rbspeex -[h300] +[iriverh300] name="H320 / H340" -buildserver_modelname=h300 +buildserver_modelname=iriverh300 bootloadermethod=hex bootloadername=/iriver/bootloader-h300.bin bootloaderfile=/H300.hex -manualname=rockbox-h300 +manualname=rockbox-iriverh300 brand=Iriver usbid=0x10063003 -configure_modelname=h300 +configure_modelname=iriverh300 encoder=rbspeex -[h10_5gbums] +[iriverh10_5gbums] name="H10 (5 / 6GB) UMS" -buildserver_modelname=h10_5gb +buildserver_modelname=iriverh10_5gb bootloadermethod=mi4 bootloadername=/iriver/H10.mi4 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4 manualname= brand=Iriver usbid=0x41022002 -configure_modelname=h10_5gb +configure_modelname=iriverh10_5gb encoder=rbspeex -[h10_5gbmtp] +[iriverh10_5gbmtp] name="H10 (5 / 6GB) MTP" -buildserver_modelname=h10_5gb +buildserver_modelname=iriverh10_5gb bootloadermethod=mi4 bootloadername=/iriver/H10_5GB-MTP/H10.mi4 bootloaderfile=/System/H10.mi4, /System/H10EMP.mi4 manualname= brand=Iriver usbid=0x41022105 -configure_modelname=h10_5gb +configure_modelname=iriverh10_5gb encoder=rbspeex -[h10] +[iriverh10] name="H10 (20GB)" -buildserver_modelname=h10 +buildserver_modelname=iriverh10 bootloadermethod=mi4 bootloadername=/iriver/H10_20GC.mi4 bootloaderfile=/System/H10_20GC.mi4 @@ -209,7 +209,7 @@ brand=Iriver usbid=0x0b7000ba usberror=0x41022101 -configure_modelname=h10 +configure_modelname=iriverh10 encoder=rbspeex [ipod1g2g] @@ -232,14 +232,14 @@ configure_modelname=ipodcolor encoder=rbspeex -[ipodnano] +[ipodnano1g] name="Ipod Nano (1st gen)" -buildserver_modelname=ipodnano +buildserver_modelname=ipodnano1g bootloadermethod=ipod bootloadername=/ipod/bootloader-ipodnano.ipod manualname= brand=Apple -configure_modelname=ipodnano +configure_modelname=ipodnano1g encoder=rbspeex [ipod4gray] @@ -312,7 +312,7 @@ manualname= brand=Cowon usbid=0x0e210510, 0x0e210513 -configure_modelname=x5 +configure_modelname=iaudiox5 encoder=rbspeex [iaudiox5v] @@ -323,7 +323,7 @@ bootloaderfile=/FIRMWARE/x5v_fw.bin manualname= brand=Cowon -configure_modelname=x5 +configure_modelname=iaudiox5 encoder=rbspeex [iaudiom5] @@ -335,7 +335,7 @@ manualname= brand=Cowon usbid=0x0e210520 -configure_modelname=m5 +configure_modelname=iaudiom5 encoder=rbspeex [iaudiom3] @@ -347,19 +347,19 @@ manualname= brand=Cowon usbid=0x0e210500 -configure_modelname=m3 +configure_modelname=iaudiom3 encoder=rbspeex -[gigabeatf] +[gigabeatfx] name="Gigabeat F / X" -buildserver_modelname=gigabeatf +buildserver_modelname=gigabeatfx bootloadermethod=file bootloadername=/gigabeat/FWIMG01.DAT bootloaderfile=/GBSYSTEM/FWIMG/FWIMG01.DAT manualname= brand=Toshiba usbid=0x09300009 -configure_modelname=gigabeatf +configure_modelname=gigabeatfx encoder=rbspeex [sansae200] @@ -371,7 +371,7 @@ brand=Sandisk usbid=0x07817421 usberror=0x07810720 -configure_modelname=e200 +configure_modelname=sansae200 encoder=rbspeex [sansac200] @@ -382,7 +382,7 @@ manualname= brand=Sandisk usbid=0x07817450, 0x07817451 -configure_modelname=c200 +configure_modelname=sansac200 encoder=rbspeex [sansae200v2] @@ -395,7 +395,7 @@ brand=Sandisk usbid=0x07817423 usberror=0x07817422 -configure_modelname=e200v2 +configure_modelname=sansae200v2 encoder=rbspeex [sansafuze] @@ -408,7 +408,7 @@ brand=Sandisk usbid=0x078174c1 usberror=0x078174c0 -configure_modelname=fuze +configure_modelname=sansafuze encoder=rbspeex [sansam200v4] @@ -421,7 +421,7 @@ brand=Sandisk usbid= usberror= -configure_modelname=m200v4 +configure_modelname=sansam200v4 encoder=rbspeex status=disabled @@ -435,7 +435,7 @@ brand=Sandisk usbid=0x07817433 usberror=0x07817432 -configure_modelname=clip +configure_modelname=sansaclip encoder=rbspeex status=disabled @@ -490,42 +490,42 @@ encoder=rbspeex status=disabled -[smsgyh820] +[samsungyh820] name="YH-820" -buildserver_modelname=yh820 +buildserver_modelname=samsungyh820 bootloadermethod=mi4 bootloadername=/samsung/FW_YH820.mi4 bootloaderfile=/SYSTEM/FW_YH820.mi4 manualname= brand=Samsung usbid=0x04e85023 -configure_modelname=yh820 +configure_modelname=samsungyh820 encoder=rbspeex status=disabled -[smsgyh920] +[samsungyh920] name="YH-920" -buildserver_modelname=yh920 +buildserver_modelname=samsungyh920 bootloadermethod=mi4 bootloadername=/samsung/PP5020.mi4 bootloaderfile=/SYSTEM/FW_YH920.mi4, /SYSTEM/PP5020.mi4 manualname= brand=Samsung usbid=0x04e85022, 0x04e8501d -configure_modelname=yh920 +configure_modelname=samsungyh920 encoder=rbspeex status=disabled -[smsgyh925] +[samsungyh925] name="YH-925" -buildserver_modelname=yh925 +buildserver_modelname=samsungyh925 bootloadermethod=mi4 bootloadername=/samsung/FW_YH925.mi4 bootloaderfile=/SYSTEM/FW_YH925.mi4 manualname= brand=Samsung usbid=0x04e85024 -configure_modelname=yh925 +configure_modelname=samsungyh925 encoder=rbspeex status=disabled Index: apps/lang/afrikaans.lang =================================================================== --- apps/lang/afrikaans.lang (revision 23734) +++ apps/lang/afrikaans.lang (working copy) @@ -970,7 +970,7 @@ id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB user: core *: "Buf: %d.%02dMB" @@ -984,7 +984,7 @@ id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB + desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB user: core *: "Buffer: %d.%02dMB" Index: apps/lang/deutsch.lang =================================================================== --- apps/lang/deutsch.lang (revision 23734) +++ apps/lang/deutsch.lang (working copy) @@ -280,16 +280,16 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Ja" cowond2*: "MENU = Ja" - h100,h120,h300: "NAVI = Ja" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Ja" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Ja" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Ja" + archosplayer: "(PLAY/STOP)" *: "" @@ -301,15 +301,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Andere = Nein" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2385,19 +2385,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Erstelle Datenbank... %d gefunden (OFF zum Abbrechen)" - h100,h120,h300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)" + iriverh100,iriverh120,iriverh300: "Erstelle Datenbank... %d gefunden (STOP zum Abbrechen)" ipod*: "Erstelle Datenbank... %d gefunden (PLAY/PAUSE zum Abbrechen)" - x5,m5,gigabeat*,mrobe100: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)" - h10,h10_5gb,e200*,c200*,fuze*: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)" - sa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Erstelle Datenbank... %d gefunden (LEFT zum Abbrechen)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Erstelle Datenbank... %d gefunden (PREV zum Abbrechen)" + gogearsa9200: "Erstelle Datenbank... %d gefunden (REW zum Abbrechen)" *: "Erstelle Datenbank" @@ -3197,7 +3197,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3211,7 +3211,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3225,7 +3225,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3857,17 +3857,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Tastenbeleuchtungsdauer" - fuze*,e200*: "Scrollradbeleuchtungsdauer" + sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer" *: none button_light: "Tastenbeleuchtungsdauer" - fuze*,e200*: "Scrollradbeleuchtungsdauer" + sansafuze*,sansae200*: "Scrollradbeleuchtungsdauer" @@ -4151,21 +4151,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Speichern" mrobe500: "HEART = Speichern" - h100,h120,h300: "NAVI = Speichern" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Speichern" - sa9200: "PLAY = Speichern" + iriverh100,iriverh120,iriverh300: "NAVI = Speichern" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Speichern" + gogearsa9200: "PLAY = Speichern" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4176,30 +4176,30 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Abbrechen" - h100,h120,h300: "STOP = Abbrechen" - ipod*,c200*: "MENU = Abbrechen" - x5,m5: "RECORD = Abbrechen" - h10,h10_5gb,e200*,fuze*: "PREV = Abbrechen" - gigabeatf: "POWER = Abbrechen" + iriverh100,iriverh120,iriverh300: "STOP = Abbrechen" + ipod*,sansac200*: "MENU = Abbrechen" + iaudiox5,iaudiom5: "RECORD = Abbrechen" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Abbrechen" + gigabeatfx: "POWER = Abbrechen" mrobe100: "DISPLAY = Abbrechen" gigabeats: "BACK = Abbrechen" - sa9200: "LEFT = Abbrechen" + gogearsa9200: "LEFT = Abbrechen" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,h10_gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4722,14 +4722,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=OK OFF=Abbruch" ipod*: "SELECT=OK MENU=Abbruch" - h10,h10_5gb: "SELECT=OK PREV=Abbruch" + iriverh10,iriverh10_5gb: "SELECT=OK PREV=Abbruch" gigabeats: "SELECT=OK POWER=Abbruch" @@ -5904,17 +5904,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofon" - h100,h120,h300: "Internes Mikrofon" + iriverh100,iriverh120,iriverh300: "Internes Mikrofon" *: none recording: "Mikrofon" - h100,h120,h300: "Internes Mikrofon" + iriverh100,iriverh120,iriverh300: "Internes Mikrofon" @@ -5940,15 +5940,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Analogeingang" + recording,archosplayer: "Analogeingang" @@ -6878,11 +6878,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Puffer:" - player: "Puf:" + archosplayer: "Puf:" *: "Puffergröße" @@ -6894,13 +6894,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batterie: %d%% %d Std %d Min" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batterieladung" @@ -6958,19 +6958,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "Festplatte" - e200*,c200*,fuze*: "Micro-SD-Karte" + sansae200*,sansac200*,sansafuze*: "Micro-SD-Karte" ondio*: "Multimediakarte" @@ -8082,11 +8082,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Wiedergabeliste zu Ende" - player: "Liste zu Ende" + archosplayer: "Liste zu Ende" *: "Wiedergabeliste zu Ende" @@ -8329,16 +8329,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Kein Speicherplatz mehr vorhanden. Drücke OFF zum fortfahren." - h100,h120,h300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren." - m5,x5: "Kein Speicherplatz mehr vorhanden. Drücke POWER zum fortfahren." - e200*,c200*: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren." + iriverh100,iriverh120,iriverh300: "Kein Speicherplatz mehr vorhanden. Drücke STOP zum fortfahren." + iaudiom5,iaudiox5: "Kein Speicherplatz mehr vorhanden. Drücke POWER zum fortfahren." + sansae200*,sansac200*: "Kein Speicherplatz mehr vorhanden. Drücke PREV zum fortfahren." *: none @@ -8426,25 +8426,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF zum Abbrechen" - player,h100,h120,h300: "STOP zum Abbrechen" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP zum Abbrechen" ipod*: "PLAY/PAUSE zum Abbrechen" - x5,m5: "Long PLAY zum Abbrechen" - h10,h10_5gb,e200*,c200*: "PREV zum Abbrechen" + iaudiox5,iaudiom5: "Long PLAY zum Abbrechen" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV zum Abbrechen" gigabeats: "BACK zum Abbrechen" - gigabeatf: "POWER zum Abbrechen" + gigabeatfx: "POWER zum Abbrechen" *: "" @@ -8668,19 +8668,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Akku: Übergangsladen" + archosrecorder: "Akku: Übergangsladen" *: none - recorder: "Übergangsladen" + archosrecorder: "Übergangsladen" @@ -11607,15 +11607,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Touchpad-Empfindlichkeit" + gigabeatfx: "Touchpad-Empfindlichkeit" *: none - gigabeatf: "Touchpad-Empfindlichkeit" + gigabeatfx: "Touchpad-Empfindlichkeit" @@ -11781,15 +11781,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Hoch" + gigabeatfx: "Hoch" *: none - gigabeatf: "Hoch" + gigabeatfx: "Hoch" Index: apps/lang/dansk.lang =================================================================== --- apps/lang/dansk.lang (revision 23734) +++ apps/lang/dansk.lang (working copy) @@ -1832,15 +1832,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Linje indgang" + recording,archosplayer: "Linje indgang" *: none - recording,player: "Linje indgang" + recording,archosplayer: "Linje indgang" @@ -2086,17 +2086,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" @@ -2781,7 +2781,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -2795,7 +2795,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -2809,7 +2809,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3640,19 +3640,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batteri: Fyld ladning" + archosrecorder: "Batteri: Fyld ladning" *: none - recorder: "Batteri fyld-lader" + archosrecorder: "Batteri fyld-lader" @@ -3678,18 +3678,18 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batteri: %d%% %dt %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dt %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dt %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dt %dm" *: "Batteri niveau" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "" - h10,ipodmini,ipodmini2g: "" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "" + iriverh10,ipodmini1g,ipodmini2g: "" @@ -3744,19 +3744,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "Hard disk 1" - e200*,c200*,fuze*: "Mikro SD kort" + sansae200*,sansac200*,sansafuze*: "Mikro SD kort" ondio*: "Multimedie kort" @@ -3889,27 +3889,27 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "SLUK = Fortryd" mrobe500: "TÆND/SLUK = Fortryd" - h100,h120,h300: "STOP = Fortryd" - ipod*,c200*: "MENU = Fortryd" - x5,m5: "OPTAG = Fortryd" - h10,h10_5gb,e200*,fuze*: "FORRIGE = Fortryd" - gigabeatf: "TÆND/SLUK = Fortryd" + iriverh100,iriverh120,iriverh300: "STOP = Fortryd" + ipod*,sansac200*: "MENU = Fortryd" + iaudiox5,iaudiom5: "OPTAG = Fortryd" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FORRIGE = Fortryd" + gigabeatfx: "TÆND/SLUK = Fortryd" mrobe100: "VIS = Fortryd" gigabeats: "TILBAGE = Fortryd" - sa9200: "VENSTRE = Fortryd" + gogearsa9200: "VENSTRE = Fortryd" *: none @@ -3990,23 +3990,23 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disken er fuld. Tryk SLUK for at fortsætte." - h100,h120,h300: "Disken er fuld. Tryk STOP for at fortsætte." - m5,x5: "Disken er fuld. Tryk TÆND/SLUK for at fortsætte." - e200*,c200*: "Disken er fuld. Tryk FORRIGE for at fortsætte." + iriverh100,iriverh120,iriverh300: "Disken er fuld. Tryk STOP for at fortsætte." + iaudiom5,iaudiox5: "Disken er fuld. Tryk TÆND/SLUK for at fortsætte." + sansae200*,sansac200*: "Disken er fuld. Tryk FORRIGE for at fortsætte." *: none recording: "" - h100,h120,h300: "" - m5,x5: "" - e200*,c200*: "" + iriverh100,iriverh120,iriverh300: "" + iaudiom5,iaudiox5: "" + sansae200*,sansac200*: "" @@ -4170,21 +4170,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "SPIL=Sæt SLUK=Annuller" ipod*: "VÆLG=Sæt MENU=Annuller" - h10,h10_5gb: "VÆLG=Sæt FORRIGE=Annuller" + iriverh10,iriverh10_5gb: "VÆLG=Sæt FORRIGE=Annuller" gigabeats: "VÆLG=Sæt TÆND/SLUK=Annuller" *: none alarm: "" ipod*: "" - h10,h10_5gb: "" + iriverh10,iriverh10_5gb: "" gigabeats: "" @@ -6606,25 +6606,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "SLUK for at afbryde" - player,h100,h120,h300: "STOP for at afbryde" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP for at afbryde" ipod*: "SPIL/PAUSE for at afbryde" - x5,m5: "Lang SPIL for at afbryde" - h10,h10_5gb,e200*,c200*: "FORRIGE for at afbryde" + iaudiox5,iaudiom5: "Lang SPIL for at afbryde" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "FORRIGE for at afbryde" gigabeats: "TILBAGE for at afbryde" - gigabeatf: "TÆND/SLUK for at afbryde" + gigabeatfx: "TÆND/SLUK for at afbryde" *: "" @@ -8741,7 +8741,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -9316,26 +9316,26 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Bygger database... %d fundet (SLUK for at stoppe)" - h100,h120,h300: "Bygger database... %d fundet (STOP for at stoppe)" + iriverh100,iriverh120,iriverh300: "Bygger database... %d fundet (STOP for at stoppe)" ipod*: "Bygger database... %d fundet (FORRIGE for at stoppe)" - x5,m5,gigabeat*,mrobe100: "Bygger database... %d fundet (VENSTRE for at stoppe)" - h10,h10_5gb,e200*,c200*,fuze*: "Bygger database... %d fundet (FORRIGE for at stoppe)" - sa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bygger database... %d fundet (VENSTRE for at stoppe)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Bygger database... %d fundet (FORRIGE for at stoppe)" + gogearsa9200: "Bygger database... %d fundet (SPOL TILBAGE for at stoppe)" *: "filer fundet til databasen" - h100,h120,h300: "" + iriverh100,iriverh120,iriverh300: "" ipod*: "" - x5,m5,gigabeat*,mrobe100: "" - h10,h10_5gb,e200*,c200*,sa9200: "" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "" @@ -9931,17 +9931,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Knap-lys sluk" - fuze*,e200*: "Hjul-lys sluk" + sansafuze*,sansae200*: "Hjul-lys sluk" *: none button_light: "Knap-lys sluk" - fuze*,e200*: "Hjul-lys sluk" + sansafuze*,sansae200*: "Hjul-lys sluk" @@ -10507,11 +10507,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer størrelse" @@ -10555,16 +10555,16 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "SPIL = Ja" cowond2*: "MENU = Ja" - h100,h120,h300: "NAVI = Ja" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "VÆLG = Ja" - player: "(SPIL/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Ja" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÆLG = Ja" + archosplayer: "(SPIL/STOP)" *: "" @@ -10578,17 +10578,17 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "Tænd = Indstil" mrobe500: "HJERTE = Indstil" - h100,h120,h300: "NAVI = Indstil" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "VÆLG = Indstil" - sa9200: "SPIL = Indstil" + iriverh100,iriverh120,iriverh300: "NAVI = Indstil" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "VÆLG = Indstil" + gogearsa9200: "SPIL = Indstil" *: none @@ -10600,15 +10600,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Alle andre = Nej" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -10690,11 +10690,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Slut på sætliste" - player: "Liste slut" + archosplayer: "Liste slut" *: "Slut på sætliste" @@ -11596,15 +11596,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Touchpad følsomhed" + gigabeatfx: "Touchpad følsomhed" *: none - gigabeatf: "Touchpad følsomhed" + gigabeatfx: "Touchpad følsomhed" @@ -11731,15 +11731,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Høj" + gigabeatfx: "Høj" *: none - gigabeatf: "Høj" + gigabeatfx: "Høj" Index: apps/lang/polski.lang =================================================================== --- apps/lang/polski.lang (revision 23734) +++ apps/lang/polski.lang (working copy) @@ -269,17 +269,17 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Tak" covond2*: "MENU = Tak" - h100,h120,h300: "NAVI = Tak" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Tak" + iriverh100,iriverh120,iriverh300: "NAVI = Tak" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Tak" mrobe500: "PLAY lub POWER = Tak" - player: "(PLAY/STOP)" + archosplayer: "(PLAY/STOP)" *: "" @@ -291,15 +291,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Każdy inny = Nie" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2392,19 +2392,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Budowanie biblioteki... %d znalezionych (OFF żeby wrócić)" - h100,h120,h300: "Budowanie biblioteki... %d znalezionych (STOP żeby wrócić)" + iriverh100,iriverh120,iriverh300: "Budowanie biblioteki... %d znalezionych (STOP żeby wrócić)" ipod*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)" - x5,m5,gigabeat*,mrobe100: "Budowanie biblioteki... %d znalezionych (LEFT żeby wrócić)" - h10,h10_5gb,e200*,c200*,fuze*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)" - sa9200: "Budowanie biblioteki... %d znalezionych (REW żeby wrócić)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Budowanie biblioteki... %d znalezionych (LEFT żeby wrócić)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Budowanie biblioteki... %d znalezionych (PREV żeby wrócić)" + gogearsa9200: "Budowanie biblioteki... %d znalezionych (REW żeby wrócić)" *: "Znaleziono wpisy do biblioteki" @@ -3204,7 +3204,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3218,7 +3218,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3232,7 +3232,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3864,17 +3864,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Wygaszanie klawiszy" - fuze*,e200*: "Wygaszanie koła sterującego" + sansafuze*,sansae200*: "Wygaszanie koła sterującego" *: none button_light: "Wygaszanie klawiszy" - fuze*,e200*: "Wygaszanie koła sterującego" + sansafuze*,sansae200*: "Wygaszanie koła sterującego" @@ -4156,21 +4156,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Ustaw" mrobe500: "HEART = Ustaw" - h100,h120,h300: "NAVI = Ustaw" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Ustaw" - sa9200:"PLAY = Ustaw" + iriverh100,iriverh120,iriverh300: "NAVI = Ustaw" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Ustaw" + gogearsa9200:"PLAY = Ustaw" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4181,31 +4181,31 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Przywróć" mrobe500: "POWER = Przywróć" - h100,h120,h300: "STOP = Przywróć" - ipod*,c200*: "MENU = Przywróć" - x5,m5: "RECORD = Przywróć" - h10,h10_5gb,e200*,fuze*: "PREV = Przywróć" - gigabeatf: "POWER = Przywróć" + iriverh100,iriverh120,iriverh300: "STOP = Przywróć" + ipod*,sansac200*: "MENU = Przywróć" + iaudiox5,iaudiom5: "RECORD = Przywróć" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Przywróć" + gigabeatfx: "POWER = Przywróć" mrobe100: "DISPLAY = Przywróć" gigabeats: "BACK = Przywróć" - sa9200: "LEFT = Przywróć" + gogearsa9200: "LEFT = Przywróć" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4728,21 +4728,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Ustaw OFF=Anuluj" ipod*: "WYBIERZ=Ustaw MENU=Anuluj" - h10,h10_5gb: "WYBIERZ=Ustaw COFNIJ=Anuluj" + iriverh10,iriverh10_5gb: "WYBIERZ=Ustaw COFNIJ=Anuluj" gigabeats: "WYBIERZ=Ustaw POWER=Anuluj" *: none alarm: "" ipod*: "" - h10,h10_5gb: "" + iriverh10,iriverh10_5gb: "" gigabeats: "" @@ -5913,17 +5913,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofon" - h100,h120,h300: "Wewnętrzny mikrofon" + iriverh100,iriverh120,iriverh300: "Wewnętrzny mikrofon" *: none recording: "Mikrofon" - h100,h120,h300: "Wewnętrzny mikrofon" + iriverh100,iriverh120,iriverh300: "Wewnętrzny mikrofon" @@ -5949,15 +5949,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Wejście liniowe" + recording,archosplayer: "Wejście liniowe" *: none - recording,player: "Wejście liniowe" + recording,archosplayer: "Wejście liniowe" @@ -6887,11 +6887,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Bufor:" - player: "Bufor:" + archosplayer: "Bufor:" *: "Rozmiar bufora" @@ -6903,13 +6903,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Bateria: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Bateria: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Bateria: %d%% %dh %dm" *: "Poziom baterii" @@ -6967,19 +6967,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "microSD:" + sansae200*,sansac200*,sansafuze*: "microSD:" ondio*: "MMC:" *: none multivolume: "ha de 1" - e200*,c200*,fuze*: "mikro es di" + sansae200*,sansac200*,sansafuze*: "mikro es di" ondio*: "em em ce" @@ -8091,15 +8091,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Koniec listy piosenek" - player: "Koniec listy" + archosplayer: "Koniec listy" *: "Koniec listy piosenek" - player: "Koniec listy" + archosplayer: "Koniec listy" @@ -8339,16 +8339,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Pamięć jest pełna. Wciśnij OFF żeby kontynuować." - h100,h120,h300: "Pamięć jest pełna. Wciśnij STOP żeby kontynuować." - m5,x5: "Pamięć jest pełna. Wciśnij POWER żeby kontynuować." - e200*,c200*: "Pamięć jest pełna. Wciśnij PREV żeby kontynuować." + iriverh100,iriverh120,iriverh300: "Pamięć jest pełna. Wciśnij STOP żeby kontynuować." + iaudiom5,iaudiox5: "Pamięć jest pełna. Wciśnij POWER żeby kontynuować." + sansae200*,sansac200*: "Pamięć jest pełna. Wciśnij PREV żeby kontynuować." *: none @@ -8435,25 +8435,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF = Anuluj" - player,h100,h120,h300: "STOP = Anuluj" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP = Anuluj" ipod*: "PLAY/PAUSE = Anuluj" - x5,m5: "Przytrzymaj PLAY = Anuluj" - h10,h10_5gb,e200*,c200*: "PREV = Anuluj" + iaudiox5,iaudiom5: "Przytrzymaj PLAY = Anuluj" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV = Anuluj" gigabeats: "BACK = Anuluj" - gigabeatf: "POWER = Anuluj" + gigabeatfx: "POWER = Anuluj" *: "" @@ -8677,19 +8677,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Bateria: doładowywanie" + archosrecorder: "Bateria: doładowywanie" *: none - recorder: "Doładowywanie baterii" + archosrecorder: "Doładowywanie baterii" @@ -10506,7 +10506,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11717,15 +11717,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Czułość panelu dotykowego" + gigabeatfx: "Czułość panelu dotykowego" *: none - gigabeatf: "Czułość panelu dotykowego" + gigabeatfx: "Czułość panelu dotykowego" @@ -11734,15 +11734,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Wysoka" + gigabeatfx: "Wysoka" *: none - gigabeatf: "Wysoka" + gigabeatfx: "Wysoka" Index: apps/lang/wallisertitsch.lang =================================================================== --- apps/lang/wallisertitsch.lang (revision 23734) +++ apps/lang/wallisertitsch.lang (working copy) @@ -88,7 +88,7 @@ id: LANG_ALWAYS - desc: (player) the jump scroll shall be done "always + desc: (archosplayer) the jump scroll shall be done "always user: core *: "Always" @@ -746,14 +746,14 @@ id: LANG_CONFIRM_WITH_PLAY_RECORDER - desc: Generic recorder string to use to confirm + desc: Generic archosrecorder string to use to confirm user: core *: "PLAY = Yes" *: "PLAY = Ja" - h100,h120,h300: "NAVI = Ja" + iriverh100,iriverh120,iriverh300: "NAVI = Ja" *: "" @@ -761,7 +761,7 @@ id: LANG_CANCEL_WITH_ANY_RECORDER - desc: Generic recorder string to use to cancel + desc: Generic archosrecorder string to use to cancel user: core *: "Any Other = No" @@ -2203,7 +2203,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu altarnative for jump scroll + desc: (archosplayer) menu altarnative for jump scroll user: core *: "Jump scroll" @@ -2217,7 +2217,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time + desc: (archosplayer) the jump scroll shall be done "one time user: core *: "One time" @@ -2231,7 +2231,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -2875,7 +2875,7 @@ id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB user: core *: "Buf: %d.%03dMB" @@ -2889,7 +2889,7 @@ id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB + desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB user: core *: "Buffer: %d.%03dMB" @@ -3148,7 +3148,7 @@ *: "PLAY = üswählu" - h100,h120,h300: "NAVI = üswählu" + iriverh100,iriverh120,iriverh300: "NAVI = üswählu" *: "" @@ -3163,7 +3163,7 @@ *: "ON+PLAY = leschu" - h100,h120,h300: "ON+NAVI = leschu" + iriverh100,iriverh120,iriverh300: "ON+NAVI = leschu" *: "" @@ -5663,7 +5663,7 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" @@ -5677,7 +5677,7 @@ id: LANG_STOP_ABORT - desc: Used on player models + desc: Used on archosplayer models user: core *: "STOP to abort" Index: apps/lang/bulgarian.lang =================================================================== --- apps/lang/bulgarian.lang (revision 23734) +++ apps/lang/bulgarian.lang (working copy) @@ -665,12 +665,12 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Микрoфон" - h100,h120,h300: "Вграден микрофон" + iriverh100,iriverh120,iriverh300: "Вграден микрофон" *: "" @@ -1242,19 +1242,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Батерия: нерегулирано зареждане" + archosrecorder: "Батерия: нерегулирано зареждане" *: none - recorder: none + archosrecorder: none @@ -1280,18 +1280,18 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Батерия: %d%% %dч %dмин" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dмин" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dч %dмин" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dмин" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dч %dмин" *: "" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "" - h10,ipodmini,ipodmini2g: "" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "" + iriverh10,ipodmini1g,ipodmini2g: "" @@ -1349,22 +1349,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF за отказ" - h100,h120,h300: "STOP за отказ" - ipod*,c200*,sa9200: "MENU за отказ" - x5,m5: "RECORD за отказ" - h10,h10_5gb,e200*,fuze*: "PREV за отказ" - gigabeatf: "POWER за отказ" + iriverh100,iriverh120,iriverh300: "STOP за отказ" + ipod*,sansac200*,gogearsa9200: "MENU за отказ" + iaudiox5,iaudiom5: "RECORD за отказ" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV за отказ" + gigabeatfx: "POWER за отказ" mrobe100: "DISPLAY за отказ" gigabeats: "BACK за отказ" @@ -2914,17 +2914,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Изграждане на базата данни... намерени %d (OFF за връщане)" - h100,h120,h300: "Изграждане на базата данни... намерени %d (STOP за връщане)" + iriverh100,iriverh120,iriverh300: "Изграждане на базата данни... намерени %d (STOP за връщане)" ipod*: "Изграждане на базата данни... намерени %d (PREV за връщане)" - x5,m5,gigabeat*,mrobe100: "Изграждане на базата данни... намерени %d (LEFT за връщане)" - h10,h10_5gb,e200*,c200*,sa9200: "Изграждане на базата данни... намерени %d (PREV за връщане)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Изграждане на базата данни... намерени %d (LEFT за връщане)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Изграждане на базата данни... намерени %d (PREV за връщане)" *: "entries found for database" @@ -3476,7 +3476,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -4649,23 +4649,23 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Дискът е пълен. Натиснете OFF за да продължите." - h100,h120,h300: "Дискът е пълен. Натиснете STOP за да продължите." - m5,x5: "Дискът е пълен. Натиснете POWER за да продължите." - e200*,c200*: "Дискът е пълен. Натиснете PREV за да продължите." + iriverh100,iriverh120,iriverh300: "Дискът е пълен. Натиснете STOP за да продължите." + iaudiom5,iaudiox5: "Дискът е пълен. Натиснете POWER за да продължите." + sansae200*,sansac200*: "Дискът е пълен. Натиснете PREV за да продължите." *: "" recording: "" - h100,h120,h300: "" - m5,x5: "" - e200*,c200*: "" + iriverh100,iriverh120,iriverh300: "" + iaudiom5,iaudiox5: "" + sansae200*,sansac200*: "" @@ -4773,15 +4773,15 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Буфер:" - player: "Буф:" + archosplayer: "Буф:" *: "" - player: "" + archosplayer: "" @@ -4987,15 +4987,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Да" - h100,h120,h300: "NAVI = Да" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Да" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Да" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Да" + archosplayer: "(PLAY/STOP)" *: "" @@ -5022,14 +5022,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Запази" - h100,h120,h300: "NAVI = Запази" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Запази" + iriverh100,iriverh120,iriverh300: "NAVI = Запази" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Запази" *: none @@ -5041,15 +5041,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Всеки друг = Не" - player: none + archosplayer: none *: "" - player: "" + archosplayer: "" @@ -5440,28 +5440,28 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" *: "OFF за отказ" - player,h100,h120,h300: "STOP за отказ" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP за отказ" ipod*: "PLAY/PAUSE за отказ" - x5,m5: "Продължително PLAY за отказ" - h10,h10_5gb,e200*,c200*: "PREV за отказ" + iaudiox5,iaudiom5: "Продължително PLAY за отказ" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV за отказ" *: "" - player,h100,h120,h300: "" + archosplayer,iriverh100,iriverh120,iriverh300: "" ipod*: "" - x5,m5: "" - h10,h10_5gb,e200*,c200*: "" + iaudiox5,iaudiom5: "" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "" @@ -5765,15 +5765,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Край на списъка с песни" - player: "Kрай на списъка" + archosplayer: "Kрай на списъка" *: "" - player: "" + archosplayer: "" @@ -6628,7 +6628,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -6673,7 +6673,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -7731,15 +7731,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: "" - recording,player: "Line In" + recording,archosplayer: "Line In" @@ -8844,17 +8844,17 @@ user: core *: none - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: "" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -10206,17 +10206,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Изключване на осветяването на бутоните" - fuze*,e200*: "Изключване на осветяването на колелото" + sansafuze*,sansae200*: "Изключване на осветяването на колелото" *: none button_light: "" - fuze*,e200*: "" + sansafuze*,sansae200*: "" @@ -10497,7 +10497,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -11358,14 +11358,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Установяване OFF=Отказ" ipod*: "SELECT=Установяване MENU=Отказ" - h10,h10_5gb: "SELECT=Установяване PREV=Отказ" + iriverh10,iriverh10_5gb: "SELECT=Установяване PREV=Отказ" gigabeats: "SELECT=Установяване POWER=Отказ" @@ -11612,15 +11612,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Чувствителност на тъчпада" + gigabeatfx: "Чувствителност на тъчпада" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" @@ -11933,14 +11933,14 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Високо" + gigabeatfx: "Високо" *: none - gigabeatf: "High" + gigabeatfx: "High" Index: apps/lang/chinese-trad.lang =================================================================== --- apps/lang/chinese-trad.lang (revision 23734) +++ apps/lang/chinese-trad.lang (working copy) @@ -2191,15 +2191,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "聲音輸入" + recording,archosplayer: "聲音輸入" *: none - recording,player: "" + recording,archosplayer: "" @@ -2445,17 +2445,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "麥克風" - h100,h120,h300: "內置麥克風" + iriverh100,iriverh120,iriverh300: "內置麥克風" *: none recording: "" - h100,h120,h300: "" + iriverh100,iriverh120,iriverh300: "" @@ -3307,7 +3307,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3321,7 +3321,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3335,7 +3335,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4340,19 +4340,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "電池: 完成充電" + archosrecorder: "電池: 完成充電" *: none - recorder: "" + archosrecorder: "" @@ -4378,18 +4378,18 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "電池: %d%% %d小時%d分" - player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "電池: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "電池: %d%% %dh %dm" *: "Battery level" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "" - h10,ipodmini,ipodmini2g: "" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "" + iriverh10,ipodmini1g,ipodmini2g: "" @@ -4444,19 +4444,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "磁盤1" - e200*,c200*,fuze*: "Multimedia 卡:" + sansae200*,sansac200*,sansafuze*: "Multimedia 卡:" ondio*: "MMC卡:" *: none multivolume: "磁盤1" - e200*,c200*,fuze*: "Multimedia 卡" + sansae200*,sansac200*,sansafuze*: "Multimedia 卡" ondio*: "mmc卡" @@ -4588,33 +4588,33 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = 回去" - h100,h120,h300: "STOP = 回去" - ipod*,c200*,sa9200: "MENU = 回去" - x5,m5: "RECORD = 回去" - h10,h10_5gb,e200*,fuze*: "PREV = 回去" - gigabeatf: "POWER = 回去" + iriverh100,iriverh120,iriverh300: "STOP = 回去" + ipod*,sansac200*,gogearsa9200: "MENU = 回去" + iaudiox5,iaudiom5: "RECORD = 回去" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 回去" + gigabeatfx: "POWER = 回去" mrobe100: "DISPLAY = 回去" gigabeats: "BACK = 回去" *: none rtc: "" - h100,h120,h300: "" - ipod*,e200*,c200*,sa9200: "" - x5,m5: "" - h10,h10_5gb: "" - gigabeatf: "" + iriverh100,iriverh120,iriverh300: "" + ipod*,sansae200*,sansac200*,gogearsa9200: "" + iaudiox5,iaudiom5: "" + iriverh10,iriverh10_5gb: "" + gigabeatfx: "" mrobe100: "" gigabeats: "" @@ -4694,23 +4694,23 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "硬碟已滿，按下OFF繼續。" - h100,h120,h300: "硬碟已滿，按下STOP繼續。" - m5,x5: "硬碟已滿，按下POWER繼續。" - e200*,c200*: "硬碟已滿，按下PREV繼續。" + iriverh100,iriverh120,iriverh300: "硬碟已滿，按下STOP繼續。" + iaudiom5,iaudiox5: "硬碟已滿，按下POWER繼續。" + sansae200*,sansac200*: "硬碟已滿，按下PREV繼續。" *: none recording: "" - h100,h120,h300: "" - m5,x5: "" - e200*,c200*: "" + iriverh100,iriverh120,iriverh300: "" + iaudiom5,iaudiox5: "" + sansae200*,sansac200*: "" @@ -4874,21 +4874,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=設定 OFF=取消" ipod*: "SELECT=設定 MENU=取消" - h10,h10_5gb: "SELECT=設定 PREV=取消" + iriverh10,iriverh10_5gb: "SELECT=設定 PREV=取消" gigabeats: "SELECT=設定 POWER=取消" *: none alarm: "" ipod*: "" - h10,h10_5gb: "" + iriverh10,iriverh10_5gb: "" gigabeats: "" @@ -7403,25 +7403,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF: 離開" - player,h100,h120,h300: "STOP: 離開" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP: 離開" ipod*: "PLAY/PAUSE: 離開" - x5,m5: "長按PLAY: 離開" - h10,h10_5gb,e200*,c200*: "PREV: 離開" + iaudiox5,iaudiom5: "長按PLAY: 離開" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV: 離開" gigabeats: "BACK: 離開" - gigabeatf: "POWER: 離開" + gigabeatfx: "POWER: 離開" *: "" @@ -8480,7 +8480,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -8755,24 +8755,24 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "建立資料庫... 找到%d項 (OFF: 回上一畫面)" - h100,h120,h300: "建立資料庫... 找到%d項 (STOP: 回上一畫面)" + iriverh100,iriverh120,iriverh300: "建立資料庫... 找到%d項 (STOP: 回上一畫面)" ipod*: "建立資料庫... 找到%d項 (PREV: 回上一畫面)" - x5,m5,gigabeat*,mrobe100: "建立資料庫... 找到%d項 (LEFT: 回上一畫面)" - h10,h10_5gb,e200*,c200*,sa9200: "建立資料庫... 找到%d項 (PREV: 回上一畫面)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "建立資料庫... 找到%d項 (LEFT: 回上一畫面)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "建立資料庫... 找到%d項 (PREV: 回上一畫面)" *: "entries found for database" - h100,h120,h300: "" + iriverh100,iriverh120,iriverh300: "" ipod*: "" - x5,m5,gigabeat*,mrobe100: "" - h10,h10_5gb,e200*,c200*,sa9200: "" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "" @@ -9266,15 +9266,15 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "緩沖:" - player: "Buf:" + archosplayer: "Buf:" *: "" - player: "" + archosplayer: "" @@ -9331,21 +9331,21 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = 是" - h100,h120,h300: "NAVI = 是" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = 是" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = 是" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = 是" + archosplayer: "(PLAY/STOP)" *: "" - h100,h120,h300: "" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "" - player: "" + iriverh100,iriverh120,iriverh300: "" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "" + archosplayer: "" @@ -9355,20 +9355,20 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = 設定" - h100,h120,h300: "NAVI = 設定" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = 設定" + iriverh100,iriverh120,iriverh300: "NAVI = 設定" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = 設定" *: none rtc: "" - h100,h120,h300: "" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + iriverh100,iriverh120,iriverh300: "" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -9377,15 +9377,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Any Other = 否" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -9571,15 +9571,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "列表結束" - player: "列表結束" + archosplayer: "列表結束" *: "End of Song List" - player: "End of List" + archosplayer: "End of List" @@ -10674,17 +10674,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Button Light Timeout" - fuze*,e200*: "轉盤燈自動關時間" + sansafuze*,sansae200*: "轉盤燈自動關時間" *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" @@ -11648,15 +11648,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "觸摸板靈敏度" + gigabeatfx: "觸摸板靈敏度" *: none - gigabeatf: "觸摸板靈敏度" + gigabeatfx: "觸摸板靈敏度" @@ -12291,15 +12291,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "高" + gigabeatfx: "高" *: none - gigabeatf: "高" + gigabeatfx: "高" Index: apps/lang/lietuviu.lang =================================================================== --- apps/lang/lietuviu.lang (revision 23734) +++ apps/lang/lietuviu.lang (working copy) @@ -14,80 +14,6 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # -# This is the master of the language files. This is the original, the one with -# all the existing strings Rockbox features. -# -# The target names used for target-specific strings are set in the ARCHOS -# variable in the root Makefile -# -# *WARNING* -# -# If you want to add a new string, add it to the end of this file! -# If you want to remove a string, just blank it, don't actually remove it! -# -# If you re-order things or remove entries, you must bump the binary language -# file version number in both the 'genlang' tool and the language loader code. -# -# The "voice' entry contains how we want the speech UI to pronounce the phrase. -# -# Since this file is both the master for the language system, as well as the -# source for generating english strings, make sure that all strings -# are *identical* to the strings within the english.lang file. The -# strings are the ones that'll be exposed and used by other languages -# when doing updates etc, while the ones are used when this file is -# used to simply get the full set of english strings for a particular target. -# -# All phrases have a default string like: *: "default" that will be used if no -# other string matches for the particular model you build the language for. If -# you want a particular string for the iriver h300 series you'd write it like: -# h300: "h300-specific string" (below the default line). If your string isn't -# used for all targets set the default to none like: *: none (no quotes!) this -# will not include the string for target that will not need it, see -# apps/features.txt for available categories that can be used instead of the -# target name, for example: swcodec: "swcodec-specific string". -# -# -# The target names used are picked from the configure script and are set in the -# MODELNAME variable in the root makefile. Currently, they are: -# Target Target string -# Archos -# Player/Studio player -# Recorder recorder -# FM Recorder fmrecorder -# Recorder V2 recorderv2 -# Ondio SP ondiosp -# Ondio FM ondiofm -# iriver -# H100/H110/H115 h100 -# H120/H140 h120 -# H320/H340 h300 -# H10 h10 -# IFP 7XX ifp7xx -# iaudio -# X5 x5 -# M5 m5 -# ipod -# All iPods ipod* -# 4G Color/Photo ipodcolor -# Nano ipodnano -# Video (5G) ipodvideo -# 3G ipod3g -# 4G gray ipod4g -# mini ipodmini -# mini 2G ipodmini2g -# Toshiba -# Gigabeat Fxx gigabeatf -# Gigabeat Sxx gigabeats -# -# Sandisk -# Sansa E200 e200 -# Sansa C200 c200* -# -# Olympus -# m:robe 100 mrobe100 -# -# Philips -# GoGear SA9200 sa9200 id: LANG_SET_BOOL_YES @@ -333,15 +259,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Taip" - h100,h120,h300: "NAVI = Taip" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Taip" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Taip" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Taip" + archosplayer: "(PLAY/STOP)" *: "" @@ -353,15 +279,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Bet koks kitas = Ne" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2454,17 +2380,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Kuriama duomenų bazė... %d rasta (OFF grįžimui)" - h100,h120,h300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)" + iriverh100,iriverh120,iriverh300: "Kuriama duomenų bazė... %d rasta (STOP grįžimui)" ipod*: "Kuriama duomenų bazė... %d rasta (PREV grįžimui)" - x5,m5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)" - h10,h10_5gb,e200*,c200*,sa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Kuriama duomenų bazė... %d rasta (LEFT grįžimui)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Kuriama duomenų bazė... %d rasta (PREV to grįžimui)" *: "entries found for database" @@ -3264,7 +3190,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3278,7 +3204,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3292,7 +3218,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3924,17 +3850,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Klavišų apšvietimo laikas" - fuze*,e200*: "Rato apšvietimo laikas" + sansafuze*,sansae200*: "Rato apšvietimo laikas" *: none button_light: "Klavišų apšvietimo laikas" - fuze*,e200*: "Rato apšvietimo laikas" + sansafuze*,sansae200*: "Rato apšvietimo laikas" @@ -4215,18 +4141,18 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Nustatyti" - h100,h120,h300: "NAVI = Nustatyti" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Nustatyti" + iriverh100,iriverh120,iriverh300: "NAVI = Nustatyti" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Nustatyti" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4236,22 +4162,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Atstatyti" - h100,h120,h300: "STOP = Atstatyti" - ipod*,c200*,sa9200: "MENU = Atstatyti" - x5,m5: "RECORD = Atstatyti" - h10,h10_5gb,e200*,fuze*: "PREV = Atstatyti" - gigabeatf: "POWER = Atstatyti" + iriverh100,iriverh120,iriverh300: "STOP = Atstatyti" + ipod*,sansac200*,gogearsa9200: "MENU = Atstatyti" + iaudiox5,iaudiom5: "RECORD = Atstatyti" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atstatyti" + gigabeatfx: "POWER = Atstatyti" mrobe100: "DISPLAY = Atstatyti" gigabeats: "BACK = Atstatyti" @@ -4779,14 +4705,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Nustatyti OFF=Atšaukti" ipod*: "SELECT=Nustatyti MENU=Atšaukti" - h10,h10_5gb: "SELECT=Nustatyti PREV=Atšaukti" + iriverh10,iriverh10_5gb: "SELECT=Nustatyti PREV=Atšaukti" gigabeats: "SELECT=Nustatyti POWER=Atšaukti" @@ -5961,17 +5887,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofonas" - h100,h120,h300: "Vidinis mikrofonas" + iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas" *: none recording: "Mikrofonas" - h100,h120,h300: "Vidinis mikrofonas" + iriverh100,iriverh120,iriverh300: "Vidinis mikrofonas" @@ -5997,15 +5923,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" @@ -6935,11 +6861,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buferis:" - player: "Buf:" + archosplayer: "Buf:" *: "Buferio dydis" @@ -6951,13 +6877,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Baterija: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm" *: "Baterijos lygis" @@ -7015,19 +6941,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8139,11 +8065,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Dainų sąrašo pabaiga" - player: "Sąrašo pabaiga" + archosplayer: "Sąrašo pabaiga" *: "Dainų sąrašo pabaiga" @@ -8386,20 +8312,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Diskas pilnas. Spauskite OFF." - h100,h120,h300: "Diskas pilnas. Spauskite STOP." - m5,x5: "Diskas pilnas. Spauskite POWER." - e200*,c200*: "Diskas pilnas. Spauskite PREV." + iriverh100,iriverh120,iriverh300: "Diskas pilnas. Spauskite STOP." + iaudiom5,iaudiox5: "Diskas pilnas. Spauskite POWER." + sansae200*,sansac200*: "Diskas pilnas. Spauskite PREV." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8483,25 +8409,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF atšaukimui" - player,h100,h120,h300: "STOP atšaukimui" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP atšaukimui" ipod*: "PLAY/PAUSE atšaukimui" - x5,m5: "Ilgas PLAY atšaukimui" - h10,h10_5gb,e200*,c200*: "PREV atšaukimui" + iaudiox5,iaudiom5: "Ilgas PLAY atšaukimui" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV atšaukimui" gigabeats: "BACK atšaukimui" - gigabeatf: "POWER atšaukimui" + gigabeatfx: "POWER atšaukimui" *: "" @@ -8725,19 +8651,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Baterija: Pilna" + archosrecorder: "Baterija: Pilna" *: none - recorder: "Pilanas pakrovimas" + archosrecorder: "Pilanas pakrovimas" @@ -10554,7 +10480,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11765,15 +11691,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Jautrumas lietimui" + gigabeatfx: "Jautrumas lietimui" *: none - gigabeatf: "Jautrumas lietimui" + gigabeatfx: "Jautrumas lietimui" @@ -11782,15 +11708,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Aukštas" + gigabeatfx: "Aukštas" *: none - gigabeatf: "Aukštas" + gigabeatfx: "Aukštas" Index: apps/lang/eesti.lang =================================================================== --- apps/lang/eesti.lang (revision 23734) +++ apps/lang/eesti.lang (working copy) @@ -844,25 +844,25 @@ id: LANG_CONFIRM_WITH_PLAY_RECORDER - desc: Generic recorder string to use to confirm + desc: Generic archosrecorder string to use to confirm user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" ipod*: "SELECT = Yes" - x5: "SELECT = Yes" - h10,h10_5gb: "SELECT = Yes" - gigabeatf: "SELECT = Yes" - e200*,c200*: "SELECT = Yes" + iaudiox5: "SELECT = Yes" + iriverh10,iriverh10_5gb: "SELECT = Yes" + gigabeatfx: "SELECT = Yes" + sansae200*,sansac200*: "SELECT = Yes" *: "PLAY = Jah" - h100,h120,h300: "NAVI = Jah" + iriverh100,iriverh120,iriverh300: "NAVI = Jah" ipod*: "SELECT = Jah" - x5: "SELECT = Jah" - h10,h10_5gb: "SELECT = Jah" - gigabeatf: "SELECT = Jah" - e200*,c200*: "SELECT = Jah" + iaudiox5: "SELECT = Jah" + iriverh10,iriverh10_5gb: "SELECT = Jah" + gigabeatfx: "SELECT = Jah" + sansae200*,sansac200*: "SELECT = Jah" *: "" @@ -870,7 +870,7 @@ id: LANG_CANCEL_WITH_ANY_RECORDER - desc: Generic recorder string to use to cancel + desc: Generic archosrecorder string to use to cancel user: core *: "Any Other = No" @@ -3446,7 +3446,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu altarnative for jump scroll + desc: (archosplayer) menu altarnative for jump scroll user: core *: "Jump Scroll" @@ -3460,7 +3460,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3474,7 +3474,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4440,7 +4440,7 @@ id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB user: core *: "Buf: %d.%03dMB" @@ -4454,7 +4454,7 @@ id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB + desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB user: core *: "Buffer: %d.%03dMB" @@ -4514,13 +4514,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Aku" @@ -4868,21 +4868,21 @@ user: core *: "ON = Set" - h100,h120,h300: "NAVI = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" ipod*: "SELECT = Set" - x5: "SELECT = Set" - h10,h10_5gb: "SELECT = Set" - gigabeatf: "SELECT = Set" - e200*,c200*: "SELECT = Set" + iaudiox5: "SELECT = Set" + iriverh10,iriverh10_5gb: "SELECT = Set" + gigabeatfx: "SELECT = Set" + sansae200*,sansac200*: "SELECT = Set" *: "ON muutmiseks" - h100,h120,h300: "NAVI muutmiseks" + iriverh100,iriverh120,iriverh300: "NAVI muutmiseks" ipod*: "SELECT muutmiseks" - x5: "SELECT muutmiseks" - h10,h10_5gb: "SELECT muutmiseks" - gigabeatf: "SELECT muutmiseks" - e200*,c200*: "SELECT muutmiseks" + iaudiox5: "SELECT muutmiseks" + iriverh10,iriverh10_5gb: "SELECT muutmiseks" + gigabeatfx: "SELECT muutmiseks" + sansae200*,sansac200*: "SELECT muutmiseks" *: "" @@ -4894,19 +4894,19 @@ user: core *: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" *: "OFF tagasi pöördumiseks" - h100,h120,h300: "STOP tagasi pöördumiseks" - ipod*,c200*: "MENU tagasi pöördumiseks" - x5: "RECORD tagasi pöördumiseks" - h10,h10_5gb,e200*,fuze*: "PREV tagasi pöördumiseks" - gigabeatf: "POWER tagasi pöördumiseks" + iriverh100,iriverh120,iriverh300: "STOP tagasi pöördumiseks" + ipod*,sansac200*: "MENU tagasi pöördumiseks" + iaudiox5: "RECORD tagasi pöördumiseks" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV tagasi pöördumiseks" + gigabeatfx: "POWER tagasi pöördumiseks" *: "" @@ -5100,11 +5100,11 @@ user: core *: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." *: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." *: "" @@ -7872,23 +7872,23 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - h100,h120,h300: "STOP to abort" + iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5: "Long PLAY to abort" - h10,h10_5gb: "PREV to abort" - e200*,c200*: "PREV to abort" + iaudiox5: "Long PLAY to abort" + iriverh10,iriverh10_5gb: "PREV to abort" + sansae200*,sansac200*: "PREV to abort" *: "OFF katkestamiseks" - h100,h120,h300: "STOP katkestamiseks" + iriverh100,iriverh120,iriverh300: "STOP katkestamiseks" ipod*: "PLAY/PAUSE katkestamiseks" - x5: "Long PLAY katkestamiseks" - h10,h10_5gb: "PREV katkestamiseks" - e200*,c200*: "PREV katkestamiseks" + iaudiox5: "Long PLAY katkestamiseks" + iriverh10,iriverh10_5gb: "PREV katkestamiseks" + sansae200*,sansac200*: "PREV katkestamiseks" *: "" @@ -7896,7 +7896,7 @@ id: LANG_STOP_ABORT - desc: Used on player models + desc: Used on archosplayer models user: core *: "STOP to abort" Index: apps/lang/svenska.lang =================================================================== --- apps/lang/svenska.lang (revision 23734) +++ apps/lang/svenska.lang (working copy) @@ -267,16 +267,16 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "SPELA = Ja" cowond2*: "MENY = Ja" - h100,h120,h300: "NAVI = Ja" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "VÄLJ = Ja" - player: "SPELA/STOPP" + iriverh100,iriverh120,iriverh300: "NAVI = Ja" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "VÄLJ = Ja" + archosplayer: "SPELA/STOPP" *: "" @@ -288,15 +288,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Annan = Nej" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2389,19 +2389,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Skapar databas... %d hittade (AV = Återgå)" - h100,h120,h300: "Skapar databas... %d hittade (STOPP = Återgå)" + iriverh100,iriverh120,iriverh300: "Skapar databas... %d hittade (STOPP = Återgå)" ipod*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)" - x5,m5,gigabeat*,mrobe100: "Skapar databas... %d hittade (VÄNSTER = Återgå)" - h10,h10_5gb,e200*,c200*,fuze*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)" - sa9200: "Skapar databas... %d hittade (REW = Återgå)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Skapar databas... %d hittade (VÄNSTER = Återgå)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Skapar databas... %d hittade (FÖREGÅENDE = Återgå)" + gogearsa9200: "Skapar databas... %d hittade (REW = Återgå)" *: "objekt hittade för databasen" @@ -3201,7 +3201,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3215,7 +3215,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3229,7 +3229,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3861,17 +3861,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Knappbelysning" - fuze*,e200*: "Hjulbelysning" + sansafuze*,sansae200*: "Hjulbelysning" *: none button_light: "Knappbelysning" - fuze*,e200*: "Hjulbelysning" + sansafuze*,sansae200*: "Hjulbelysning" @@ -4153,21 +4153,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "PÅ = Ställ" mrobe500: "HJÄRTA = Ställ" - h100,h120,h300: "NAVI = Ställ" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "VÄLJ = Ställ" - sa9200: "SPELA = Ställ" + iriverh100,iriverh120,iriverh300: "NAVI = Ställ" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "VÄLJ = Ställ" + gogearsa9200: "SPELA = Ställ" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4178,31 +4178,31 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "AV = Avbryt" mrobe500: "PÅ/AV = Avbryt" - h100,h120,h300: "STOPP = Avbryt" - ipod*,c200*: "MENY = Avbryt" - x5,m5: "SPELA IN = Avbryt" - h10,h10_5gb,e200*,fuze*: "FÖREGÅENDE = Avbryt" - gigabeatf: "PÅ/AV = Avbryt" + iriverh100,iriverh120,iriverh300: "STOPP = Avbryt" + ipod*,sansac200*: "MENY = Avbryt" + iaudiox5,iaudiom5: "SPELA IN = Avbryt" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FÖREGÅENDE = Avbryt" + gigabeatfx: "PÅ/AV = Avbryt" mrobe100: "VISA = Avbryt" gigabeats: "BAKÅT = Avbryt" - sa9200: "VÄNSTER = Avbryt" + gogearsa9200: "VÄNSTER = Avbryt" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4725,14 +4725,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "SPELA=Sätt AV=Avbryt" ipod*: "VÄLJ=Sätt MENY=Avbryt" - h10,h10_5gb: "VÄLJ=Sätt FÖREGÅENDE=Avbryt" + iriverh10,iriverh10_5gb: "VÄLJ=Sätt FÖREGÅENDE=Avbryt" gigabeats: "VÄLJ=Sätt PÅ/AV=Avbryt" @@ -5907,17 +5907,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" @@ -5943,15 +5943,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Linjeingång" + recording,archosplayer: "Linjeingång" *: none - recording,player: "Linjeingång" + recording,archosplayer: "Linjeingång" @@ -6881,11 +6881,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffert:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffertstorlek" @@ -6897,13 +6897,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batteri: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batterinivå" @@ -6961,19 +6961,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "mikro S D" + sansae200*,sansac200*,sansafuze*: "mikro S D" ondio*: "M M C" @@ -8085,11 +8085,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Slut på spellistan" - player: "Listan slut" + archosplayer: "Listan slut" *: "Slut på spellistan" @@ -8332,20 +8332,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disken är full. Tryck AV för att fortsätta." - h100,h120,h300: "Disken är full. Tryck STOPP för att fortsätta." - m5,x5: "Disken är full. Tryck PÅ/AV för att fortsätta." - e200*,c200*: "Disken är full. Tryck FÖREGÅENDE för att fortsätta." + iriverh100,iriverh120,iriverh300: "Disken är full. Tryck STOPP för att fortsätta." + iaudiom5,iaudiox5: "Disken är full. Tryck PÅ/AV för att fortsätta." + sansae200*,sansac200*: "Disken är full. Tryck FÖREGÅENDE för att fortsätta." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8429,25 +8429,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "AV = avbryt" - player,h100,h120,h300: "STOPP = Avbryt" + archosplayer,iriverh100,iriverh120,iriverh300: "STOPP = Avbryt" ipod*: "SPELA/PAUSA = Avbryt" - x5,m5: "Lång SPELA = Avbryt" - h10,h10_5gb,e200*,c200*: "FÖREGÅENDE = Avbryt" + iaudiox5,iaudiom5: "Lång SPELA = Avbryt" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "FÖREGÅENDE = Avbryt" gigabeats: "BAKÅT = Avbryt" - gigabeatf: "PÅ/AV = Avbryt" + gigabeatfx: "PÅ/AV = Avbryt" *: "" @@ -8671,19 +8671,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batteri: Toppladdning" + archosrecorder: "Batteri: Toppladdning" *: none - recorder: "Toppladdning" + archosrecorder: "Toppladdning" @@ -10500,7 +10500,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11711,15 +11711,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Pekskärmskänslighet" + gigabeatfx: "Pekskärmskänslighet" *: none - gigabeatf: "Pekskärmskänslighet" + gigabeatfx: "Pekskärmskänslighet" @@ -11728,15 +11728,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Hög" + gigabeatfx: "Hög" *: none - gigabeatf: "Hög" + gigabeatfx: "Hög" Index: apps/lang/hebrew.lang =================================================================== --- apps/lang/hebrew.lang (revision 23734) +++ apps/lang/hebrew.lang (working copy) @@ -264,15 +264,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = כן" - h100,h120,h300: "NAVI = כן" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = כן" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = כן" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = כן" + archosplayer: "(PLAY/STOP)" *: "" @@ -284,15 +284,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "אחר = לא" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2368,17 +2368,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: " בונה מסד נתונים... %d (OFF כדי לחזור) נמצאו" - h100,h120,h300: "בונה מסד נתונים... %d (STOP כדי לחזור) נמצאו" + iriverh100,iriverh120,iriverh300: "בונה מסד נתונים... %d (STOP כדי לחזור) נמצאו" ipod*: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו" - x5,m5,gigabeat*,mrobe100: " בונה מסד נתונים... %d (LEFT כדי לחזור) נמצאו" - h10,h10_5gb,e200*,c200*,sa9200: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו" + iaudiox5,iaudiom5,gigabeat*,mrobe100: " בונה מסד נתונים... %d (LEFT כדי לחזור) נמצאו" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: " בונה מסד נתונים... %d (PREV כדי לחזור) נמצאו" *: "entries found for database" @@ -3178,7 +3178,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3192,7 +3192,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3206,7 +3206,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3838,17 +3838,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "זמן תאורת כפתור" - fuze*,e200*: "זמן תאורת הגלגל" + sansafuze*,sansae200*: "זמן תאורת הגלגל" *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" @@ -4129,18 +4129,18 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = כוון" - h100,h120,h300: "NAVI = כוון" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = כוון" + iriverh100,iriverh120,iriverh300: "NAVI = כוון" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = כוון" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4150,28 +4150,28 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = ביטול" - h100,h120,h300: "STOP = ביטול" - ipod*,c200*,sa9200: "MENU = ביטול" - x5,m5: "RECORD = ביטול" - h10,h10_5gb,e200*,fuze*: "PREV = ביטול" - gigabeatf: "POWER = ביטול" + iriverh100,iriverh120,iriverh300: "STOP = ביטול" + ipod*,sansac200*,gogearsa9200: "MENU = ביטול" + iaudiox5,iaudiom5: "RECORD = ביטול" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ביטול" + gigabeatfx: "POWER = ביטול" mrobe100: "DISPLAY = ביטול" gigabeats: "BACK = ביטול" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4694,14 +4694,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=אישור OFF=ביטול" ipod*: "SELECT=אישור MENU=ביטול" - h10,h10_5gb: "SELECT=אישור PREV=ביטול" + iriverh10,iriverh10_5gb: "SELECT=אישור PREV=ביטול" gigabeats: "SELECT=אישור POWER=ביטול" @@ -5876,17 +5876,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "מיקרופון" - h100,h120,h300: "מיקרופון פנימי" + iriverh100,iriverh120,iriverh300: "מיקרופון פנימי" *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" @@ -5912,15 +5912,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "כניסת שמע" + recording,archosplayer: "כניסת שמע" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" @@ -6850,11 +6850,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "חוצץ:" - player: "חצץ:" + archosplayer: "חצץ:" *: "Buffer size" @@ -6866,13 +6866,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "סוללה: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "סולל: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "סולל: %d%% %dh %dm" *: "Battery level" @@ -6930,19 +6930,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8054,15 +8054,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "סוף רשימת השירים" - player: "סוף הרשימה" + archosplayer: "סוף הרשימה" *: "End of Song List" - player: "End of List" + archosplayer: "End of List" @@ -8302,16 +8302,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "הכונן מלא. לחץ על OFF כדי להמשיך" - h100,h120,h300: "הכונן מלא. לחץ על STOP כדי להמשיך" - m5,x5: "הכונן מלא. לחץ על POWER כדי להמשיך" - e200*,c200*: "הכונן מלא. לחץ על PREV כדי להמשיך" + iriverh100,iriverh120,iriverh300: "הכונן מלא. לחץ על STOP כדי להמשיך" + iaudiom5,iaudiox5: "הכונן מלא. לחץ על POWER כדי להמשיך" + sansae200*,sansac200*: "הכונן מלא. לחץ על PREV כדי להמשיך" *: none @@ -8398,25 +8398,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF כדי לבטל" - player,h100,h120,h300: "STOP כדי לבטל" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP כדי לבטל" ipod*: "PLAY/PAUSE כדי לבטל" - x5,m5: "PLAY ארוך כדי לבטל" - h10,h10_5gb,e200*,c200*: "PREV כדי לבטל" + iaudiox5,iaudiom5: "PLAY ארוך כדי לבטל" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV כדי לבטל" gigabeats: "BACK כדי לבטל" - gigabeatf: "POWER כדי לבטל" + gigabeatfx: "POWER כדי לבטל" *: "" @@ -8640,19 +8640,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "סוללה: כיבוי במקסימום" + archosrecorder: "סוללה: כיבוי במקסימום" *: none - recorder: "Top off charge" + archosrecorder: "Top off charge" @@ -10469,7 +10469,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11680,15 +11680,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "רגישות משטח מגע" + gigabeatfx: "רגישות משטח מגע" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" @@ -11697,15 +11697,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "גבוה" + gigabeatfx: "גבוה" *: none - gigabeatf: "High" + gigabeatfx: "High" Index: apps/lang/nederlands.lang =================================================================== --- apps/lang/nederlands.lang (revision 23734) +++ apps/lang/nederlands.lang (working copy) @@ -2193,15 +2193,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Lijn ingang" + recording,archosplayer: "Lijn ingang" *: none - recording,player: "Lijn ingang" + recording,archosplayer: "Lijn ingang" @@ -2447,17 +2447,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Microfoon" - h100,h120,h300: "Interne microfoon" + iriverh100,iriverh120,iriverh300: "Interne microfoon" *: none recording: "Microfoon" - h100,h120,h300: "Interne microfoon" + iriverh100,iriverh120,iriverh300: "Interne microfoon" @@ -3309,7 +3309,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3323,7 +3323,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3337,7 +3337,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4342,19 +4342,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batterij: Vol Laden" + archosrecorder: "Batterij: Vol Laden" *: none - recorder: "Batterij vol laden" + archosrecorder: "Batterij vol laden" @@ -4380,13 +4380,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batterij: %d%% %du %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batterij niveau" @@ -4444,19 +4444,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "Multimedia kaart" @@ -4588,26 +4588,26 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = terugzetten" - h100,h120,h300: "STOP = terugzetten" - ipod*,c200*: "MENU = terugzetten" - x5,m5: "RECORD = terugzetten" - h10,h10_5gb,e200*,fuze*: "PREV = terugzetten" - gigabeatf: "POWER = terugzetten" + iriverh100,iriverh120,iriverh300: "STOP = terugzetten" + ipod*,sansac200*: "MENU = terugzetten" + iaudiox5,iaudiom5: "RECORD = terugzetten" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten" + gigabeatfx: "POWER = terugzetten" mrobe100: "DISPLAY = terugzetten" gigabeats: "BACK = terugzetten" - sa9200: "LINKS = terugzetten" + gogearsa9200: "LINKS = terugzetten" *: "" @@ -4688,16 +4688,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "De schijf is vol. Druk OFF om door te gaan." - h100,h120,h300: "De schijf is vol. Druk STOP om door te gaan." - m5,x5: "De schijf is vol. Druk POWER om door te gaan." - e200*,c200*: "De schijf is vol. Druk PREV om door te gaan." + iriverh100,iriverh120,iriverh300: "De schijf is vol. Druk STOP om door te gaan." + iaudiom5,iaudiox5: "De schijf is vol. Druk POWER om door te gaan." + sansae200*,sansac200*: "De schijf is vol. Druk PREV om door te gaan." *: "" @@ -4864,21 +4864,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Instellen OFF=Afbreken" ipod*: "SELECT=Instellen MENU=Afbreken" - h10,h10_5gb: "SELECT=Instellen PREV=Afbreken" + iriverh10,iriverh10_5gb: "SELECT=Instellen PREV=Afbreken" gigabeats: "SELECT=Instellen POWER=Afbreken" *: none alarm: "PLAY=Instellen OFF=Afbreken" ipod*: "SELECT=Instellen MENU=Afbreken" - h10,h10_5gb: "SELECT=Instellen PREV=Afbreken" + iriverh10,iriverh10_5gb: "SELECT=Instellen PREV=Afbreken" gigabeats: "SELECT=Instellen POWER=Afbreken" @@ -7393,25 +7393,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF om af te breken" - player,h100,h120,h300: "STOP om af te breken" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP om af te breken" ipod*: "PLAY/PAUSE om af te breken" - x5,m5: "Long PLAY om af te breken" - h10,h10_5gb,e200*,c200*: "PREV om af te breken" + iaudiox5,iaudiom5: "Long PLAY om af te breken" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV om af te breken" gigabeats: "BACK om af te breken" - gigabeatf: "POWER om af te breken" + gigabeatfx: "POWER om af te breken" *: "" @@ -8806,7 +8806,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -9961,19 +9961,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Aanmaken van database... %d gevonden (OFF = terug)" - h100,h120,h300: "Aanmaken van database... %d gevonden (STOP = terug)" + iriverh100,iriverh120,iriverh300: "Aanmaken van database... %d gevonden (STOP = terug)" ipod*: "Aanmaken van database... %d gevonden (PREV = terug)" - x5,m5,gigabeat*,mrobe100: "Aanmaken van database... %d gevonden (LINKS = terug)" - h10,h10_5gb,e200*,c200*,fuze*: "Aanmaken van database... %d gevonden (PREV = terug)" - sa9200: "Aanmaken van database... %d gevonden (REW = terug)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Aanmaken van database... %d gevonden (LINKS = terug)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Aanmaken van database... %d gevonden (PREV = terug)" + gogearsa9200: "Aanmaken van database... %d gevonden (REW = terug)" *: "Aanmaken van database" @@ -10281,17 +10281,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Knoppen Licht Vertraging" - fuze*,e200*: "Wiel Licht Vertraging" + sansafuze*,sansae200*: "Wiel Licht Vertraging" *: none button_light: "Knoppen Licht Vertraging" - fuze*,e200*: "Wiel Licht Vertraging" + sansafuze*,sansae200*: "Wiel Licht Vertraging" @@ -10483,11 +10483,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffergrootte" @@ -10530,15 +10530,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Ja" - h100,h120,h300: "NAVI = Ja" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip,fuze*: "SELECT = Ja" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Ja" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip,sansafuze*: "SELECT = Ja" + archosplayer: "(PLAY/STOP)" *: "" @@ -10551,19 +10551,19 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Instellen" - h100,h120,h300: "NAVI = Instellen" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Instellen" + iriverh100,iriverh120,iriverh300: "NAVI = Instellen" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Instellen" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,gigabeatf: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,gigabeatfx: "" @@ -10572,15 +10572,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Elke andere = Nee" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -10634,11 +10634,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Einde van de titellijst" - player: "Einde lijst" + archosplayer: "Einde lijst" *: "Einde lijst" @@ -11686,15 +11686,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Touchpad gevoeligheid" + gigabeatfx: "Touchpad gevoeligheid" *: none - gigabeatf: "Touchpad gevoeligheid" + gigabeatfx: "Touchpad gevoeligheid" @@ -11703,15 +11703,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Hoog" + gigabeatfx: "Hoog" *: none - gigabeatf: "Hoog" + gigabeatfx: "Hoog" Index: apps/lang/korean.lang =================================================================== --- apps/lang/korean.lang (revision 23734) +++ apps/lang/korean.lang (working copy) @@ -2203,15 +2203,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "라인 인" + recording,archosplayer: "라인 인" *: none - recording,player: "라인 인" + recording,archosplayer: "라인 인" @@ -2457,17 +2457,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "외부 마이크" - h100,h120,h300: "내장 마이크" + iriverh100,iriverh120,iriverh300: "내장 마이크" *: none recording: "외부 마이크" - h100,h120,h300: "내장 마이크" + iriverh100,iriverh120,iriverh300: "내장 마이크" @@ -3319,7 +3319,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3333,7 +3333,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3347,7 +3347,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4352,19 +4352,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "배터리: Top-Off Chg" + archosrecorder: "배터리: Top-Off Chg" *: none - recorder: "배터리: Top-Off Chg" + archosrecorder: "배터리: Top-Off Chg" @@ -4390,13 +4390,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "배터리: %d%% (%d시간 %d분)" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %d시간 %d분" - h10,ipodmini,ipodmini2g: "배터리: %d%% %d시간 %d분" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %d시간 %d분" + iriverh10,ipodmini1g,ipodmini2g: "배터리: %d%% %d시간 %d분" *: "배터리 레벨" @@ -4454,19 +4454,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1 " - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -4598,22 +4598,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "A = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "A = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "[끔]: 원상태 복구" - h100,h120,h300: "[정지]: 원상태 복구" - ipod*,c200*,sa9200: "[메뉴]: 원상태 복구" - x5,m5: "[녹음]: 원상태 복구" - h10,h10_5gb,e200*,fuze*: "[이전]: 원상태 복구" - gigabeatf: "[전원]: 원상태 복구" + iriverh100,iriverh120,iriverh300: "[정지]: 원상태 복구" + ipod*,sansac200*,gogearsa9200: "[메뉴]: 원상태 복구" + iaudiox5,iaudiom5: "[녹음]: 원상태 복구" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "[이전]: 원상태 복구" + gigabeatfx: "[전원]: 원상태 복구" mrobe100: "[화면]: 원상태 복구" gigabeats: "[뒤]: 원상태 복구" @@ -4713,16 +4713,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press UP to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press UP to continue." *: none recording: "디스크 공간이 부족합니다. [끔] 버튼을 누르세요." - h100,h120,h300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요." - m5,x5: "디스크 공간이 부족합니다. [전원] 버튼을 누르세요." - e200*,c200*: "디스크 공간이 부족합니다. [위] 버튼을 누르세요." + iriverh100,iriverh120,iriverh300: "디스크 공간이 부족합니다. [정지] 버튼을 누르세요." + iaudiom5,iaudiox5: "디스크 공간이 부족합니다. [전원] 버튼을 누르세요." + sansae200*,sansac200*: "디스크 공간이 부족합니다. [위] 버튼을 누르세요." *: none @@ -4889,14 +4889,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "[재생]: 설정 [꺼짐]: 취소" ipod*: "[선택]: 설정 [메뉴]: 취소" - h10,h10_5gb: "[선택]: 설정 [이전]: 취소" + iriverh10,iriverh10_5gb: "[선택]: 설정 [이전]: 취소" gigabeats: "[선택]: 설정 [꺼짐]: 취소" @@ -7400,25 +7400,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "[꺼짐]: 중지" - player,h100,h120,h300: "[정지]: 중지" + archosplayer,iriverh100,iriverh120,iriverh300: "[정지]: 중지" ipod*: "[재생/일시정지]: 중지" - x5,m5: "[재생 길게누름]: 중지" - h10,h10_5gb,e200*,c200*: "[이전]: 중지" + iaudiox5,iaudiom5: "[재생 길게누름]: 중지" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "[이전]: 중지" gigabeats: "[뒤]: 중지" - gigabeatf: "[전원]: 중지" + gigabeatfx: "[전원]: 중지" *: "" @@ -8813,7 +8813,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -9985,17 +9985,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "음악 DB 생성 중... %d개 완료 ([꺼짐]: 돌아가기)" - h100,h120,h300: "음악 DB 생성 중... %d개 완료 ([정지]: 돌아가기)" + iriverh100,iriverh120,iriverh300: "음악 DB 생성 중... %d개 완료 ([정지]: 돌아가기)" ipod*: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)" - x5,m5,gigabeat*,mrobe100: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)" - h10,h10_5gb,e200*,c200*,sa9200: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "음악 DB 생성 중... %d개 완료 ([왼쪽]: 돌아가기)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "음악 DB 생성 중... %d개 완료 ([이전]: 돌아가기)" *: "음악 DB의 요소를 찾음" @@ -10022,17 +10022,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "버튼 조명 시간" - fuze*,e200*: "휠 조명 시간" + sansafuze*,sansae200*: "휠 조명 시간" *: none button_light: "버튼 조명 시간" - fuze*,e200*: "휠 조명 시간" + sansafuze*,sansae200*: "휠 조명 시간" @@ -10373,15 +10373,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "터치패드 감도" + gigabeatfx: "터치패드 감도" *: none - gigabeatf: "터치패드 감도" + gigabeatfx: "터치패드 감도" @@ -10587,11 +10587,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "버퍼:" - player: "버퍼:" + archosplayer: "버퍼:" *: "버퍼 크기" @@ -10727,15 +10727,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "[재생] = 예" - h100,h120,h300: "[네비] = 예" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "[선택] = 예" - player: "(재생/정지)" + iriverh100,iriverh120,iriverh300: "[네비] = 예" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "[선택] = 예" + archosplayer: "(재생/정지)" *: "" @@ -10748,14 +10748,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "[켬] = 설정" - h100,h120,h300: "[네비] = 설정" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "[선택] = 설정" + iriverh100,iriverh120,iriverh300: "[네비] = 설정" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "[선택] = 설정" *: none @@ -10767,15 +10767,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "다른 버튼 = 아니오" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -10981,15 +10981,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "노래 목록의 마지막" - player: "목록의 마지막" + archosplayer: "목록의 마지막" *: "노래 목록의 마지막" - player: "목록의 마지막" + archosplayer: "목록의 마지막" @@ -12071,15 +12071,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "높음" + gigabeatfx: "높음" *: none - gigabeatf: "높음" + gigabeatfx: "높음" Index: apps/lang/magyar.lang =================================================================== --- apps/lang/magyar.lang (revision 23734) +++ apps/lang/magyar.lang (working copy) @@ -260,15 +260,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Igen" - h100,h120,h300: "NAVI = Igen" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Igen" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Igen" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Igen" + archosplayer: "(PLAY/STOP)" *: "" @@ -280,15 +280,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Egyéb = Mégsem" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2363,17 +2363,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Készítem az adatbázist... %d-t találtam (OFF - vissza)" - h100,h120,h300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)" + iriverh100,iriverh120,iriverh300: "Készítem az adatbázist... %d-t találtam (STOP - vissza)" ipod*: "Készítem az adatbázist... %d-t találtam (PREV - vissza)" - x5,m5,gigabeat*,mrobe100: "Készítem az adatbázist... %d-t találtam (BAL - vissza)" - h10,h10_5gb,e200*,c200*,sa9200: "Készítem az adatbázist... %d-t találtam (PREV - vissza)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Készítem az adatbázist... %d-t találtam (BAL - vissza)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Készítem az adatbázist... %d-t találtam (PREV - vissza)" *: "entries found for database" @@ -3172,7 +3172,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3186,7 +3186,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3200,7 +3200,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3832,17 +3832,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Gomb világításának hossza" - fuze*,e200*: "Kerék világításának hossza" + sansafuze*,sansae200*: "Kerék világításának hossza" *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" @@ -3859,7 +3859,7 @@ *: none - gigabeatf: "Button Light Brightness" + gigabeatfx: "Button Light Brightness" @@ -4123,18 +4123,18 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Beállít" - h100,h120,h300: "NAVI = Beállít" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Beállít" + iriverh100,iriverh120,iriverh300: "NAVI = Beállít" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Beállít" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeatf: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeatfx: "" @@ -4144,28 +4144,28 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "KI = mégsem" - h100,h120,h300: "STOP = mégsem" - ipod*,c200*,sa9200: "MENU = mégsem" - x5,m5: "RECORD = mégsem" - h10,h10_5gb,e200*,fuze*: "PREV = mégsem" - gigabeatf: "POWER = mégsem" + iriverh100,iriverh120,iriverh300: "STOP = mégsem" + ipod*,sansac200*,gogearsa9200: "MENU = mégsem" + iaudiox5,iaudiom5: "RECORD = mégsem" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = mégsem" + gigabeatfx: "POWER = mégsem" mrobe100: "DISPLAY = mégsem" gigabeats: "VISSZA = mégsem" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_gb,gigabeatf: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,h10_gb,gigabeatfx: "" @@ -4688,14 +4688,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=OK KI=Mégsem" ipod*: "SELECT=OK MENU=Mégsem" - h10,h10_5gb: "SELECT=OK PREV=Mégsem" + iriverh10,iriverh10_5gb: "SELECT=OK PREV=Mégsem" gigabeats: "SELECT=OK POWER=Mégsem" @@ -5869,17 +5869,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofon" - h100,h120,h300: "Belső mikrofon" + iriverh100,iriverh120,iriverh300: "Belső mikrofon" *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" @@ -5905,15 +5905,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" @@ -6843,11 +6843,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Puffer:" - player: "Puf:" + archosplayer: "Puf:" *: "" @@ -6859,13 +6859,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Akku: %d%% %d óra %d perc" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Akku: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dh %dm" *: "Battery level" @@ -6923,18 +6923,18 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD" + sansae200*,sansac200*,sansafuze*: "mSD" ondio*: "MMC:" *: none - e200*,c200*,fuze*: "micro Secure Digital card:" + sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:" ondio*: "Multimedia card" @@ -8046,15 +8046,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Vége a számok listájának" - player: "Lista vége" + archosplayer: "Lista vége" *: "End of Song List" - player: "End of List" + archosplayer: "End of List" @@ -8294,20 +8294,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "A merevlemez tele van. Folytatáshoz nyomj OFF-ot." - h100,h120,h300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot." - m5,x5: "A merevlemez tele van. Folytatáshoz nyomd meg a POWER gombot." - e200*,c200*: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot." + iriverh100,iriverh120,iriverh300: "A merevlemez tele van. Folytatáshoz nyomj STOP-ot." + iaudiom5,iaudiox5: "A merevlemez tele van. Folytatáshoz nyomd meg a POWER gombot." + sansae200*,sansac200*: "A merevlemez tele van. Folytatáshoz nyomd meg a PREV gombot." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8391,25 +8391,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF - megszakít" - player,h100,h120,h300: "STOP - megszakít" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP - megszakít" ipod*: "PLAY/PAUSE - megszakít" - x5,m5: "PLAY hosszan - megszakít" - h10,h10_5gb,e200*,c200*: "PREV - megszakít" + iaudiox5,iaudiom5: "PLAY hosszan - megszakít" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV - megszakít" gigabeats: "VISSZA - megszakít" - gigabeatf: "POWER - megszakít" + gigabeatfx: "POWER - megszakít" *: "" @@ -8633,19 +8633,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Top off charge" + archosrecorder: "Top off charge" @@ -10461,7 +10461,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11385,15 +11385,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Érintőpad érzékenysége" + gigabeatfx: "Érintőpad érzékenysége" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" @@ -12200,15 +12200,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Magas" + gigabeatfx: "Magas" *: none - gigabeatf: "High" + gigabeatfx: "High" Index: apps/lang/walon.lang =================================================================== --- apps/lang/walon.lang (revision 23734) +++ apps/lang/walon.lang (working copy) @@ -266,17 +266,17 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Oyi" cowond2*: "MENU = Oyi" - h100,h120,h300: "NAVI = Oyi" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oyi" + iriverh100,iriverh120,iriverh300: "NAVI = Oyi" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oyi" mrobe500: "PLAY or POWER = Oyi" - player: "(PLAY/STOP)" + archosplayer: "(PLAY/STOP)" *: "" @@ -288,15 +288,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Tolminme kés ôtes = Neni" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2389,19 +2389,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Bastixhaedje del båze di dnêyes... %d di trovés (OFF po-z eraler en erî)" - h100,h120,h300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)" + iriverh100,iriverh120,iriverh300: "Bastixhaedje del båze di dnêyes... %d di trovés (STOP po-z eraler en erî)" ipod*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)" - x5,m5,gigabeat*,mrobe100: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)" - h10,h10_5gb,e200*,c200*,fuze*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)" - sa9200: "Bastixhaedje del båze di dnêyes... %d di trovés (REW po-z eraler en erî)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bastixhaedje del båze di dnêyes... %d di trovés (LEFT po-z eraler en erî)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Bastixhaedje del båze di dnêyes... %d di trovés (PREV po-z eraler en erî)" + gogearsa9200: "Bastixhaedje del båze di dnêyes... %d di trovés (REW po-z eraler en erî)" *: "intrêyes trovêyes pol båze di dnêyes" @@ -3201,7 +3201,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3215,7 +3215,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3229,7 +3229,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3861,17 +3861,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Tins k' les botons s' loumèt" - fuze*,e200*: "Tins ki l' rôlete si loume" + sansafuze*,sansae200*: "Tins ki l' rôlete si loume" *: none button_light: "Tins k' les botons s' loumèt" - fuze*,e200*: "Tins ki l' rôlete si loume" + sansafuze*,sansae200*: "Tins ki l' rôlete si loume" @@ -4153,21 +4153,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Eployî" mrobe500: "HEART = Eployî" - h100,h120,h300: "NAVI = Eployî" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Eployî" - sa9200: "PLAY = Eployî" + iriverh100,iriverh120,iriverh300: "NAVI = Eployî" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Eployî" + gogearsa9200: "PLAY = Eployî" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4178,31 +4178,31 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Rinoncî" mrobe500: "POWER = Rinoncî" - h100,h120,h300: "STOP = Rinoncî" - ipod*,c200*: "MENU = Rinoncî" - x5,m5: "RECORD = Rinoncî" - h10,h10_5gb,e200*,fuze*: "PREV = Rinoncî" - gigabeatf: "POWER = Rinoncî" + iriverh100,iriverh120,iriverh300: "STOP = Rinoncî" + ipod*,sansac200*: "MENU = Rinoncî" + iaudiox5,iaudiom5: "RECORD = Rinoncî" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Rinoncî" + gigabeatfx: "POWER = Rinoncî" mrobe100: "DISPLAY = Rinoncî" gigabeats: "BACK = Rinoncî" - sa9200: "LEFT = Rinoncî" + gogearsa9200: "LEFT = Rinoncî" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4725,14 +4725,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Set OFF=Rinoncî" ipod*: "SELECT=Set MENU=Rinoncî" - h10,h10_5gb: "SELECT=Defini PREV=Rinoncî" + iriverh10,iriverh10_5gb: "SELECT=Defini PREV=Rinoncî" gigabeats: "SELECT=Defini POWER=Rinoncî" @@ -5907,17 +5907,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Dvintrin micro" - h100,h120,h300: "Dvintrin micro" + iriverh100,iriverh120,iriverh300: "Dvintrin micro" *: none recording: "Dvintrin micro" - h100,h120,h300: "Dvintrin micro" + iriverh100,iriverh120,iriverh300: "Dvintrin micro" @@ -5943,15 +5943,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Intrêye" + recording,archosplayer: "Intrêye" *: none - recording,player: "intrêye" + recording,archosplayer: "intrêye" @@ -6881,11 +6881,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Tampon:" - player: "Tamp.:" + archosplayer: "Tamp.:" *: "Tampon" @@ -6897,13 +6897,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batreye: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batr: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batr: %d%% %dh %dm" *: "Livea del batreye" @@ -6961,19 +6961,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "DP1" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "D P 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8085,11 +8085,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Coron del djivêye di boket" - player: "Coron del djivêye" + archosplayer: "Coron del djivêye" *: "Coron del djivêye di boket" @@ -8332,20 +8332,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Li plake est plinne. Tchôkîz OFF et tcheryî pus lon." - h100,h120,h300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon." - m5,x5: "Li plake est plinne. Tchôkîz POWER et tcheryî pus lon." - e200*,c200*: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon." + iriverh100,iriverh120,iriverh300: "Li plake est plinne. Tchôkîz STOP et tcheryî pus lon." + iaudiom5,iaudiox5: "Li plake est plinne. Tchôkîz POWER et tcheryî pus lon." + sansae200*,sansac200*: "Li plake est plinne. Tchôkîz PREV et tcheryî pus lon." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8429,25 +8429,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF po-z abandner" - player,h100,h120,h300: "STOP po-z abandner" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP po-z abandner" ipod*: "PLAY/PAUSE po-z abandner" - x5,m5: "Long PLAY po-z abandner" - h10,h10_5gb,e200*,c200*: "PREV po-z abandner" + iaudiox5,iaudiom5: "Long PLAY po-z abandner" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV po-z abandner" gigabeats: "BACK po-z abandner" - gigabeatf:"POWER po-z abandner" + gigabeatfx:"POWER po-z abandner" *: "" @@ -8671,19 +8671,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batreye: pår ritcherdjeye" + archosrecorder: "Batreye: pår ritcherdjeye" *: none - recorder: "Batreye: pår ritcherdjeye" + archosrecorder: "Batreye: pår ritcherdjeye" @@ -10500,7 +10500,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11711,15 +11711,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Tinrûlisté do pavé-taprece" + gigabeatfx: "Tinrûlisté do pavé-taprece" *: none - gigabeatf: "Tinrûlisté do pavé-taprece" + gigabeatfx: "Tinrûlisté do pavé-taprece" @@ -11728,15 +11728,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Hôte" + gigabeatfx: "Hôte" *: none - gigabeatf: "Hôte" + gigabeatfx: "Hôte" Index: apps/lang/arabic.lang =================================================================== --- apps/lang/arabic.lang (revision 23734) +++ apps/lang/arabic.lang (working copy) @@ -3851,15 +3851,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "عالى" + gigabeatfx: "عالى" *: none - gigabeatf: "High" + gigabeatfx: "High" @@ -4286,19 +4286,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "جاري بناء قاعدة البيانات... عثر على d% (إيقاف للعودة)" - h100,h120,h300: "جاري بناء قاعدة البيانات... عثر على d% (إيقاف للعودة)" + iriverh100,iriverh120,iriverh300: "جاري بناء قاعدة البيانات... عثر على d% (إيقاف للعودة)" ipod*: "جاري بناء قاعدة البيانات... عثر على d% (السابق للعودة)" - x5,m5,gigabeat*,mrobe100: "جاري بناء قاعدة البيانات... عثر على d% (يسار للعودة)" - h10,h10_5gb,e200*,c200*,fuze*: "جاري بناء قاعدة البيانات... عثر على d% (يسار للعودة)" - sa9200: "جاري بناء قاعدة البيانات... عثر على d% (يسار للعودة)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "جاري بناء قاعدة البيانات... عثر على d% (يسار للعودة)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "جاري بناء قاعدة البيانات... عثر على d% (يسار للعودة)" + gogearsa9200: "جاري بناء قاعدة البيانات... عثر على d% (يسار للعودة)" *: "المدخلات التي عثر عليها لفاعدة البيانات" @@ -4673,7 +4673,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -4834,15 +4834,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "حساسية اللمس" + gigabeatfx: "حساسية اللمس" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" @@ -5444,16 +5444,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "القرص مملوء. اضغط إيقاف للاستمرار." - h100,h120,h300: "القرص مملوء. اضغط إيقاف للاستمرار." - m5,x5: "القرص مملوء. اضغط زر التشغيل للاستمرار." - e200*,c200*: "القرص مملوء. اضغط السابق للاستمرار." + iriverh100,iriverh120,iriverh300: "القرص مملوء. اضغط إيقاف للاستمرار." + iaudiom5,iaudiox5: "القرص مملوء. اضغط زر التشغيل للاستمرار." + sansae200*,sansac200*: "القرص مملوء. اضغط السابق للاستمرار." *: none @@ -6064,7 +6064,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -6249,17 +6249,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "ميكروفون" - h100,h120,h300: "ميكروفون داخلي" + iriverh100,iriverh120,iriverh300: "ميكروفون داخلي" *: none recording: "ميكروفون" - h100,h120,h300: "ميكروفون داخلي" + iriverh100,iriverh120,iriverh300: "ميكروفون داخلي" @@ -6899,15 +6899,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "أي آخر = لا" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -7003,11 +7003,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "نهاية القائمة" - player: "نهاية القائمة الاغنية" + archosplayer: "نهاية القائمة الاغنية" *: "نهاية القائمة الاغنية" @@ -7549,26 +7549,26 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Revert" - h100,h120,h300: "عرض = إاغاء الأمر" - ipod*,c200*: "قائمة = إاغاء الأمر" - x5,m5: "سجل = إاغاء الأمر" - h10,h10_5gb,e200*,fuze*: "السابق = إاغاء الأمر" - gigabeatf: "طاقة = إاغاء الأمر" + iriverh100,iriverh120,iriverh300: "عرض = إاغاء الأمر" + ipod*,sansac200*: "قائمة = إاغاء الأمر" + iaudiox5,iaudiom5: "سجل = إاغاء الأمر" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "السابق = إاغاء الأمر" + gigabeatfx: "طاقة = إاغاء الأمر" mrobe100: "DISPLAY = Revert" gigabeats: "خلف = إاغاء الأمر" - sa9200: "يسار = إاغاء الأمر" + gogearsa9200: "يسار = إاغاء الأمر" *: none Index: apps/lang/russian.lang =================================================================== --- apps/lang/russian.lang (revision 23734) +++ apps/lang/russian.lang (working copy) @@ -2051,15 +2051,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Линейный вход" + recording,archosplayer: "Линейный вход" *: none - recording,player: "Линейный вход" + recording,archosplayer: "Линейный вход" @@ -2305,17 +2305,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Микрофон" - h100,h120,h300: "Внутренний микрофон" + iriverh100,iriverh120,iriverh300: "Внутренний микрофон" *: none recording: "Микрофон" - h100,h120,h300: "Внутренний микрофон" + iriverh100,iriverh120,iriverh300: "Внутренний микрофон" @@ -3068,7 +3068,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3082,7 +3082,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3096,7 +3096,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3986,19 +3986,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Аккумулятор: Выше возможного" + archosrecorder: "Аккумулятор: Выше возможного" *: none - recorder: "Аккумулятор: Выше возможного" + archosrecorder: "Аккумулятор: Выше возможного" @@ -4024,13 +4024,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "%d%% %dч %dм" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dм" - h10,ipodmini,ipodmini2g: "%d%% %dч %dм" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм" + iriverh10,ipodmini1g,ipodmini2g: "%d%% %dч %dм" *: "Заряд аккумулятора" @@ -4088,19 +4088,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "Эйч Ди 1" - e200*,c200*,fuze*: "микро Эс Ди" + sansae200*,sansac200*,sansafuze*: "микро Эс Ди" ondio*: "Эм Эм Си" @@ -4232,22 +4232,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "ВЫКЛ. = Отмена" - h100,h120,h300: "СТОП = Отмена" - ipod*,c200*,sa9200: "МЕНЮ = Отмена" - x5,m5: "ЗАПИСЬ = Отмена" - h10,h10_5gb,e200*,fuze*: "ПРЕД. = Отмена" - gigabeatf: "ВЫКЛ. = Отмена" + iriverh100,iriverh120,iriverh300: "СТОП = Отмена" + ipod*,sansac200*,gogearsa9200: "МЕНЮ = Отмена" + iaudiox5,iaudiom5: "ЗАПИСЬ = Отмена" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПРЕД. = Отмена" + gigabeatfx: "ВЫКЛ. = Отмена" mrobe100: "ПОКАЗ. = Отмена" gigabeats: "НАЗАД = Отмена" @@ -4330,16 +4330,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Диск заполнен. Нажмите ВЫКЛ. для продолжения." - h100,h120,h300: "Диск заполнен. Нажмите СТОП для продолжения." - m5,x5: "Диск заполнен. Нажмите ВЫКЛ. для продолжения." - e200*,c200*: "Диск заполнен. Нажмите ПРЕД. для продолжения." + iriverh100,iriverh120,iriverh300: "Диск заполнен. Нажмите СТОП для продолжения." + iaudiom5,iaudiox5: "Диск заполнен. Нажмите ВЫКЛ. для продолжения." + sansae200*,sansac200*: "Диск заполнен. Нажмите ПРЕД. для продолжения." *: none @@ -4506,21 +4506,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "ВОСПР.=Уст., ВЫКЛ.=Отм." ipod*: "ВЫБОР=Уст., МЕНЮ=Отм." - h10,h10_5gb: "ВЫБОР=Уст., ПРЕД.=Отм." + iriverh10,iriverh10_5gb: "ВЫБОР=Уст., ПРЕД.=Отм." gigabeats: "ВЫБОР=Уст., ВЫКЛ.=Отм." *: none alarm: "" ipod*: "" - h10,h10_5gb: "" + iriverh10,iriverh10_5gb: "" gigabeats: "" @@ -6942,25 +6942,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "ВЫКЛ. для отмены" - player,h100,h120,h300: "СТОП для отмены" + archosplayer,iriverh100,iriverh120,iriverh300: "СТОП для отмены" ipod*: "ПАУЗА для отмены" - x5,m5: "ВОСПР. для отмены" - h10,h10_5gb,e200*,c200*: "ПРЕД. для отмены" + iaudiox5,iaudiom5: "ВОСПР. для отмены" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "ПРЕД. для отмены" gigabeats: "НАЗАД для отмены" - gigabeatf: "ВЫКЛ. для отмены" + gigabeatfx: "ВЫКЛ. для отмены" *: "" @@ -7768,7 +7768,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -8136,17 +8136,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Построение базы... %d найдено (ВЫКЛ. для отмены)" - h100,h120,h300: "Построение базы... %d найдено (СТОП для отмены)" + iriverh100,iriverh120,iriverh300: "Построение базы... %d найдено (СТОП для отмены)" ipod*: "Построение базы... %d найдено (ПРЕД. для отмены)" - x5,m5,gigabeat*,mrobe100: "Построение базы... %d найдено (ВЛЕВО для отмены)" - h10,h10_5gb,e200*,c200*,sa9200: "Построение базы... %d найдено (ПРЕД. для отмены)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Построение базы... %d найдено (ВЛЕВО для отмены)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Построение базы... %d найдено (ПРЕД. для отмены)" *: "найдено записей в базе" @@ -8826,11 +8826,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Буфер:" - player: "Буф:" + archosplayer: "Буф:" *: "Буфер:" @@ -8918,21 +8918,21 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "ВОСПР. = Да" - h100,h120,h300: "НАВИГ. = Да" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "ВЫБОР = Да" - player: "(ВОСПР./СТОП)" + iriverh100,iriverh120,iriverh300: "НАВИГ. = Да" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "ВЫБОР = Да" + archosplayer: "(ВОСПР./СТОП)" *: "" - h100,h120,h300: "" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "" - player: "" + iriverh100,iriverh120,iriverh300: "" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "" + archosplayer: "" @@ -8942,20 +8942,20 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ВКЛ. = Установить" - h100,h120,h300: "НАВИГ. = Установить" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "ВЫБОР = Установить" + iriverh100,iriverh120,iriverh300: "НАВИГ. = Установить" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "ВЫБОР = Установить" *: none rtc: "" - h100,h120,h300: "" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + iriverh100,iriverh120,iriverh300: "" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -8964,15 +8964,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Любая другая = Нет" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -9296,11 +9296,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Конец списка" - player: "Конец списка" + archosplayer: "Конец списка" *: "Конец списка" @@ -10928,17 +10928,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Таймаут подсветки клавиш" - fuze*,e200*: "Таймаут подсветки колёсика" + sansafuze*,sansae200*: "Таймаут подсветки колёсика" *: none button_light: "Таймаут подсветки клавиш" - fuze*,e200*: "Таймаут подсветки колёсика" + sansafuze*,sansae200*: "Таймаут подсветки колёсика" @@ -11589,15 +11589,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Чувствительность тачпада" + gigabeatfx: "Чувствительность тачпада" *: none - gigabeatf: "Чувствительность тачпада" + gigabeatfx: "Чувствительность тачпада" @@ -11805,15 +11805,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Высокий" + gigabeatfx: "Высокий" *: none - gigabeatf: "Высокий" + gigabeatfx: "Высокий" Index: apps/lang/thai.lang =================================================================== --- apps/lang/thai.lang (revision 23734) +++ apps/lang/thai.lang (working copy) @@ -261,15 +261,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = ใช่" - h100,h120,h300: "NAVI = ใช่" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = ใช่" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = ใช่" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = ใช่" + archosplayer: "(PLAY/STOP)" *: "" @@ -281,15 +281,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "ปุ่มอื่นๆ = ไม่ใช่" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2365,17 +2365,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (OFF เพื่อย้อนกลับ)" - h100,h120,h300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)" + iriverh100,iriverh120,iriverh300: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (STOP เพื่อย้อนกลับ)" ipod*: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)" - x5,m5,gigabeat*,mrobe100: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)" - h10,h10_5gb,e200*,c200*,sa9200: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (LEFT เพื่อย้อนกลับ)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "กำลังสร้างฐานข้อมูล...พบแล้ว %d (PREV เพื่อย้อนกลับ)" *: "entries found for database" @@ -3175,7 +3175,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3189,7 +3189,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3203,7 +3203,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3835,17 +3835,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "เวลาเปิดไฟปุ่ม" - fuze*,e200*: "เวลาเปิดไฟล้อหมุน" + sansafuze*,sansae200*: "เวลาเปิดไฟล้อหมุน" *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" @@ -4109,14 +4109,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = ตั้งค่า" - h100,h120,h300: "NAVI = ตั้งค่า" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = ตั้งค่า" + iriverh100,iriverh120,iriverh300: "NAVI = ตั้งค่า" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = ตั้งค่า" *: none @@ -4129,22 +4129,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = ยกเลิก" - h100,h120,h300: "STOP = ยกเลิก" - ipod*,c200*,sa9200: "MENU = ยกเลิก" - x5,m5: "RECORD = ยกเลิก" - h10,h10_5gb,e200*,fuze*: "PREV = ยกเลิก" - gigabeatf: "POWER = ยกเลิก" + iriverh100,iriverh120,iriverh300: "STOP = ยกเลิก" + ipod*,sansac200*,gogearsa9200: "MENU = ยกเลิก" + iaudiox5,iaudiom5: "RECORD = ยกเลิก" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ยกเลิก" + gigabeatfx: "POWER = ยกเลิก" mrobe100: "DISPLAY = ยกเลิก" gigabeats: "BACK = ยกเลิก" @@ -4672,14 +4672,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=ตั้งเวลา OFF=ยกเลิก" ipod*: "SELECT=ตั้งเวลา MENU=ยกเลิก" - h10,h10_5gb: "SELECT=ตั้งเวลา PREV=ยกเลิก" + iriverh10,iriverh10_5gb: "SELECT=ตั้งเวลา PREV=ยกเลิก" gigabeats: "SELECT=ตั้งเวลา POWER=ยกเลิก" @@ -5853,17 +5853,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "ไมโครโฟน" - h100,h120,h300: "ไมโครโฟนภายใน" + iriverh100,iriverh120,iriverh300: "ไมโครโฟนภายใน" *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" @@ -5889,15 +5889,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" @@ -6827,11 +6827,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "บัฟเฟอร์:" - player: "บัฟเฟอร์:" + archosplayer: "บัฟเฟอร์:" *: "" @@ -6843,13 +6843,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "แบตเตอรี่: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "แบต: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "แบต: %d%% %dh %dm" *: "Battery level" @@ -6907,19 +6907,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro Secure Digital card:" + sansae200*,sansac200*,sansafuze*: "micro Secure Digital card:" ondio*: "Multimedia card" @@ -8031,15 +8031,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "สิ้นสุดรายการเพลง" - player: "สิ้นสุดรายการ" + archosplayer: "สิ้นสุดรายการ" *: "End of Song List" - player: "End of List" + archosplayer: "End of List" @@ -8279,20 +8279,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "ดีสก์เต็ม กดปุ่ม OFF เพื่อทำงานต่อ" - h100,h120,h300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ" - m5,x5: "ดีสก์เต็ม กดปุ่ม POWER เพื่อทำงานต่อ" - e200*,c200*: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ" + iriverh100,iriverh120,iriverh300: "ดีสก์เต็ม กดปุ่ม STOP เพื่อทำงานต่อ" + iaudiom5,iaudiox5: "ดีสก์เต็ม กดปุ่ม POWER เพื่อทำงานต่อ" + sansae200*,sansac200*: "ดีสก์เต็ม กดปุ่ม PREV เพื่อทำงานต่อ" *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8376,25 +8376,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF เพื่อยกเลิก" - player,h100,h120,h300: "STOP เพื่อยกเลิก" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP เพื่อยกเลิก" ipod*: "PLAY/PAUSE เพื่อยกเลิก" - x5,m5: "Long PLAY เพื่อยกเลิก" - h10,h10_5gb,e200*,c200*: "PREV เพื่อยกเลิก" + iaudiox5,iaudiom5: "Long PLAY เพื่อยกเลิก" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV เพื่อยกเลิก" gigabeats: "BACK เพื่อยกเลิก" - gigabeatf: "POWER เพื่อยกเลิก" + gigabeatfx: "POWER เพื่อยกเลิก" *: "" @@ -8618,19 +8618,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "แบตเตอรี่: ชาร์จสูงสุด" + archosrecorder: "แบตเตอรี่: ชาร์จสูงสุด" *: none - recorder: "Top off charge" + archosrecorder: "Top off charge" @@ -10447,7 +10447,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11571,15 +11571,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "ความไวแผ่นสัมผัส" + gigabeatfx: "ความไวแผ่นสัมผัส" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" @@ -12104,14 +12104,14 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "สูง" + gigabeatfx: "สูง" *: none - gigabeatf: "High" + gigabeatfx: "High" Index: apps/lang/catala.lang =================================================================== --- apps/lang/catala.lang (revision 23734) +++ apps/lang/catala.lang (working copy) @@ -261,15 +261,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Si" - h100,h120,h300: "NAVI = Si" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Si" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Si" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Si" + archosplayer: "(PLAY/STOP)" *: "" @@ -281,15 +281,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Qualsevol altre = No" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2362,17 +2362,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Construint Base de dades... %d trobats (OFF per tornar)" - h100,h120,h300: "Construint Base de dades... %d trobats (STOP per tornar)" + iriverh100,iriverh120,iriverh300: "Construint Base de dades... %d trobats (STOP per tornar)" ipod*: "Construint Base de dades... %d trobats (PREV per tornar)" - x5,m5,gigabeat*,mrobe100: "Construint Base de dades... %d trobats (LEFT per tornar)" - h10,h10_5gb,e200*,c200*,sa9200: "Construint Base de dades... %d trobats (PREV per tornar)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construint Base de dades... %d trobats (LEFT per tornar)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construint Base de dades... %d trobats (PREV per tornar)" *: "entrades trobades per base de dades" @@ -3172,7 +3172,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3186,7 +3186,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3200,7 +3200,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3830,17 +3830,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Apagat de llum de botons" - fuze*,e200*: "Apagat de llum de roda" + sansafuze*,sansae200*: "Apagat de llum de roda" *: none button_light: "Apagat de llum de botons" - fuze*,e200*: "Apagat de llum de roda" + sansafuze*,sansae200*: "Apagat de llum de roda" @@ -4121,18 +4121,18 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Desar" - h100,h120,h300: "NAVI = Desar" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Desar" + iriverh100,iriverh120,iriverh300: "NAVI = Desar" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Desar" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4142,28 +4142,28 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Cancel·lar" - h100,h120,h300: "STOP = Cancel·lar" - ipod*,c200*,sa9200: "MENU = Cancel·lar" - x5,m5: "RECORD = Cancel·lar" - h10,h10_5gb,e200*,fuze*: "PREV = Cancel·lar" - gigabeatf: "POWER = Cancel·lar" + iriverh100,iriverh120,iriverh300: "STOP = Cancel·lar" + ipod*,sansac200*,gogearsa9200: "MENU = Cancel·lar" + iaudiox5,iaudiom5: "RECORD = Cancel·lar" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancel·lar" + gigabeatfx: "POWER = Cancel·lar" mrobe100: "DISPLAY = Cancel·lar" gigabeats: "BACK = Cancel·lar" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4685,14 +4685,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Accepta OFF=Anul·lar" ipod*: "SELECT=Accepta MENU=Anul·lar" - h10,h10_5gb: "SELECT=Accepta PREV=Anul·lar" + iriverh10,iriverh10_5gb: "SELECT=Accepta PREV=Anul·lar" gigabeats: "SELECT=Accepta POWER=Anul·lar" @@ -5865,17 +5865,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Micròfon" - h100,h120,h300: "Micròfon intern" + iriverh100,iriverh120,iriverh300: "Micròfon intern" *: none recording: "Micròfon" - h100,h120,h300: "Micròfon intern" + iriverh100,iriverh120,iriverh300: "Micròfon intern" @@ -5901,15 +5901,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Línia d'entrada" + recording,archosplayer: "Línia d'entrada" *: none - recording,player: "Línia d'entrada" + recording,archosplayer: "Línia d'entrada" @@ -6839,15 +6839,15 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Mida de Buffer" - player: "" + archosplayer: "" @@ -6856,13 +6856,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Bateria: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm" *: "Nivell de batería" @@ -6920,19 +6920,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8042,15 +8042,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Fi de la Llista de Cançons" - player: "Fi Llista" + archosplayer: "Fi Llista" *: "Fi de la Llista de Cançons" - player: "Fi Llista" + archosplayer: "Fi Llista" @@ -8290,20 +8290,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disc ple. Prem OFF per continuar" - h100,h120,h300: "Disc ple. Prem STOP per continuar" - m5,x5: "Disc ple. Prem POWER per continuar" - e200*,c200*: "Disc ple. Prem PREV per continuar" + iriverh100,iriverh120,iriverh300: "Disc ple. Prem STOP per continuar" + iaudiom5,iaudiox5: "Disc ple. Prem POWER per continuar" + sansae200*,sansac200*: "Disc ple. Prem PREV per continuar" *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8387,25 +8387,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF per a cancelar" - player,h100,h120,h300: "STOP per a cancelar" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP per a cancelar" ipod*: "PLAY/PAUSE per a cancelar" - x5,m5: "Long PLAY per a cancelar" - h10,h10_5gb,e200*,c200*: "PREV per a cancelar" + iaudiox5,iaudiom5: "Long PLAY per a cancelar" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV per a cancelar" gigabeats: "BACK per a cancelar" - gigabeatf: "POWER per a cancelar" + gigabeatfx: "POWER per a cancelar" *: "" @@ -8629,19 +8629,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batería: Top-Off Chg" + archosrecorder: "Batería: Top-Off Chg" *: none - recorder: "Batería: Top-Off Chg" + archosrecorder: "Batería: Top-Off Chg" @@ -10458,7 +10458,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11669,15 +11669,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensibilitat de Touchpad" + gigabeatfx: "Sensibilitat de Touchpad" *: none - gigabeatf: "Sensibilitat de Touchpad" + gigabeatfx: "Sensibilitat de Touchpad" @@ -11686,15 +11686,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Alta" + gigabeatfx: "Alta" *: none - gigabeatf: "Alta" + gigabeatfx: "Alta" Index: apps/lang/francais.lang =================================================================== --- apps/lang/francais.lang (revision 23734) +++ apps/lang/francais.lang (working copy) @@ -292,17 +292,17 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Oui" cowond2*: "MENU = Oui" - h100,h120,h300: "NAVI = Oui" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oui" + iriverh100,iriverh120,iriverh300: "NAVI = Oui" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oui" mrobe500: "PLAY ou POWER = Oui" - player: "(PLAY/STOP)" + archosplayer: "(PLAY/STOP)" *: "" @@ -314,15 +314,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Autres = Non" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2415,19 +2415,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Création base de données... %d trouvés (OFF = retour)" - h100,h120,h300: "Création base de données... %d trouvés (STOP = retour)" + iriverh100,iriverh120,iriverh300: "Création base de données... %d trouvés (STOP = retour)" ipod*: "Création base de données... %d trouvés (PREV = retour)" - x5,m5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)" - h10,h10_5gb,e200*,c200*,fuze*: "Création base de données... %d trouvés (PREV = retour)" - sa9200: "Création base de données... %d trouvés (REW = retour)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Création base de données... %d trouvés (LEFT = retour)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Création base de données... %d trouvés (PREV = retour)" + gogearsa9200: "Création base de données... %d trouvés (REW = retour)" *: "entrées trouvées pour base de données" @@ -3227,7 +3227,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3241,7 +3241,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3255,7 +3255,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3887,17 +3887,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Durée de l'éclairage des touches" - fuze*,e200*: "Durée de l'éclairage de la molette" + sansafuze*,sansae200*: "Durée de l'éclairage de la molette" *: none button_light: "Durée de l'éclairage des touches" - fuze*,e200*: "Durée de l'éclairage de la molette" + sansafuze*,sansae200*: "Durée de l'éclairage de la molette" @@ -4179,21 +4179,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Valider" mrobe500: "HEART = Valider" - h100,h120,h300: "NAVI = Valider" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Valider" - sa9200: "PLAY = Valider" + iriverh100,iriverh120,iriverh300: "NAVI = Valider" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Valider" + gogearsa9200: "PLAY = Valider" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4204,31 +4204,31 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Annuler" mrobe500: "POWER = Annuler" - h100,h120,h300: "STOP = Annuler" - ipod*,c200*: "MENU = Annuler" - x5,m5: "RECORD = Annuler" - h10,h10_5gb,e200*,fuze*: "PREV = Annuler" - gigabeatf: "POWER = Annuler" + iriverh100,iriverh120,iriverh300: "STOP = Annuler" + ipod*,sansac200*: "MENU = Annuler" + iaudiox5,iaudiom5: "RECORD = Annuler" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annuler" + gigabeatfx: "POWER = Annuler" mrobe100: "DISPLAY = Annuler" gigabeats: "BACK = Annuler" - sa9200: "LEFT = Annuler" + gogearsa9200: "LEFT = Annuler" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4751,14 +4751,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Set OFF=Annuler" ipod*: "SELECT=Set MENU=Annuler" - h10,h10_5gb: "SELECT=Valider PREV=Annuler" + iriverh10,iriverh10_5gb: "SELECT=Valider PREV=Annuler" gigabeats: "SELECT=Valider POWER=Annuler" @@ -5933,17 +5933,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Micro intégré" - h100,h120,h300: "Micro intégré" + iriverh100,iriverh120,iriverh300: "Micro intégré" *: none recording: "Micro intégré" - h100,h120,h300: "Micro intégré" + iriverh100,iriverh120,iriverh300: "Micro intégré" @@ -5969,15 +5969,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Entrée ligne" + recording,archosplayer: "Entrée ligne" *: none - recording,player: "Entrée ligne" + recording,archosplayer: "Entrée ligne" @@ -6907,11 +6907,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Tampon:" - player: "Tamp.:" + archosplayer: "Tamp.:" *: "Tampon" @@ -6923,13 +6923,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Niveau de la batterie" @@ -6987,19 +6987,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "DD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "D D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8111,11 +8111,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Fin de la liste de lecture" - player: "Fin de la liste" + archosplayer: "Fin de la liste" *: "Fin de la liste de lecture" @@ -8358,20 +8358,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disque plein. Presser OFF pour continuer." - h100,h120,h300: "Disque plein. Presser STOP pour continuer." - m5,x5: "Disque plein. Presser POWER pour continuer." - e200*,c200*: "Disque plein. Presser PREV pour continuer." + iriverh100,iriverh120,iriverh300: "Disque plein. Presser STOP pour continuer." + iaudiom5,iaudiox5: "Disque plein. Presser POWER pour continuer." + sansae200*,sansac200*: "Disque plein. Presser PREV pour continuer." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8455,25 +8455,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF pour Annuler" - player,h100,h120,h300: "STOP pour Annuler" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP pour Annuler" ipod*: "PLAY/PAUSE pour Annuler" - x5,m5: "Long PLAY pour Annuler" - h10,h10_5gb,e200*,c200*: "PREV pour Annuler" + iaudiox5,iaudiom5: "Long PLAY pour Annuler" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pour Annuler" gigabeats: "BACK pour Annuler" - gigabeatf: "POWER pour Annuler" + gigabeatfx: "POWER pour Annuler" *: "" @@ -8697,19 +8697,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batterie: charge max." + archosrecorder: "Batterie: charge max." *: none - recorder: "Charge maximale de la batterie" + archosrecorder: "Charge maximale de la batterie" @@ -10526,7 +10526,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11737,15 +11737,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensibilité du pavé tactile" + gigabeatfx: "Sensibilité du pavé tactile" *: none - gigabeatf: "Sensibilité du pavé tactile" + gigabeatfx: "Sensibilité du pavé tactile" @@ -11754,15 +11754,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Haute" + gigabeatfx: "Haute" *: none - gigabeatf: "Haute" + gigabeatfx: "Haute" Index: apps/lang/japanese.lang =================================================================== --- apps/lang/japanese.lang (revision 23734) +++ apps/lang/japanese.lang (working copy) @@ -266,16 +266,16 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = はい" - h100,h120,h300: "NAVI = はい" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = はい" + iriverh100,iriverh120,iriverh300: "NAVI = はい" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = はい" mrobe500: "PLAY or POWER = はい" - player: "(PLAY/STOP)" + archosplayer: "(PLAY/STOP)" *: "" @@ -287,15 +287,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "[それ以外] = いいえ" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2388,19 +2388,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "データベース構築中... %d 件 (OFFで戻る)" - h100,h120,h300: "データベース構築中... %d 件 (STOPで戻る)" + iriverh100,iriverh120,iriverh300: "データベース構築中... %d 件 (STOPで戻る)" ipod*: "データベース構築中... %d 件 (PLAY/PAUSEで戻る)" - x5,m5,gigabeat*,mrobe100: "データベース構築中... %d 件 (左で戻る)" - h10,h10_5gb,e200*,c200*,fuze*: "データベース構築中... %d 件 (PREVで戻る)" - sa9200: "データベース構築中... %d 件 (REWで戻る)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "データベース構築中... %d 件 (左で戻る)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "データベース構築中... %d 件 (PREVで戻る)" + gogearsa9200: "データベース構築中... %d 件 (REWで戻る)" *: "データベースに登録" @@ -3200,7 +3200,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3214,7 +3214,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3228,7 +3228,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3860,17 +3860,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "ボタンライトのタイムアウト" - fuze*,e200*: "ホイールライトのタイムアウト" + sansafuze*,sansae200*: "ホイールライトのタイムアウト" *: none button_light: "ボタンライトのタイムアウト" - fuze*,e200*: "ホイールライトのタイムアウト" + sansafuze*,sansae200*: "ホイールライトのタイムアウト" @@ -4152,21 +4152,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = 設定" mrobe500: "HEART = 設定" - h100,h120,h300: "NAVI = 設定" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = 設定" - sa9200: "PLAY = 設定" + iriverh100,iriverh120,iriverh300: "NAVI = 設定" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = 設定" + gogearsa9200: "PLAY = 設定" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4177,31 +4177,31 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = 元に戻す" mrobe500: "POWER = 元に戻す" - h100,h120,h300: "STOP = 元に戻す" - ipod*,c200*: "MENU = 元に戻す" - x5,m5: "RECORD = 元に戻す" - h10,h10_5gb,e200*,fuze*: "PREV = 元に戻す" - gigabeatf: "POWER = 元に戻す" + iriverh100,iriverh120,iriverh300: "STOP = 元に戻す" + ipod*,sansac200*: "MENU = 元に戻す" + iaudiox5,iaudiom5: "RECORD = 元に戻す" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 元に戻す" + gigabeatfx: "POWER = 元に戻す" mrobe100: "DISPLAY = 元に戻す" gigabeats: "BACK = 元に戻す" - sa9200: "LEFT = 元に戻す" + gogearsa9200: "LEFT = 元に戻す" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4724,14 +4724,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=設定 OFF=キャンセル" ipod*: "SELECT=設定 MENU=キャンセル" - h10,h10_5gb: "SELECT=設定 PREV=キャンセル" + iriverh10,iriverh10_5gb: "SELECT=設定 PREV=キャンセル" gigabeats: "SELECT=設定 POWER=キャンセル" @@ -5906,17 +5906,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "マイク" - h100,h120,h300: "内蔵のマイク" + iriverh100,iriverh120,iriverh300: "内蔵のマイク" *: none recording: "マイク" - h100,h120,h300: "内蔵のマイク" + iriverh100,iriverh120,iriverh300: "内蔵のマイク" @@ -5942,15 +5942,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "ライン入力" + recording,archosplayer: "ライン入力" *: none - recording,player: "ライン入力" + recording,archosplayer: "ライン入力" @@ -6880,11 +6880,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "バッファ:" - player: "バッファ:" + archosplayer: "バッファ:" *: "バッファサイズ" @@ -6896,13 +6896,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "バッテリー: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "バッテリー容量" @@ -6960,19 +6960,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "マイクロSD" + sansae200*,sansac200*,sansafuze*: "マイクロSD" ondio*: "マルチメディアカード" @@ -8084,11 +8084,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "プレイリストの終端です" - player: "プレイリストの終端です" + archosplayer: "プレイリストの終端です" *: "プレイリストの終端です" @@ -8331,20 +8331,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "ディスクが一杯です．停止ボタンを押してください" - h100,h120,h300: "ディスクが一杯です．停止ボタンを押してください" - m5,x5: "ディスクが一杯です．電源ボタンを押してください" - e200*,c200*: "ディスクが一杯です．PREVボタンを押してください" + iriverh100,iriverh120,iriverh300: "ディスクが一杯です．停止ボタンを押してください" + iaudiom5,iaudiox5: "ディスクが一杯です．電源ボタンを押してください" + sansae200*,sansac200*: "ディスクが一杯です．PREVボタンを押してください" *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8428,25 +8428,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF: キャンセル" - player,h100,h120,h300: "STOP: キャンセル" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP: キャンセル" ipod*: "PLAY/PAUSE: キャンセル" - x5,m5: "Long PLAY: キャンセル" - h10,h10_5gb,e200*,c200*: "PREV: キャンセル" + iaudiox5,iaudiom5: "Long PLAY: キャンセル" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV: キャンセル" gigabeats: "BACK: キャンセル" - gigabeatf: "POWER: キャンセル" + gigabeatfx: "POWER: キャンセル" *: "" @@ -8670,19 +8670,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "バッテリー: 最終充電" + archosrecorder: "バッテリー: 最終充電" *: none - recorder: "バッテリー 最終充電" + archosrecorder: "バッテリー 最終充電" @@ -10499,7 +10499,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11710,15 +11710,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "タッチパッド感度" + gigabeatfx: "タッチパッド感度" *: none - gigabeatf: "タッチパッド感度" + gigabeatfx: "タッチパッド感度" @@ -11727,15 +11727,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "高" + gigabeatfx: "高" *: none - gigabeatf: "こう" + gigabeatfx: "こう" Index: apps/lang/english.lang =================================================================== --- apps/lang/english.lang (revision 23734) +++ apps/lang/english.lang (working copy) @@ -39,55 +39,56 @@ # # All phrases have a default string like: *: "default" that will be used if no # other string matches for the particular model you build the language for. If -# you want a particular string for the iriver h300 series you'd write it like: -# h300: "h300-specific string" (below the default line). If your string isn't -# used for all targets set the default to none like: *: none (no quotes!) this -# will not include the string for target that will not need it, see -# apps/features.txt for available categories that can be used instead of the -# target name, for example: swcodec: "swcodec-specific string". +# you want a particular string for the iriverh300 series you'd write it like: +# iriverh300: "iriverh300-specific string" (below the default line). # +# If your string isn't used for all targets set the default to none like: *: +# none (no quotes!) this will not include the string for target that will not +# need it, see apps/features.txt for available categories that can be used +# instead of the target name, for example: swcodec: "swcodec-specific string". # +# # The target names used are picked from the configure script and are set in the # MODELNAME variable in the root makefile. Currently, they are: # Target Target string # Archos -# Player/Studio player -# Recorder recorder -# FM Recorder fmrecorder -# Recorder V2 recorderv2 -# Ondio SP ondiosp -# Ondio FM ondiofm +# Player/Studio archosplayer +# Recorder archosrecorder +# FM Recorder archosfmrecorder +# Recorder V2 archosrecorderv2 +# Ondio SP archosondiosp +# Ondio FM archosondiofm # iriver -# H100/H110/H115 h100 -# H120/H140 h120 -# H320/H340 h300 -# H10 h10 -# IFP 7XX ifp7xx +# H100/H110/H115 iriverh100 +# H120/H140 iriverh120 +# H320/H340 iriverh300 +# H10 iriverh10 +# IFP 7XX iriverifp7xx # iaudio -# X5 x5 -# M5 m5 +# X5 iaudiox5 +# M5 iaudiom5 # ipod # All iPods ipod* # 4G Color/Photo ipodcolor -# Nano ipodnano +# Nano ipodnano1g # Video (5G) ipodvideo # 3G ipod3g # 4G gray ipod4g -# mini ipodmini +# mini ipodmini1g # mini 2G ipodmini2g # Toshiba -# Gigabeat Fxx gigabeatf +# Gigabeat Fxx gigabeatfx # Gigabeat Sxx gigabeats # # Sandisk -# Sansa E200 e200 -# Sansa C200 c200* +# Sansa E200 sansae200 +# Sansa C200 sansac200* # # Olympus # m:robe 100 mrobe100 # # Philips -# GoGear SA9200 sa9200 +# GoGear SA9200 gogearsa9200 id: LANG_SET_BOOL_YES @@ -334,17 +335,17 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" mrobe500: "PLAY or POWER = Yes" - player: "(PLAY/STOP)" + archosplayer: "(PLAY/STOP)" *: "" @@ -356,15 +357,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Any Other = No" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2457,19 +2458,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "entries found for database" @@ -3269,7 +3270,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3283,7 +3284,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3297,7 +3298,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3929,17 +3930,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" @@ -4221,21 +4222,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4246,31 +4247,31 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4793,14 +4794,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" @@ -5975,17 +5976,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" @@ -6011,15 +6012,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" @@ -6949,11 +6950,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer size" @@ -6965,13 +6966,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Battery level" @@ -7029,19 +7030,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8153,11 +8154,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "End of Song List" @@ -8402,20 +8403,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8499,25 +8500,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "" @@ -8741,19 +8742,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Top off charge" + archosrecorder: "Top off charge" @@ -10570,7 +10571,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11781,15 +11782,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" @@ -11798,15 +11799,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "High" + gigabeatfx: "High" Index: apps/lang/czech.lang =================================================================== --- apps/lang/czech.lang (revision 23734) +++ apps/lang/czech.lang (working copy) @@ -262,15 +262,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Ano" - h100,h120,h300: "NAVI = Ano" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Ano" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Ano" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Ano" + archosplayer: "(PLAY/STOP)" *: "" @@ -282,15 +282,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Vše ostatní = Ne" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2366,17 +2366,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Vytvářím databázi... %d found (OFF pro návrat)" - h100,h120,h300: "Vytvářím databázi... %d found (STOP pro návrat)" + iriverh100,iriverh120,iriverh300: "Vytvářím databázi... %d found (STOP pro návrat)" ipod*: "Vytvářím databázi... %d found (PREV pro návrat)" - x5,m5,gigabeat*,mrobe100: "Vytvářím databázi... %d found (LEFT pro návrat)" - h10,h10_5gb,e200*,c200*,sa9200: "Vytvářím databázi... %d found (PREV pro návrat)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Vytvářím databázi... %d found (LEFT pro návrat)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Vytvářím databázi... %d found (PREV pro návrat)" *: "záznamy nalezené v databázi" @@ -3176,7 +3176,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3190,7 +3190,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3204,7 +3204,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3835,15 +3835,15 @@ user: core *: none - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none - fuze*,e200*: "Časový limit osvětlení kolečka" + sansafuze*,sansae200*: "Časový limit osvětlení kolečka" *: none - fuze*,e200*: "Časový limit osvětlení kolečka" + sansafuze*,sansae200*: "Časový limit osvětlení kolečka" @@ -4107,14 +4107,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Nastavit" - h100,h120,h300: "NAVI = Nastavit" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Nastavit" + iriverh100,iriverh120,iriverh300: "NAVI = Nastavit" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Nastavit" *: none @@ -4127,22 +4127,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Vrátit zpět" - h100,h120,h300: "STOP = Vrátit zpět" - ipod*,c200*,sa9200: "MENU = Vrátit zpět" - x5,m5: "RECORD = Vrátit zpět" - h10,h10_5gb,e200*,fuze*: "PREV = Vrátit zpět" - gigabeatf: "POWER = Vrátit zpět" + iriverh100,iriverh120,iriverh300: "STOP = Vrátit zpět" + ipod*,sansac200*,gogearsa9200: "MENU = Vrátit zpět" + iaudiox5,iaudiom5: "RECORD = Vrátit zpět" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Vrátit zpět" + gigabeatfx: "POWER = Vrátit zpět" mrobe100: "DISPLAY = Vrátit zpět" gigabeats: "BACK = Vrátit zpět" @@ -4670,14 +4670,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Nastavit OFF=Storno" ipod*: "SELECT=Nastavit MENU=Storno" - h10,h10_5gb: "SELECT=Nastavit PREV=Storno" + iriverh10,iriverh10_5gb: "SELECT=Nastavit PREV=Storno" gigabeats: "SELECT=Nastavit POWER=Storno" @@ -5851,17 +5851,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofón" - h100,h120,h300: "Interní mikrofón" + iriverh100,iriverh120,iriverh300: "Interní mikrofón" *: none recording: "Mikrofón" - h100,h120,h300: "Interní mikrofón" + iriverh100,iriverh120,iriverh300: "Interní mikrofón" @@ -5887,15 +5887,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Linkový vstup" + recording,archosplayer: "Linkový vstup" *: none - recording,player: "Linkový vstup" + recording,archosplayer: "Linkový vstup" @@ -6825,11 +6825,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Vyrovnávací paměť" @@ -6841,13 +6841,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Baterie: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Baterie: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Baterie: %d%% %dh %dm" *: "Stav baterie" @@ -6904,17 +6904,17 @@ user: core *: none - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8026,15 +8026,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Konec seznamu skladeb" - player: "Konec seznamu" + archosplayer: "Konec seznamu" *: "Konec seznamu skladeb" - player: "Konec seznamu" + archosplayer: "Konec seznamu" @@ -8274,20 +8274,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disk je plný. Pro pokračování stiskněte OFF." - h100,h120,h300: "Disk je plný. Pro pokračování stiskněte STOP." - m5,x5: "Disk je plný. Pro pokračování stiskněte POWER." - e200*,c200*: "Disk je plný. Pro pokračování stiskněte PREV." + iriverh100,iriverh120,iriverh300: "Disk je plný. Pro pokračování stiskněte STOP." + iaudiom5,iaudiox5: "Disk je plný. Pro pokračování stiskněte POWER." + sansae200*,sansac200*: "Disk je plný. Pro pokračování stiskněte PREV." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8371,21 +8371,21 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" *: "OFF=zrušit" - player,h100,h120,h300: "STOP=zrušit" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP=zrušit" ipod*: "PLAY/PAUSE=zrušit" - x5,m5: "Long PLAY=zrušit" - h10,h10_5gb,e200*,c200*: "PREV=zrušit" + iaudiox5,iaudiom5: "Long PLAY=zrušit" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV=zrušit" *: "" @@ -8609,19 +8609,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Baterie: Donabíjení" + archosrecorder: "Baterie: Donabíjení" *: none - recorder: "Donabíjení" + archosrecorder: "Donabíjení" @@ -10438,7 +10438,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" Index: apps/lang/norsk.lang =================================================================== --- apps/lang/norsk.lang (revision 23734) +++ apps/lang/norsk.lang (working copy) @@ -1836,15 +1836,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Linjeinngang" + recording,archosplayer: "Linjeinngang" *: none - recording,player: "Linjeinngang" + recording,archosplayer: "Linjeinngang" @@ -2090,17 +2090,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" @@ -2785,7 +2785,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -2799,7 +2799,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -2813,7 +2813,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3644,19 +3644,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batteri: top-off-lading" + archosrecorder: "Batteri: top-off-lading" *: none - recorder: "Batteri top-off-lading" + archosrecorder: "Batteri top-off-lading" @@ -3682,18 +3682,18 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batteri: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batterinivå" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "" - h10,ipodmini,ipodmini2g: "" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "" + iriverh10,ipodmini1g,ipodmini2g: "" @@ -3748,19 +3748,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "mikro S D" + sansae200*,sansac200*,sansafuze*: "mikro S D" ondio*: "M M C" @@ -3892,28 +3892,28 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Tilbakestill" - h100,h120,h300: "STOP = Tilbakestill" - ipod*,c200*,sa9200: "MENU = Tilbakestill" - x5,m5: "RECORD = Tilbakestill" - h10,h10_5gb,e200*,fuze*: "PREV = Tilbakestill" - gigabeatf: "POWER = Tilbakestill" + iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill" + ipod*,sansac200*,gogearsa9200: "MENU = Tilbakestill" + iaudiox5,iaudiom5: "RECORD = Tilbakestill" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Tilbakestill" + gigabeatfx: "POWER = Tilbakestill" mrobe100: "DISPLAY = Tilbakestill" gigabeats: "BACK = Tilbakestill" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -3991,20 +3991,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disken er full. Trykk OFF for å fortsette." - h100,h120,h300: "Disken er full. Trykk STOP for å fortsette." - m5,x5: "Disken er full. Trykk POWER for å fortsette." - e200*,c200*: "Disken er full. Trykk PREV for å fortsette." + iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOP for å fortsette." + iaudiom5,iaudiox5: "Disken er full. Trykk POWER for å fortsette." + sansae200*,sansac200*: "Disken er full. Trykk PREV for å fortsette." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -4168,21 +4168,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Sett OFF=Avbryt" ipod*: "SELECT=Sett MENU=Avbryt" - h10,h10_5gb: "SELECT=Sett PREV=Avbryt" + iriverh10,iriverh10_5gb: "SELECT=Sett PREV=Avbryt" gigabeats: "SELECT=Sett POWER=Avbryt" *: none alarm: "" ipod*: "" - h10,h10_5gb: "" + iriverh10,iriverh10_5gb: "" gigabeats: "" @@ -6604,25 +6604,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF for å avbryte" - player,h100,h120,h300: "STOP for å avbryte" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP for å avbryte" ipod*: "PLAY/PAUSE for å avbryte" - x5,m5: "Hold PLAY for å avbryte" - h10,h10_5gb,e200*,c200*: "PREV for å avbryte" + iaudiox5,iaudiom5: "Hold PLAY for å avbryte" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV for å avbryte" gigabeats: "BACK for å avbryte" - gigabeatf: "POWER for å avbryte" + gigabeatfx: "POWER for å avbryte" *: "" @@ -8398,7 +8398,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -9757,17 +9757,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Bygger database... %d funnet (OFF for å gå tilbake)" - h100,h120,h300: "Bygger database... %d funnet (STOP for å gå tilbake)" + iriverh100,iriverh120,iriverh300: "Bygger database... %d funnet (STOP for å gå tilbake)" ipod*: "Bygger database... %d funnet (PREV for å gå tilbake)" - x5,m5,gigabeat*,mrobe100: "Bygger database... %d funnet (LEFT for å gå tilbake)" - h10,h10_5gb,e200*,c200*,sa9200: "Bygger database... %d funnet (PREV for å gå tilbake)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Bygger database... %d funnet (LEFT for å gå tilbake)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Bygger database... %d funnet (PREV for å gå tilbake)" *: "filer funnet for database" @@ -10030,17 +10030,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Slukketid for knapplys" - fuze*,e200*: "Slukketid for hjullys" + sansafuze*,sansae200*: "Slukketid for hjullys" *: none button_light: "Tid før lys på knapper slukker" - fuze*,e200*: "Tid før lys på hjul slukker" + sansafuze*,sansae200*: "Tid før lys på hjul slukker" @@ -10432,15 +10432,15 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Bufferstørrelse" - player: "" + archosplayer: "" @@ -10511,21 +10511,21 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Ja" - h100,h120,h300: "NAVI = Ja" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Ja" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Ja" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Ja" + archosplayer: "(PLAY/STOP)" *: "" - h100,h120,h300: "" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "" - player: "" + iriverh100,iriverh120,iriverh300: "" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "" + archosplayer: "" @@ -10535,20 +10535,20 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Sett" - h100,h120,h300: "NAVI = Sett" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Sett" + iriverh100,iriverh120,iriverh300: "NAVI = Sett" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Sett" *: none rtc: "" - h100,h120,h300: "" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + iriverh100,iriverh120,iriverh300: "" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -10557,15 +10557,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Andre = Nei" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -10737,15 +10737,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Slutt på sporliste" - player: "Slutt på liste" + archosplayer: "Slutt på liste" *: "Slutt på sporliste" - player: "Slutt på liste" + archosplayer: "Slutt på liste" @@ -11511,15 +11511,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Styreflatefølsomhet" + gigabeatfx: "Styreflatefølsomhet" *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" @@ -11792,15 +11792,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Høy" + gigabeatfx: "Høy" *: none - gigabeatf: "Høy" + gigabeatfx: "Høy" Index: apps/lang/portugues.lang =================================================================== --- apps/lang/portugues.lang (revision 23734) +++ apps/lang/portugues.lang (working copy) @@ -2073,15 +2073,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Entrada de Linha" + recording,archosplayer: "Entrada de Linha" *: none - recording,player: "Entrada de Linha" + recording,archosplayer: "Entrada de Linha" @@ -2299,17 +2299,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Microfone" - h100,h120,h300: "Microfone Interno" + iriverh100,iriverh120,iriverh300: "Microfone Interno" *: none recording: "Microfone" - h100,h120,h300: "Microfone Interno" + iriverh100,iriverh120,iriverh300: "Microfone Interno" @@ -3113,7 +3113,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3127,7 +3127,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3141,7 +3141,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4028,19 +4028,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Bateria: Carregamento Completo" + archosrecorder: "Bateria: Carregamento Completo" *: none - recorder: "Bateria: Carregamento Completado" + archosrecorder: "Bateria: Carregamento Completado" @@ -4066,13 +4066,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Bateria: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm" *: "Nível de bateria" @@ -4130,19 +4130,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -4257,22 +4257,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF Para Reverter" - h100,h120,h300: "STOP Para Reverter" - ipod*,c200*,sa9200: "MENU Para Reverter" - x5,m5: "RECORD Para Reverter" - h10,h10_5gb,e200*,fuze*: "PREV Para Reverter" - gigabeatf: "POWER Para Reverter" + iriverh100,iriverh120,iriverh300: "STOP Para Reverter" + ipod*,sansac200*,gogearsa9200: "MENU Para Reverter" + iaudiox5,iaudiom5: "RECORD Para Reverter" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV Para Reverter" + gigabeatfx: "POWER Para Reverter" mrobe100: "DISPLAY Para Reverter" gigabeats: "BACK Para Reverter" @@ -4372,16 +4372,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "O Disco Está Cheio. Carregue OFF Para Continuar" - h100,h120,h300: "O Disco Está Cheio. Carregue STOP Para Continuar" - m5,x5: "O Disco Está Cheio. Carregue POWER Para Continuar" - e200*,c200*: "O Disco Está Cheio. Carregue PREV Para Continuar" + iriverh100,iriverh120,iriverh300: "O Disco Está Cheio. Carregue STOP Para Continuar" + iaudiom5,iaudiox5: "O Disco Está Cheio. Carregue POWER Para Continuar" + sansae200*,sansac200*: "O Disco Está Cheio. Carregue PREV Para Continuar" *: none @@ -4566,14 +4566,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Alterar OFF=Cancelar" ipod*: "SELECT=Alterar MENU=Cancelar" - h10,h10_5gb: "SELECT=Alterar PREV=Cancelar" + iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar" gigabeats: "SELECT=Alterar POWER=Cancelar" @@ -7001,24 +7001,24 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF para Abortar" - player,h100,h120,h300: "STOP para Abortar" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP para Abortar" ipod*: "PLAY/PAUSE para Abortar" - h10,h10_5gb,e200*,c200*: "PREV para Abortar" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para Abortar" gigabeats: "BACK para Abortar" - gigabeatf: "POWER para Abortar" + gigabeatfx: "POWER para Abortar" *: "" @@ -7809,7 +7809,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -8258,11 +8258,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "tamanho do buffer" @@ -8367,15 +8367,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Sim" - h100,h120,h300: "NAVI = Sim" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sim" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Sim" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sim" + archosplayer: "(PLAY/STOP)" *: "" @@ -8388,14 +8388,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Definir" - h100,h120,h300: "NAVI = Definir" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Definir" + iriverh100,iriverh120,iriverh300: "NAVI = Definir" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Definir" *: none @@ -8407,15 +8407,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Any Other = Não" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -8703,15 +8703,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Fim da Lista de Músicas" - player: "Fim da Lista" + archosplayer: "Fim da Lista" *: "Fim da Lista de Músicas" - player: "Fim da Lista" + archosplayer: "Fim da Lista" @@ -10731,17 +10731,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Construindo Base da Dados... %d encontrado (OFF para voltar)" - h100,h120,h300: "Construindo Base da Dados... %d encontrado (STOP para voltar)" + iriverh100,iriverh120,iriverh300: "Construindo Base da Dados... %d encontrado (STOP para voltar)" ipod*: "Construindo Base da Dados... %d encontrado (PREV para voltar)" - x5,m5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)" - h10,h10_5gb,e200*,c200*,sa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)" *: "entries found for database" @@ -10936,15 +10936,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensitividade do Touchpad" + gigabeatfx: "Sensitividade do Touchpad" *: none - gigabeatf: "Sensitividade do Touchpad" + gigabeatfx: "Sensitividade do Touchpad" @@ -11460,15 +11460,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Alto" + gigabeatfx: "Alto" *: none - gigabeatf: "Alto" + gigabeatfx: "Alto" Index: apps/lang/finnish.lang =================================================================== --- apps/lang/finnish.lang (revision 23734) +++ apps/lang/finnish.lang (working copy) @@ -2192,15 +2192,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Linjatulo" + recording,archosplayer: "Linjatulo" *: none - recording,player: "Linjatulo" + recording,archosplayer: "Linjatulo" @@ -2446,17 +2446,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofoni" - h100,h120,h300: "Sis. mikrofoni" + iriverh100,iriverh120,iriverh300: "Sis. mikrofoni" *: none recording: "Mikrofoni" - h100,h120,h300: "Sisäinen mikrofoni" + iriverh100,iriverh120,iriverh300: "Sisäinen mikrofoni" @@ -3308,7 +3308,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3322,7 +3322,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3336,7 +3336,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4341,19 +4341,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Akku: huippulataus" + archosrecorder: "Akku: huippulataus" *: none - recorder: "Akku täynnä" + archosrecorder: "Akku täynnä" @@ -4379,13 +4379,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Akku: %d%% %dt %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dt %dm" - h10,ipodmini,ipodmini2g: "Akku: %d%% %dt %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dt %dm" + iriverh10,ipodmini1g,ipodmini2g: "Akku: %d%% %dt %dm" *: "Akun varauksen taso" @@ -4443,19 +4443,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "Kiintolevy1" - e200*,c200*,fuze*: "micro s d muistikortti" + sansae200*,sansac200*,sansafuze*: "micro s d muistikortti" ondio*: "m m c muistikortti" @@ -4587,22 +4587,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Peruuta" - h100,h120,h300: "STOP = Peruuta" - ipod*,c200*,sa9200: "MENU = Peruuta" - x5,m5: "RECORD = Peruuta" - h10,h10_5gb,e200*,fuze*: "PREV = Peruuta" - gigabeatf: "POWER = Peruuta" + iriverh100,iriverh120,iriverh300: "STOP = Peruuta" + ipod*,sansac200*,gogearsa9200: "MENU = Peruuta" + iaudiox5,iaudiom5: "RECORD = Peruuta" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Peruuta" + gigabeatfx: "POWER = Peruuta" mrobe100: "DISPLAY = Peruuta" gigabeats: "BACK = Peruuta" @@ -4685,23 +4685,23 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Levy täynnä. Jatka painamalla OFF." - h100,h120,h300: "Levy täynnä. Jatka painamalla STOP." - m5,x5: "Levy täynnä. Jatka painamalla POWER." - e200*,c200*: "Levy täynnä. Jatka painamalla PREV." + iriverh100,iriverh120,iriverh300: "Levy täynnä. Jatka painamalla STOP." + iaudiom5,iaudiox5: "Levy täynnä. Jatka painamalla POWER." + sansae200*,sansac200*: "Levy täynnä. Jatka painamalla PREV." *: none recording: "" - h100,h120,h300: "" - m5,x5: "" - e200*,c200*: "" + iriverh100,iriverh120,iriverh300: "" + iaudiom5,iaudiox5: "" + sansae200*,sansac200*: "" @@ -4865,14 +4865,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Aseta OFF=Peruuta" ipod*: "SELECT=Aseta MENU=Peruuta" - h10,h10_5gb: "SELECT=Aseta PREV=Peruuta" + iriverh10,iriverh10_5gb: "SELECT=Aseta PREV=Peruuta" gigabeats: "SELECT=Aseta POWER=Peruuta" @@ -7391,34 +7391,34 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF keskeyttää" - player,h100,h120,h300: "STOP keskeyttää" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP keskeyttää" ipod*: "PLAY/PAUSE keskeyttää" - x5,m5: "Pitkä PLAY keskeyttää" - h10,h10_5gb,e200*,c200*: "PREV keskeyttää" + iaudiox5,iaudiom5: "Pitkä PLAY keskeyttää" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV keskeyttää" gigabeats: "BACK keskeyttää" - gigabeatf: "POWER keskeyttää" + gigabeatfx: "POWER keskeyttää" *: "" - player,h100,h120,h300: "" + archosplayer,iriverh100,iriverh120,iriverh300: "" ipod*: "" - x5,m5: "" - h10,h10_5gb,e200*,c200*: "" + iaudiox5,iaudiom5: "" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "" gigabeats: "" - gigabeatf: "" + gigabeatfx: "" @@ -8810,7 +8810,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -9778,11 +9778,11 @@ *: none - usb_charging: "Lataa USB-yhteyden aikana" + usb_charging: "Lataa USB-samsungyhteyden aikana" *: none - usb_charging: "Lataa u s b yhteyden aikana" + usb_charging: "Lataa u s b samsungyhteyden aikana" @@ -9965,17 +9965,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Luodaan tietokantaa... %d löytyi (OFF = palaa)" - h100,h120,h300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)" + iriverh100,iriverh120,iriverh300: "Luodaan tietokantaa... %d löytyi (STOP = palaa)" ipod*: "Luodaan tietokantaa... %d löytyi (PREV = palaa)" - x5,m5,gigabeat*,mrobe100: "Luodaan tietokantaa... %d löytyi (LEFT = palaa)" - h10,h10_5gb,e200*,c200*,sa9200: "Luodaan tietokantaa... %d löytyi (PREV = palaa)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Luodaan tietokantaa... %d löytyi (LEFT = palaa)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Luodaan tietokantaa... %d löytyi (PREV = palaa)" *: "tietokantaa varten löytyi merkintöjä" @@ -10002,17 +10002,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Painikevalon aikakatkaisu" - fuze*,e200*: "Rullavalon aikakatkaisu" + sansafuze*,sansae200*: "Rullavalon aikakatkaisu" *: none button_light: "Painikevalon aikakatkaisu" - fuze*,e200*: "Rullavalon aikakatkaisu" + sansafuze*,sansae200*: "Rullavalon aikakatkaisu" @@ -10471,11 +10471,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Puskuri:" - player: "Puskuri:" + archosplayer: "Puskuri:" *: "Puskurin koko" @@ -10518,15 +10518,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Kyllä" - h100,h120,h300: "NAVI = Kyllä" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Kyllä" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Kyllä" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Kyllä" + archosplayer: "(PLAY/STOP)" *: "" @@ -10539,18 +10539,18 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Aseta" - h100,h120,h300: "NAVI = Aseta" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Aseta" + iriverh100,iriverh120,iriverh300: "NAVI = Aseta" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Aseta" *: none - rtc,h100,h120,h300,ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -10559,15 +10559,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Muu = Ei" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -10621,15 +10621,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Kappalelistan loppu" - player: "Listan loppu" + archosplayer: "Listan loppu" *: "Kappalelistan loppu" - player: "Listan loppu" + archosplayer: "Listan loppu" @@ -11688,15 +11688,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Kosketuslevyn herkkyys" + gigabeatfx: "Kosketuslevyn herkkyys" *: none - gigabeatf: "Kosketuslevyn herkkyys" + gigabeatfx: "Kosketuslevyn herkkyys" @@ -11705,15 +11705,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Suuri" + gigabeatfx: "Suuri" *: none - gigabeatf: "Suuri" + gigabeatfx: "Suuri" Index: apps/lang/galego.lang =================================================================== --- apps/lang/galego.lang (revision 23734) +++ apps/lang/galego.lang (working copy) @@ -89,7 +89,7 @@ id: LANG_ALWAYS - desc: (player) the jump scroll shall be done "always + desc: (archosplayer) the jump scroll shall be done "always user: core *: "Always" @@ -775,14 +775,14 @@ id: LANG_CONFIRM_WITH_PLAY_RECORDER - desc: Generic recorder string to use to confirm + desc: Generic archosrecorder string to use to confirm user: core *: "PLAY = Yes" *: "PLAY = SI" - h100,h120,h300: "NAVI = SI" + iriverh100,iriverh120,iriverh300: "NAVI = SI" *: "" @@ -790,7 +790,7 @@ id: LANG_CANCEL_WITH_ANY_RECORDER - desc: Generic recorder string to use to cancel + desc: Generic archosrecorder string to use to cancel user: core *: "Any Other = No" @@ -2372,7 +2372,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu altarnative for jump scroll + desc: (archosplayer) menu altarnative for jump scroll user: core *: "Jump scroll" @@ -2386,7 +2386,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time + desc: (archosplayer) the jump scroll shall be done "one time user: core *: "One time" @@ -2400,7 +2400,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3156,7 +3156,7 @@ id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB user: core *: "Buf: %d.%03dMB" @@ -3170,7 +3170,7 @@ id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB + desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB user: core *: "Buffer: %d.%03dMB" @@ -3485,7 +3485,7 @@ *: "PLAY = Seleccionar" - h100,h120,h300: "NAVI = Seleccionar" + iriverh100,iriverh120,iriverh300: "NAVI = Seleccionar" *: "" @@ -3500,7 +3500,7 @@ *: "ON+PLAY = Borrar" - h100,h120,h300: "ON+NAVI = Borrar" + iriverh100,iriverh120,iriverh300: "ON+NAVI = Borrar" *: "" @@ -6252,7 +6252,7 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" @@ -6266,7 +6266,7 @@ id: LANG_STOP_ABORT - desc: Used on player models + desc: Used on archosplayer models user: core *: "STOP to abort" Index: apps/lang/esperanto.lang =================================================================== --- apps/lang/esperanto.lang (revision 23734) +++ apps/lang/esperanto.lang (working copy) @@ -850,14 +850,14 @@ id: LANG_CONFIRM_WITH_PLAY_RECORDER - desc: Generic recorder string to use to confirm + desc: Generic archosrecorder string to use to confirm user: core *: "PLAY = Yes" *: "LEGI = Jes" - h100,h120,h300: "NAVI = Jes" + iriverh100,iriverh120,iriverh300: "NAVI = Jes" *: "" @@ -865,7 +865,7 @@ id: LANG_CANCEL_WITH_ANY_RECORDER - desc: Generic recorder string to use to cancel + desc: Generic archosrecorder string to use to cancel user: core *: "Any Other = No" @@ -3441,7 +3441,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu altarnative for jump scroll + desc: (archosplayer) menu altarnative for jump scroll user: core *: "Jump Scroll" @@ -3455,7 +3455,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3469,7 +3469,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4435,7 +4435,7 @@ id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB user: core *: "Buf: %d.%03dMB" @@ -4449,7 +4449,7 @@ id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB + desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB user: core *: "Buffer: %d.%03dMB" @@ -4764,7 +4764,7 @@ *: "LEGI = Elekti" - h100,h120,h300: "NAVI = Elekti" + iriverh100,iriverh120,iriverh300: "NAVI = Elekti" *: "" @@ -4779,7 +4779,7 @@ *: "ON+LEGI = Elpreni" - h100,h120,h300: "ON+NAVI = Elpreni" + iriverh100,iriverh120,iriverh300: "ON+NAVI = Elpreni" *: "" @@ -7839,7 +7839,7 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" @@ -7853,7 +7853,7 @@ id: LANG_STOP_ABORT - desc: Used on player models + desc: Used on archosplayer models user: core *: "STOP to abort" Index: apps/lang/italiano.lang =================================================================== --- apps/lang/italiano.lang (revision 23734) +++ apps/lang/italiano.lang (working copy) @@ -263,17 +263,17 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Sì" cowond2*: "MENU = Sì" - h100,h120,h300: "NAVI = Sì" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Sì" + iriverh100,iriverh120,iriverh300: "NAVI = Sì" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Sì" mrobe500: "PLAY o POWER = Sì" - player: "(PLAY/STOP)" + archosplayer: "(PLAY/STOP)" *: "" @@ -285,15 +285,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Altro Tasto = No" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2386,19 +2386,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Costruzione database... %d trovato (OFF per uscire)" - h100,h120,h300: "Costruzione database... %d trovato (STOP per uscire)" + iriverh100,iriverh120,iriverh300: "Costruzione database... %d trovato (STOP per uscire)" ipod*: "Costruzione database... %d trovato (PREV per uscire)" - x5,m5,gigabeat*,mrobe100: "Costruzione database... %d trovato (LEFT per uscire)" - h10,h10_5gb,e200*,c200*,fuze*: "Costruzione database... %d trovato (PREV per uscire)" - sa9200: "Costruzione database... %d trovato (REW per uscire)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Costruzione database... %d trovato (LEFT per uscire)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Costruzione database... %d trovato (PREV per uscire)" + gogearsa9200: "Costruzione database... %d trovato (REW per uscire)" *: "Elementi trovati per il database" @@ -3198,7 +3198,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3212,7 +3212,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3226,7 +3226,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3858,17 +3858,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Tempo di spegnimento illuminazione tasti" - fuze*,e200*: "Tempo di spegnimento illuminazione rotella" + sansafuze*,sansae200*: "Tempo di spegnimento illuminazione rotella" *: none button_light: "Tempo di spegnimento illuminazione tasti" - fuze*,e200*: "Tempo di spegnimento illuminazione rotella" + sansafuze*,sansae200*: "Tempo di spegnimento illuminazione rotella" @@ -4150,21 +4150,21 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Imposta" mrobe500: "HEART = Imposta" - h100,h120,h300: "NAVI = Imposta" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Imposta" - sa9200: "PLAY = Imposta" + iriverh100,iriverh120,iriverh300: "NAVI = Imposta" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Imposta" + gogearsa9200: "PLAY = Imposta" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4175,31 +4175,31 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Annulla" mrobe500: "POWER = Annulla" - h100,h120,h300: "STOP = Annulla" - ipod*,c200*: "MENU = Annulla" - x5,m5: "RECORD = Annulla" - h10,h10_5gb,e200*,fuze*: "PREV = Annulla" - gigabeatf: "POWER = Annulla" + iriverh100,iriverh120,iriverh300: "STOP = Annulla" + ipod*,sansac200*: "MENU = Annulla" + iaudiox5,iaudiom5: "RECORD = Annulla" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annulla" + gigabeatfx: "POWER = Annulla" mrobe100: "DISPLAY = Annulla" gigabeats: "BACK = Annulla" - sa9200: "LEFT = Annulla" + gogearsa9200: "LEFT = Annulla" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4722,14 +4722,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Imposta OFF=Annulla" ipod*: "SELECT=Imposta MENU=Annulla" - h10,h10_5gb: "SELECT=Imposta PREV=Annulla" + iriverh10,iriverh10_5gb: "SELECT=Imposta PREV=Annulla" gigabeats: "SELECT=Imposta POWER=Annulla" @@ -5904,17 +5904,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Microfono" - h100,h120,h300: "Microfono interno" + iriverh100,iriverh120,iriverh300: "Microfono interno" *: none recording: "Microfono" - h100,h120,h300: "Microfono interno" + iriverh100,iriverh120,iriverh300: "Microfono interno" @@ -5940,15 +5940,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Linea in ingresso" + recording,archosplayer: "Linea in ingresso" *: none - recording,player: "Linea in ingresso" + recording,archosplayer: "Linea in ingresso" @@ -6878,11 +6878,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Dimensione buffer" @@ -6894,13 +6894,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batteria: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondiosp,ondiofm,ifp7xx: "%d%% %dh" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,archosondiosp,archosondiofm,iriverifp7xx: "%d%% %dh" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Livello Batteria" @@ -6958,19 +6958,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "HD 1" - e200*,c200*,fuze*: "Micro SD" + sansae200*,sansac200*,sansafuze*: "Micro SD" ondio*: "M M C" @@ -8082,11 +8082,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Fine della Lista dei Brani" - player: "Fine della lista" + archosplayer: "Fine della lista" *: "Fine della Lista dei Brani" @@ -8331,20 +8331,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disco pieno. Premi STOP per continuare." - h100,h120,h300: "Disco pieno. Premi stop per continuare." - m5,x5: "Disco pieno. Premi POWER per continuare." - e200*,c200*: "Disco pieno. Premi PREV per continuare." + iriverh100,iriverh120,iriverh300: "Disco pieno. Premi stop per continuare." + iaudiom5,iaudiox5: "Disco pieno. Premi POWER per continuare." + sansae200*,sansac200*: "Disco pieno. Premi PREV per continuare." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8428,25 +8428,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF = Annulla" - player,h100,h120,h300: "STOP = Annulla" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP = Annulla" ipod*: "PLAY/PAUSA = Annulla" - x5,m5: "PLAY LUNGO = Annulla" - h10,h10_5gb,e200*,c200*: "PREV = Annulla" + iaudiox5,iaudiom5: "PLAY LUNGO = Annulla" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV = Annulla" gigabeats: "BACK = Annulla" - gigabeatf: "POWER = Annulla" + gigabeatfx: "POWER = Annulla" *: "" @@ -8670,19 +8670,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batteria: Carica completa" + archosrecorder: "Batteria: Carica completa" *: none - recorder: "Carica completa" + archosrecorder: "Carica completa" @@ -10499,7 +10499,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11710,15 +11710,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensibilità Touchpad" + gigabeatfx: "Sensibilità Touchpad" *: none - gigabeatf: "Sensibilità Touchpad" + gigabeatfx: "Sensibilità Touchpad" @@ -11727,15 +11727,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Alta" + gigabeatfx: "Alta" *: none - gigabeatf: "Alta" + gigabeatfx: "Alta" Index: apps/lang/espanol.lang =================================================================== --- apps/lang/espanol.lang (revision 23734) +++ apps/lang/espanol.lang (working copy) @@ -1350,15 +1350,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Entrada de línea" + recording,archosplayer: "Entrada de línea" *: none - recording,player: "Entrada de línea" + recording,archosplayer: "Entrada de línea" @@ -1604,17 +1604,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Micrófono" - h100,h120,h300: "Micrófono interno" + iriverh100,iriverh120,iriverh300: "Micrófono interno" *: none recording: "Micrófono" - h100,h120,h300: "Micrófono interno" + iriverh100,iriverh120,iriverh300: "Micrófono interno" @@ -1977,7 +1977,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -1991,7 +1991,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -2005,7 +2005,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -2777,19 +2777,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batería: carga completa" + archosrecorder: "Batería: carga completa" *: none - recorder: "Batería carga completa" + archosrecorder: "Batería carga completa" @@ -2815,13 +2815,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batería: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batería: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batería: %d%% %dh %dm" *: "Nivel y tiempo de batería" @@ -2983,28 +2983,28 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Cancelar" - h100,h120,h300: "STOP = Cancelar" - ipod*,c200*,sa9200: "MENU = Cancelar" - x5,m5: "RECORD = Cancelar" - h10,h10_5gb,e200*,fuze*: "PREV = Cancelar" - gigabeatf: "POWER = Cancelar" + iriverh100,iriverh120,iriverh300: "STOP = Cancelar" + ipod*,sansac200*,gogearsa9200: "MENU = Cancelar" + iaudiox5,iaudiom5: "RECORD = Cancelar" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancelar" + gigabeatfx: "POWER = Cancelar" mrobe100: "DISPLAY = Cancelar" gigabeats: "BACK = Cancelar" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -3065,20 +3065,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Disco duro lleno. Pulse OFF para continuar" - h100,h120,h300: "Disco duro lleno. Pulse STOP para continuar" - m5,x5: "Disco duro lleno. Pulse POWER para continuar" - e200*,c200*: "Disco duro lleno. Pulse PREV para continuar" + iriverh100,iriverh120,iriverh300: "Disco duro lleno. Pulse STOP para continuar" + iaudiom5,iaudiox5: "Disco duro lleno. Pulse POWER para continuar" + sansae200*,sansac200*: "Disco duro lleno. Pulse PREV para continuar" *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -3157,14 +3157,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Aceptar OFF=Cancelar" ipod*: "SELECT=Aceptar MENU=Cancelar" - h10,h10_5gb: "SELECT=Aceptar PREV=Cancelar" + iriverh10,iriverh10_5gb: "SELECT=Aceptar PREV=Cancelar" gigabeats: "SELECT=Aceptar POWER=Cancelar" @@ -5398,25 +5398,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF para cancelar" - player,h100,h120,h300: "STOP para cancelar" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP para cancelar" ipod*: "PLAY/PAUSE para cancelar" - x5,m5: "Pulsación larga de PLAY para cancelar" - h10,h10_5gb,e200*,c200*: "PREV para cancelar" + iaudiox5,iaudiom5: "Pulsación larga de PLAY para cancelar" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para cancelar" gigabeats: "BACK para cancelar" - gigabeatf: "POWER para cancelar" + gigabeatfx: "POWER para cancelar" *: "" @@ -6122,7 +6122,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -8002,19 +8002,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "m S D" + sansae200*,sansac200*,sansafuze*: "m S D" ondio*: "M M C" @@ -9203,17 +9203,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Construyendo base de datos... %d encontrados (OFF para volver)" - h100,h120,h300: "Construyendo base de datos... %d encontrados (STOP para volver)" + iriverh100,iriverh120,iriverh300: "Construyendo base de datos... %d encontrados (STOP para volver)" ipod*: "Construyendo base de datos... %d encontrados (PREV para volver)" - x5,m5,gigabeat*,mrobe100: "Construyendo base de datos... %d encontrados (LEFT para volver)" - h10,h10_5gb,e200*,c200*,sa9200: "Construyendo base de datos... %d encontrados (PREV para volver)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construyendo base de datos... %d encontrados (LEFT para volver)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construyendo base de datos... %d encontrados (PREV para volver)" *: "elementos encontrados para la base de datos" @@ -9854,11 +9854,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Búfer:" - player: "Búf:" + archosplayer: "Búf:" *: "Tamaño de búfer" @@ -9932,15 +9932,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Sí" - h100,h120,h300: "NAVI = Sí" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sí" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Sí" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sí" + archosplayer: "(PLAY/STOP)" *: "" @@ -9953,18 +9953,18 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Fijar" - h100,h120,h300: "NAVI = Fijar" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Fijar" + iriverh100,iriverh120,iriverh300: "NAVI = Fijar" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Fijar" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -9973,11 +9973,11 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Otro = No" - player: none + archosplayer: none *: "" @@ -10214,11 +10214,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Fin de la lista de canciones" - player: "Fin de la lista" + archosplayer: "Fin de la lista" *: "Fin de la lista de canciones" @@ -11142,17 +11142,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Tiempo de espera en la luz del botón" - fuze*,e200*: "Tiempo de espera en la luz de la rueda" + sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda" *: none button_light: "Tiempo de espera en la luz del botón" - fuze*,e200*: "Tiempo de espera en la luz de la rueda" + sansafuze*,sansae200*: "Tiempo de espera en la luz de la rueda" @@ -11561,15 +11561,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensibilidad de la superficie táctil" + gigabeatfx: "Sensibilidad de la superficie táctil" *: none - gigabeatf: "Sensibilidad de la superficie táctil" + gigabeatfx: "Sensibilidad de la superficie táctil" @@ -11794,15 +11794,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Alto" + gigabeatfx: "Alto" *: none - gigabeatf: "Alto" + gigabeatfx: "Alto" Index: apps/lang/islenska.lang =================================================================== --- apps/lang/islenska.lang (revision 23734) +++ apps/lang/islenska.lang (working copy) @@ -88,7 +88,7 @@ id: LANG_ALWAYS - desc: (player) the jump scroll shall be done "always + desc: (archosplayer) the jump scroll shall be done "always user: core *: "Always" @@ -788,14 +788,14 @@ id: LANG_CONFIRM_WITH_PLAY_RECORDER - desc: Generic recorder string to use to confirm + desc: Generic archosrecorder string to use to confirm user: core *: "PLAY = Yes" *: "PLAY = Já" - h100,h120,h300: "NAVI = Já" + iriverh100,iriverh120,iriverh300: "NAVI = Já" *: "" @@ -803,7 +803,7 @@ id: LANG_CANCEL_WITH_ANY_RECORDER - desc: Generic recorder string to use to cancel + desc: Generic archosrecorder string to use to cancel user: core *: "Any Other = No" @@ -2567,7 +2567,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu altarnative for jump scroll + desc: (archosplayer) menu altarnative for jump scroll user: core *: "Jump scroll" @@ -2581,7 +2581,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time + desc: (archosplayer) the jump scroll shall be done "one time user: core *: "One time" @@ -2595,7 +2595,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3351,7 +3351,7 @@ id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB user: core *: "Buf: %d.%03dMB" @@ -3365,7 +3365,7 @@ id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB + desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB user: core *: "Buffer: %d.%03dMB" @@ -3680,7 +3680,7 @@ *: "Spila = Velja" - h100,h120,h300: "NAVI = Velja" + iriverh100,iriverh120,iriverh300: "NAVI = Velja" *: "" @@ -3695,7 +3695,7 @@ *: "Á+Spila = Eyða" - h100,h120,h300: "Á+NAVI = Eyða" + iriverh100,iriverh120,iriverh300: "Á+NAVI = Eyða" *: "" @@ -6503,7 +6503,7 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" @@ -6517,7 +6517,7 @@ id: LANG_STOP_ABORT - desc: Used on player models + desc: Used on archosplayer models user: core *: "STOP to abort" Index: apps/lang/srpski.lang =================================================================== --- apps/lang/srpski.lang (revision 23734) +++ apps/lang/srpski.lang (working copy) @@ -260,21 +260,21 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Да" - h100,h120,h300: "NAVI = Да" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Да" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Да" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Да" + archosplayer: "(PLAY/STOP)" *: "" - h100,h120,h300: "" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "" - player: "" + iriverh100,iriverh120,iriverh300: "" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "" + archosplayer: "" @@ -283,15 +283,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Било које друго = Не" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2367,24 +2367,24 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Креирам базу података... %d пронађено (OFF за повратак)" - h100,h120,h300: "Креирам базу података... %d пронађено (STOP за повратак)" + iriverh100,iriverh120,iriverh300: "Креирам базу података... %d пронађено (STOP за повратак)" ipod*: "Креирам базу података... %d пронађено (PREV за повратак)" - x5,m5,gigabeat*,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)" - h10,h10_5gb,e200*,c200*,sa9200: "Креирам базу података... %d пронађено (PREV за повратак)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Креирам базу података... %d пронађено (LEFT за повратак)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Креирам базу података... %d пронађено (PREV за повратак)" *: "улази за базу података" - h100,h120,h300: "" + iriverh100,iriverh120,iriverh300: "" ipod*: "" - x5,m5,gigabeat*,mrobe100: "" - h10,h10_5gb,e200*,c200*,sa9200: "" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "" @@ -3181,7 +3181,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3195,7 +3195,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3209,7 +3209,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3841,17 +3841,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Тајмаут светла за дугмиће" - fuze*,e200*: "Тајмаут светла за точак" + sansafuze*,sansae200*: "Тајмаут светла за точак" *: none button_light: "Тајмаут светла за дугмиће" - fuze*,e200*: "Тајмаут светла за точак" + sansafuze*,sansae200*: "Тајмаут светла за точак" @@ -4132,20 +4132,20 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Постави" - h100,h120,h300: "NAVI = Постави" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Постави" + iriverh100,iriverh120,iriverh300: "NAVI = Постави" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Постави" *: none rtc: "" - h100,h120,h300: "" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + iriverh100,iriverh120,iriverh300: "" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4155,33 +4155,33 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Врати на старо" - h100,h120,h300: "STOP = Врати на старо" - ipod*,c200*,sa9200: "MENU = Врати на старо" - x5,m5: "RECORD = Врати на старо" - h10,h10_5gb,e200*,fuze*: "PREV = Врати на старо" - gigabeatf: "POWER = Врати на старо" + iriverh100,iriverh120,iriverh300: "STOP = Врати на старо" + ipod*,sansac200*,gogearsa9200: "MENU = Врати на старо" + iaudiox5,iaudiom5: "RECORD = Врати на старо" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Врати на старо" + gigabeatfx: "POWER = Врати на старо" mrobe100: "DISPLAY = Врати на старо" gigabeats: "BACK = Врати на старо" *: none rtc: "" - h100,h120,h300: "" - ipod*,e200*,c200*,sa9200: "" - x5,m5: "" - h10,h10_5gb: "" - gigabeatf: "" + iriverh100,iriverh120,iriverh300: "" + ipod*,sansae200*,sansac200*,gogearsa9200: "" + iaudiox5,iaudiom5: "" + iriverh10,iriverh10_5gb: "" + gigabeatfx: "" mrobe100: "" gigabeats: "" @@ -4706,14 +4706,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Постави OFF=Одустани" ipod*: "SELECT=Постави MENU=Одустани" - h10,h10_5gb: "SELECT=Постави PREV=Одустани" + iriverh10,iriverh10_5gb: "SELECT=Постави PREV=Одустани" gigabeats: "SELECT=Постави POWER=Одустани" @@ -5888,17 +5888,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Микрофон" - h100,h120,h300: "Уграђени микрофон" + iriverh100,iriverh120,iriverh300: "Уграђени микрофон" *: none recording: "Микрофон" - h100,h120,h300: "Уграђени микрофон" + iriverh100,iriverh120,iriverh300: "Уграђени микрофон" @@ -5924,15 +5924,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Линијски улаз" + recording,archosplayer: "Линијски улаз" *: none - recording,player: "Линијски улаз" + recording,archosplayer: "Линијски улаз" @@ -6862,11 +6862,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Бафер:" - player: "Баф:" + archosplayer: "Баф:" *: "Величина бафера" @@ -6878,13 +6878,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Батерија: %d%% %dч %dм" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dч %dм" - h10,ipodmini,ipodmini2g: "Бат: %d%% %dч %dм" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dч %dм" + iriverh10,ipodmini1g,ipodmini2g: "Бат: %d%% %dч %dм" *: "Ниво батерије" @@ -6942,19 +6942,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "мајкро Ес Де" + sansae200*,sansac200*,sansafuze*: "мајкро Ес Де" ondio*: "M M C" @@ -8066,15 +8066,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Крај листе песама" - player: "Крај листе" + archosplayer: "Крај листе" *: "Крај листе песама" - player: "Крај листе" + archosplayer: "Крај листе" @@ -8314,20 +8314,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Диск је пун. Притисните OFF за наставак." - h100,h120,h300: "Диск је пун. Притисните STOP за наставак." - m5,x5: "Диск је пун. Притисните POWER за наставак." - e200*,c200*: "Диск је пун. Притисните PREV за наставак." + iriverh100,iriverh120,iriverh300: "Диск је пун. Притисните STOP за наставак." + iaudiom5,iaudiox5: "Диск је пун. Притисните POWER за наставак." + sansae200*,sansac200*: "Диск је пун. Притисните PREV за наставак." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8411,25 +8411,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF to abort" - player,h100,h120,h300: "STOP за прекид" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP за прекид" ipod*: "PLAY/PAUSE за прекид" - x5,m5: "Long PLAY за прекид" - h10,h10_5gb,e200*,c200*: "PREV за прекид" + iaudiox5,iaudiom5: "Long PLAY за прекид" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV за прекид" gigabeats: "BACK за прекид" - gigabeatf: "POWER за прекид" + gigabeatfx: "POWER за прекид" *: "" @@ -8653,19 +8653,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Батерија: Top-Off Chg" + archosrecorder: "Батерија: Top-Off Chg" *: none - recorder: "Top off пуњење" + archosrecorder: "Top off пуњење" @@ -10482,7 +10482,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11727,15 +11727,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Осетљивост Touchpad-а" + gigabeatfx: "Осетљивост Touchpad-а" *: none - gigabeatf: "Осетљивост Touchpad-а" + gigabeatfx: "Осетљивост Touchpad-а" @@ -11961,15 +11961,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Високо" + gigabeatfx: "Високо" *: none - gigabeatf: "Високо" + gigabeatfx: "Високо" Index: apps/lang/tagalog.lang =================================================================== --- apps/lang/tagalog.lang (revision 23734) +++ apps/lang/tagalog.lang (working copy) @@ -261,16 +261,16 @@ *: "PLAY = Yes" cowond2*: "MENU = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Oo" cowond2*: "MENU = Oo" - h100,h120,h300: "NAVI = Oo" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Oo" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Oo" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Oo" + archosplayer: "(PLAY/STOP)" *: "" @@ -282,15 +282,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Ibang wala = Hindi" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2366,19 +2366,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Gumawa database... %d found (OFF sa pagbalik)" - h100,h120,h300: "Gumawa database... %d found (STOP sa pagbalik)" + iriverh100,iriverh120,iriverh300: "Gumawa database... %d found (STOP sa pagbalik)" ipod*: "Gumawa database... %d found (PLAY/PAUSE sa pagbalik)" - x5,m5,gigabeat*,mrobe100: "Gumawa database... %d found (LEFT sa pagbalik)" - h10,h10_5gb,e200*,c200*,fuze*: "Gumawa database... %d found (PREV sa pagbalik)" - sa9200: "Gumawa database... %d found (REW sa pagbalik)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Gumawa database... %d found (LEFT sa pagbalik)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Gumawa database... %d found (PREV sa pagbalik)" + gogearsa9200: "Gumawa database... %d found (REW sa pagbalik)" *: "entries found for database" @@ -3178,7 +3178,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3192,7 +3192,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3206,7 +3206,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3838,17 +3838,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Pahintuin buttones sa ilaw" - fuze*,e200*: "Pahintuin gulong sa ilaw" + sansafuze*,sansae200*: "Pahintuin gulong sa ilaw" *: none button_light: "" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" @@ -4130,17 +4130,17 @@ *: none rtc: "ON = Set" mrobe500: "HEART = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ON = Ilagay" mrobe500: "HEART =Ilagay" - h100,h120,h300: "NAVI = Ilagay" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Ilagay" - sa9200: "PLAY = Ilagay" + iriverh100,iriverh120,iriverh300: "NAVI = Ilagay" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Ilagay" + gogearsa9200: "PLAY = Ilagay" *: none @@ -4154,27 +4154,27 @@ *: none rtc: "OFF = Revert" mrobe500: "POWER = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "OFF = Mabalik" mrobe500: "POWER = Mabalik" - h100,h120,h300: "STOP = Mabalik" - ipod*,c200*: "MENU = Mabalik" - x5,m5: "RECORD = Mabalik" - h10,h10_5gb,e200*,fuze*: "PREV = Mabalik" - gigabeatf: "POWER = Mabalik" + iriverh100,iriverh120,iriverh300: "STOP = Mabalik" + ipod*,sansac200*: "MENU = Mabalik" + iaudiox5,iaudiom5: "RECORD = Mabalik" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Mabalik" + gigabeatfx: "POWER = Mabalik" mrobe100: "DISPLAY = Mabalik" gigabeats: "BACK = Mabalik" - sa9200: "LEFT = Mabalik" + gogearsa9200: "LEFT = Mabalik" *: none @@ -4700,21 +4700,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Ilagay OFF=Kanselahin" ipod*: "SELECT=Ilagay MENU=Kanselahin" - h10,h10_5gb: "SELECT = Ilagay MENU = Kanselahin" + iriverh10,iriverh10_5gb: "SELECT = Ilagay MENU = Kanselahin" gigabeats: "SELECT = Ilagay POWER = Kanselahin" *: none alarm: "" ipod*: "" - h10,h10_5gb: "" + iriverh10,iriverh10_5gb: "" gigabeats: "" @@ -5885,17 +5885,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikropono" - h100,h120,h300: "Panloob mikropono" + iriverh100,iriverh120,iriverh300: "Panloob mikropono" *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" @@ -5921,15 +5921,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Sa Guhit" + recording,archosplayer: "Sa Guhit" *: none - recording,player: "Line In" + recording,archosplayer: "Line In" @@ -7021,7 +7021,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -7609,20 +7609,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Puno disk. Magpatuloy Pindutin OFF." - h100,h120,h300: "Puno disk. Magpatuloy Pindutin STOP." - m5,x5: "Puno disk. Magpatuloy Pindutin POWER." - e200*,c200*: "Puno disk. Magpatuloy Pindutin PREV." + iriverh100,iriverh120,iriverh300: "Puno disk. Magpatuloy Pindutin STOP." + iaudiom5,iaudiox5: "Puno disk. Magpatuloy Pindutin POWER." + sansae200*,sansac200*: "Puno disk. Magpatuloy Pindutin PREV." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -7682,15 +7682,15 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer size" - player: "" + archosplayer: "" @@ -8066,25 +8066,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF sa agas" - player,h100,h120,h300: "STOP sa agas" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP sa agas" ipod*: "PLAY/PAUSE sa agas" - x5,m5: "Long PLAY sa agas" - h10,h10_5gb,e200*,c200*: "PREV sa agas" + iaudiox5,iaudiom5: "Long PLAY sa agas" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV sa agas" gigabeats: "BACK sa agas" - gigabeatf: "POWER sa agas" + gigabeatfx: "POWER sa agas" *: "" @@ -8138,13 +8138,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Battery level" @@ -8333,15 +8333,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Magtapos kanta listahan" - player: "Magtapos listahan" + archosplayer: "Magtapos listahan" *: "End of Song List" - player: "End of List" + archosplayer: "End of List" @@ -9664,19 +9664,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batirya: Top-Off Chg" + archosrecorder: "Batirya: Top-Off Chg" *: none - recorder: "Top off charge" + archosrecorder: "Top off charge" @@ -10111,19 +10111,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1:" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "H D Isa" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -11508,15 +11508,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensitibo Touchpad" + gigabeatfx: "Sensitibo Touchpad" *: none - gigabeatf: "Sensitibo Touchpad" + gigabeatfx: "Sensitibo Touchpad" @@ -11806,15 +11806,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Mataas" + gigabeatfx: "Mataas" *: none - gigabeatf: "Mataas" + gigabeatfx: "Mataas" Index: apps/lang/ukrainian.lang =================================================================== --- apps/lang/ukrainian.lang (revision 23734) +++ apps/lang/ukrainian.lang (working copy) @@ -261,15 +261,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "ВIДТВОР. = Так" - h100,h120,h300: "НАВIГ. = Так" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,clip*,fuze*: "ВИБIР = Так" - player: "(ВIДТВОР./СТОП)" + iriverh100,iriverh120,iriverh300: "НАВIГ. = Так" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,sansaclip*,sansafuze*: "ВИБIР = Так" + archosplayer: "(ВIДТВОР./СТОП)" *: "" @@ -281,15 +281,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Будь-яка Iнша Кнопка = Нi" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2382,19 +2382,19 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" - sa9200: "Building database... %d found (REW to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" + gogearsa9200: "Building database... %d found (REW to return)" *: "Створення Бази Даних ... %d знайдено (ВИМК. для вiдмiни)" - h100,h120,h300: "Створення Бази Даних... %d знайдено (СТОП для вiдмiни)" + iriverh100,iriverh120,iriverh300: "Створення Бази Даних... %d знайдено (СТОП для вiдмiни)" ipod*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)" - x5,m5,gigabeat*,mrobe100: "Створення Бази Даних... %d знайдено (ЛIВО для вiдмiни)" - h10,h10_5gb,e200*,c200*,fuze*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)" - sa9200: "Створення Бази Даних... %d знайденр (ПЕРЕМ. для вiдмiни)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Створення Бази Даних... %d знайдено (ЛIВО для вiдмiни)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Створення Бази Даних... %d знайдено (ПОПЕРЕД. для вiдмiни)" + gogearsa9200: "Створення Бази Даних... %d знайденр (ПЕРЕМ. для вiдмiни)" *: "Знайдено записiв в базi даних" @@ -3194,7 +3194,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3208,7 +3208,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3222,7 +3222,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3854,17 +3854,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Таймаут Пiдсвiтки Кнопок" - fuze*,e200*: "Таймаут Пiдсвiтки Колеса" + sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса" *: none button_light: "Таймаут Пiдсвiтки Кнопок" - fuze*,e200*: "Таймаут Пiдсвiтки Колеса" + sansafuze*,sansae200*: "Таймаут Пiдсвiтки Колеса" @@ -4145,20 +4145,20 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "SELECT = Set" - sa9200: "PLAY = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "SELECT = Set" + gogearsa9200: "PLAY = Set" *: none rtc: "ВВIМК. = Встановити" - h100,h120,h300: "НАВIГ. = Встановити" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,clip*,fuze*: "ВИБIР = Встановити" - sa9200: "ПРОГРАВ. = Встановити" + iriverh100,iriverh120,iriverh300: "НАВIГ. = Встановити" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,sansaclip*,sansafuze*: "ВИБIР = Встановити" + gogearsa9200: "ПРОГРАВ. = Встановити" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4168,30 +4168,30 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" - sa9200: "LEFT = Revert" + gogearsa9200: "LEFT = Revert" *: none rtc: "ВИМК. = Вiдмiнити" - h100,h120,h300: "СТОП = Вiдмiнити" - ipod*,c200*: "МЕНЮ = Вiдмiнити" - x5,m5: "ЗАПИС = Вiдмiнити" - h10,h10_5gb,e200*,fuze*: "ПОПЕРЕД. = Вiдмiнити" - gigabeatf: "ЖИВЛЕННЯ = Вiдмiнити" + iriverh100,iriverh120,iriverh300: "СТОП = Вiдмiнити" + ipod*,sansac200*: "МЕНЮ = Вiдмiнити" + iaudiox5,iaudiom5: "ЗАПИС = Вiдмiнити" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "ПОПЕРЕД. = Вiдмiнити" + gigabeatfx: "ЖИВЛЕННЯ = Вiдмiнити" mrobe100: "ДИСПЛЕЙ = Вiдмiнити" gigabeats: "НАЗАД = Вiдмiнити" - sa9200: "ВЛIВО = Вiдмiнити" + gogearsa9200: "ВЛIВО = Вiдмiнити" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4714,14 +4714,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "ВIДТВОР.=Встановити ВИМК.=Вiдмiнити" ipod*: "ВИБIР=Встановити МЕНЮ=Вiдмiнити" - h10,h10_5gb: "ВИБIР=Встановити ПОПЕРЕД.=Вiдмiнити" + iriverh10,iriverh10_5gb: "ВИБIР=Встановити ПОПЕРЕД.=Вiдмiнити" gigabeats: "ВИБIР=Встановити ЖИВЛ.=Вiдмiнити" @@ -5896,17 +5896,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Мiкрофон" - h100,h120,h300: "Вбудований Мiкрофон" + iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон" *: none recording: "Мiкрофон" - h100,h120,h300: "Вбудований Мiкрофон" + iriverh100,iriverh120,iriverh300: "Вбудований Мiкрофон" @@ -5932,15 +5932,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Лiнiйний Вхiд" + recording,archosplayer: "Лiнiйний Вхiд" *: none - recording,player: "Лiнiйний Вхiд" + recording,archosplayer: "Лiнiйний Вхiд" @@ -6870,11 +6870,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Буфер:" - player: "Буф:" + archosplayer: "Буф:" *: "Розмiр буферу" @@ -6886,13 +6886,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Акумулятор: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Рiвень Заряду Акумулятору" @@ -6950,19 +6950,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "microSD:" + sansae200*,sansac200*,sansafuze*: "microSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8074,11 +8074,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Кiнець Списку Пiсень" - player: "Кiнець Списку" + archosplayer: "Кiнець Списку" *: "Кiнець Списку Пiсень" @@ -8323,20 +8323,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Диск повний. Натичнiть OFF для продовження." - h100,h120,h300: "Диск повний. Натичнiть STOP для продовження." - m5,x5: "Диск повний. Натичнiть POWER для продовження." - e200*,c200*: "Диск повний. Натичнiть PREV для продовження." + iriverh100,iriverh120,iriverh300: "Диск повний. Натичнiть STOP для продовження." + iaudiom5,iaudiox5: "Диск повний. Натичнiть POWER для продовження." + sansae200*,sansac200*: "Диск повний. Натичнiть PREV для продовження." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8420,25 +8420,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF для вiдмiни" - player,h100,h120,h300: "STOP для вiдмiни" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP для вiдмiни" ipod*: "PLAY/PAUSE для вiдмiни" - x5,m5: "Довге натискання PLAY для вiдмiни" - h10,h10_5gb,e200*,c200*: "PREV для вiдмiни" + iaudiox5,iaudiom5: "Довге натискання PLAY для вiдмiни" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV для вiдмiни" gigabeats: "BACK для вiдмiни" - gigabeatf: "POWER для вiдмiни" + gigabeatfx: "POWER для вiдмiни" *: "" @@ -8662,19 +8662,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Акумулятор: Більше Можливого" + archosrecorder: "Акумулятор: Більше Можливого" *: none - recorder: "Акумулятор: Більше Можливого" + archosrecorder: "Акумулятор: Більше Можливого" @@ -10491,7 +10491,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11702,15 +11702,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Чутливiсть Тачпаду" + gigabeatfx: "Чутливiсть Тачпаду" *: none - gigabeatf: "Чутливiсть Тачпаду" + gigabeatfx: "Чутливiсть Тачпаду" @@ -11719,15 +11719,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Висока" + gigabeatfx: "Висока" *: none - gigabeatf: "Висока" + gigabeatfx: "Висока" Index: apps/lang/chinese-simp.lang =================================================================== --- apps/lang/chinese-simp.lang (revision 23734) +++ apps/lang/chinese-simp.lang (working copy) @@ -2192,15 +2192,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "线路输入" + recording,archosplayer: "线路输入" *: none - recording,player: "线路输入" + recording,archosplayer: "线路输入" @@ -2446,17 +2446,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "麦克风" - h100,h120,h300: "内置麦克风" + iriverh100,iriverh120,iriverh300: "内置麦克风" *: none recording: "麦克风" - h100,h120,h300: "内置麦克风" + iriverh100,iriverh120,iriverh300: "内置麦克风" @@ -3308,7 +3308,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3322,7 +3322,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3336,7 +3336,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4341,19 +4341,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "电池:恒流快速充电" + archosrecorder: "电池:恒流快速充电" *: none - recorder: "电池 恒流快速充电" + archosrecorder: "电池 恒流快速充电" @@ -4379,13 +4379,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "剩余电量:%d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "电量:%d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "电量:%d%% %dh %dm" *: "剩余电量" @@ -4443,19 +4443,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "磁盘1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "磁盘1" - e200*,c200*,fuze*: "mSD卡" + sansae200*,sansac200*,sansafuze*: "mSD卡" ondio*: "MMC卡" @@ -4587,22 +4587,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF=放弃" - h100,h120,h300: "STOP=放弃" - ipod*,c200*,sa9200: "MENU=放弃" - x5,m5: "RECORD=放弃" - h10,h10_5gb,e200*,fuze*: "PREV=放弃" - gigabeatf: "POWER=放弃" + iriverh100,iriverh120,iriverh300: "STOP=放弃" + ipod*,sansac200*,gogearsa9200: "MENU=放弃" + iaudiox5,iaudiom5: "RECORD=放弃" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV=放弃" + gigabeatfx: "POWER=放弃" mrobe100: "DISPLAY=放弃" gigabeats: "BACK=放弃" @@ -4685,16 +4685,16 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "磁盘已满，按下OFF继续." - h100,h120,h300: "磁盘已满，按下STOP继续." - m5,x5: "磁盘已满，按下POWER继续." - e200*,c200*: "磁盘，按下PREV继续." + iriverh100,iriverh120,iriverh300: "磁盘已满，按下STOP继续." + iaudiom5,iaudiox5: "磁盘已满，按下POWER继续." + sansae200*,sansac200*: "磁盘，按下PREV继续." *: none @@ -4861,21 +4861,21 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=设置 OFF=取消" ipod*: "SELECT=设置 MENU=取消" - h10,h10_5gb: "SELECT=设置 PREV=取消" + iriverh10,iriverh10_5gb: "SELECT=设置 PREV=取消" gigabeats: "SELECT=设置 POWER=取消" *: none alarm: "" ipod*: "" - h10,h10_5gb: "" + iriverh10,iriverh10_5gb: "" gigabeats: "" @@ -7390,25 +7390,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "按OFF键取消" - player,h100,h120,h300: "按STOP键取消" + archosplayer,iriverh100,iriverh120,iriverh300: "按STOP键取消" ipod*: "按PLAY/PAUSE键取消" - x5,m5: "长按PLAY键取消" - h10,h10_5gb,e200*,c200*: "按PREV键取消" + iaudiox5,iaudiom5: "长按PLAY键取消" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "按PREV键取消" gigabeats: "按BACK键取消" - gigabeatf: "按POWER键取消" + gigabeatfx: "按POWER键取消" *: "" @@ -8501,7 +8501,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -8776,24 +8776,24 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "数据库更新中...已找到%d个(按OFF返回)" - h100,h120,h300: "数据库更新中...已找到%d个(按STOP返回)" + iriverh100,iriverh120,iriverh300: "数据库更新中...已找到%d个(按STOP返回)" ipod*: "数据库更新中...已找到%d个(按PREV返回)" - x5,m5,gigabeat*,mrobe100: "数据库更新中...已找到%d个(按LEFT返回)" - h10,h10_5gb,e200*,c200*,sa9200: "数据库更新中...已找到%d个(按PREV返回)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "数据库更新中...已找到%d个(按LEFT返回)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "数据库更新中...已找到%d个(按PREV返回)" *: "数据库更新中" - h100,h120,h300: "" + iriverh100,iriverh120,iriverh300: "" ipod*: "" - x5,m5,gigabeat*,mrobe100: "" - h10,h10_5gb,e200*,c200*,sa9200: "" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "" @@ -9287,11 +9287,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "缓冲区:" - player: "Buf:" + archosplayer: "Buf:" *: "缓冲区大小为" @@ -9351,15 +9351,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY=是" - h100,h120,h300: "NAVI=是" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT=是" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI=是" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT=是" + archosplayer: "(PLAY/STOP)" *: "" @@ -9372,14 +9372,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON=设置" - h100,h120,h300: "NAVI=设置" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT=设置" + iriverh100,iriverh120,iriverh300: "NAVI=设置" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT=设置" *: none @@ -9391,11 +9391,11 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Any Other=否" - player: none + archosplayer: none *: "" @@ -9584,15 +9584,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "曲目列表结束" - player: "列表结束" + archosplayer: "列表结束" *: "曲目列表结束" - player: "列表结束" + archosplayer: "列表结束" @@ -10687,17 +10687,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "按键背光自动关闭时滞" - fuze*,e200*: "转盘背光自动关闭时滞" + sansafuze*,sansae200*: "转盘背光自动关闭时滞" *: none button_light: "按键背光自动关闭时滞" - fuze*,e200*: "转盘背光自动关闭时滞" + sansafuze*,sansae200*: "转盘背光自动关闭时滞" @@ -11630,15 +11630,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "触摸板灵敏度" + gigabeatfx: "触摸板灵敏度" *: none - gigabeatf: "触摸板灵敏度" + gigabeatfx: "触摸板灵敏度" @@ -11951,15 +11951,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "高" + gigabeatfx: "高" *: none - gigabeatf: "高" + gigabeatfx: "高" Index: apps/lang/slovenscina.lang =================================================================== --- apps/lang/slovenscina.lang (revision 23734) +++ apps/lang/slovenscina.lang (working copy) @@ -88,7 +88,7 @@ id: LANG_ALWAYS - desc: (player) the jump scroll shall be done "always + desc: (archosplayer) the jump scroll shall be done "always user: core *: "Always" @@ -480,14 +480,14 @@ id: LANG_CONFIRM_WITH_PLAY_RECORDER - desc: Generic recorder string to use to confirm + desc: Generic archosrecorder string to use to confirm user: core *: "PLAY = Yes" *: "PLAY = Da" - h100,h120,h300: "NAVI = Da" + iriverh100,iriverh120,iriverh300: "NAVI = Da" *: "" @@ -495,7 +495,7 @@ id: LANG_CANCEL_WITH_ANY_RECORDER - desc: Generic recorder string to use to cancel + desc: Generic archosrecorder string to use to cancel user: core *: "Any Other = No" @@ -1391,7 +1391,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu altarnative for jump scroll + desc: (archosplayer) menu altarnative for jump scroll user: core *: "Jump scroll" @@ -1405,7 +1405,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time + desc: (archosplayer) the jump scroll shall be done "one time user: core *: "One time" @@ -1419,7 +1419,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -1951,7 +1951,7 @@ id: LANG_BUFFER_STAT_PLAYER - desc: the buffer size player-screen width, %d MB %d fraction of MB + desc: the buffer size archosplayer-screen width, %d MB %d fraction of MB user: core *: "Buf: %d.%03dMB" @@ -1965,7 +1965,7 @@ id: LANG_BUFFER_STAT_RECORDER - desc: the buffer size recorder-screen width, %d MB %d fraction of MB + desc: the buffer size archosrecorder-screen width, %d MB %d fraction of MB user: core *: "Buffer: %d.%03dMB" @@ -3099,7 +3099,7 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" @@ -3113,7 +3113,7 @@ id: LANG_STOP_ABORT - desc: Used on player models + desc: Used on archosplayer models user: core *: "STOP to abort" Index: apps/lang/portugues-brasileiro.lang =================================================================== --- apps/lang/portugues-brasileiro.lang (revision 23734) +++ apps/lang/portugues-brasileiro.lang (working copy) @@ -260,15 +260,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Sim" - h100,h120,h300: "NAVI = Sim" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Sim" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Sim" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Sim" + archosplayer: "(PLAY/STOP)" *: "" @@ -280,15 +280,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Algum Outro = Não" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2381,17 +2381,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Construindo Base de Dados... %d encontrados (OFF para retornar)" - h100,h120,h300: "Construindo Base de Dados... %d encontrados (STOP para retornar)" + iriverh100,iriverh120,iriverh300: "Construindo Base de Dados... %d encontrados (STOP para retornar)" ipod*: "Construindo Base de Dados... %d encontrados (PREV para retornar)" - x5,m5,gigabeat*,mrobe100: "Construindo Base de Dados... %d encontrados (LEFT para retornar)" - h10,h10_5gb,e200*,c200*,sa9200: "Construindo Base de Dados... %d encontrados (PREV para retornar)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Construindo Base de Dados... %d encontrados (LEFT para retornar)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Construindo Base de Dados... %d encontrados (PREV para retornar)" *: "entradas encontradas para a base de dados" @@ -3191,7 +3191,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3205,7 +3205,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3219,7 +3219,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3851,17 +3851,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Duração da Luz do Botão" - fuze*,e200*: "Duração da Luz da Roda" + sansafuze*,sansae200*: "Duração da Luz da Roda" *: none button_light: "Duração da Luz do Botão" - fuze*,e200*: "Duração da Luz da Roda" + sansafuze*,sansae200*: "Duração da Luz da Roda" @@ -4142,18 +4142,18 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Ajustar" - h100,h120,h300: "NAVI = Ajustar" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Ajustar" + iriverh100,iriverh120,iriverh300: "NAVI = Ajustar" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Ajustar" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -4163,28 +4163,28 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Reverter" - h100,h120,h300: "STOP = Reverter" - ipod*,c200*,sa9200: "MENU = Reverter" - x5,m5: "RECORD = Reverter" - h10,h10_5gb,e200*,fuze*: "PREV = Reverter" - gigabeatf: "POWER = Reverter" + iriverh100,iriverh120,iriverh300: "STOP = Reverter" + ipod*,sansac200*,gogearsa9200: "MENU = Reverter" + iaudiox5,iaudiom5: "RECORD = Reverter" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Reverter" + gigabeatfx: "POWER = Reverter" mrobe100: "DISPLAY = Reverter" gigabeats: "BACK = Reverter" *: none - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -4707,14 +4707,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Alterar OFF=Cancelar" ipod*: "SELECT=Alterar MENU=Cancelar" - h10,h10_5gb: "SELECT=Alterar PREV=Cancelar" + iriverh10,iriverh10_5gb: "SELECT=Alterar PREV=Cancelar" gigabeats: "SELECT=Alterar POWER=Cancelar" @@ -5889,17 +5889,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Microfone" - h100,h120,h300: "Microfone Interno" + iriverh100,iriverh120,iriverh300: "Microfone Interno" *: none recording: "Microfone" - h100,h120,h300: "Microfone Interno" + iriverh100,iriverh120,iriverh300: "Microfone Interno" @@ -5925,15 +5925,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Entrada de Linha" + recording,archosplayer: "Entrada de Linha" *: none - recording,player: "Entrada de Linha" + recording,archosplayer: "Entrada de Linha" @@ -6863,11 +6863,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Tamanho do buffer" @@ -6879,13 +6879,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Bateria: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm" *: "Nível da bateria" @@ -6943,19 +6943,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "MSD:" + sansae200*,sansac200*,sansafuze*: "MSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -8067,11 +8067,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Fim da Lista de Músicas" - player: "Fim da Lista" + archosplayer: "Fim da Lista" *: "Fim da Lista de Músicas" @@ -8314,20 +8314,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "O disco está cheio. Pressione OFF para continuar." - h100,h120,h300: "O disco está cheio. Pressione STOP para continuar." - m5,x5: "O disco está cheio. Pressione POWER para continuar." - e200*,c200*: "O disco está cheio. Pressione PREV para continuar." + iriverh100,iriverh120,iriverh300: "O disco está cheio. Pressione STOP para continuar." + iaudiom5,iaudiox5: "O disco está cheio. Pressione POWER para continuar." + sansae200*,sansac200*: "O disco está cheio. Pressione PREV para continuar." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8411,25 +8411,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF para abortar" - player,h100,h120,h300: "STOP para abortar" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP para abortar" ipod*: "PLAY/PAUSE para abortar" - x5,m5: "PLAY Longo para abortar" - h10,h10_5gb,e200*,c200*: "PREV para abortar" + iaudiox5,iaudiom5: "PLAY Longo para abortar" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV para abortar" gigabeats: "BACK para abortar" - gigabeatf: "POWER para abortar" + gigabeatfx: "POWER para abortar" *: "" @@ -8653,19 +8653,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Bateria: Carregamento Completado" + archosrecorder: "Bateria: Carregamento Completado" *: none - recorder: "Máximo da carga" + archosrecorder: "Máximo da carga" @@ -10482,7 +10482,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11693,15 +11693,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensibilidade do Touchpad" + gigabeatfx: "Sensibilidade do Touchpad" *: none - gigabeatf: "Sensibilidade do Touchpad" + gigabeatfx: "Sensibilidade do Touchpad" @@ -11710,15 +11710,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Alto" + gigabeatfx: "Alto" *: none - gigabeatf: "Alto" + gigabeatfx: "Alto" Index: apps/lang/hindi.lang =================================================================== --- apps/lang/hindi.lang (revision 23734) +++ apps/lang/hindi.lang (working copy) @@ -232,15 +232,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - ipod*,x5,m5,gigabeatf,e200*,c200*,h10,h10_5gb: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "बजाना = हां" - h100,h120,h300: "NAVI = हां" - ipod*,x5,m5,gigabeatf,e200*,c200*,h10,h10_5gb: "चुन = हां" - player: "(बजाना/रोक)" + iriverh100,iriverh120,iriverh300: "NAVI = हां" + ipod*,iaudiox5,iaudiom5,gigabeatfx,sansae200*,sansac200*,iriverh10,iriverh10_5gb: "चुन = हां" + archosplayer: "(बजाना/रोक)" *: "" @@ -252,15 +252,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "दूसरों = नहीं" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -1267,17 +1267,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,fuze*: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "Building database... %d found (PREV to return)" *: "डाटाबेस बन रहा है... %d मिले (OFF to बढ़)" - h100,h120,h300: "डाटाबेस बन रहा है... %d मिले (STOP to बढ़)" + iriverh100,iriverh120,iriverh300: "डाटाबेस बन रहा है... %d मिले (STOP to बढ़)" ipod*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)" - x5,m5: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)" - h10,h10_5gb,e200*,c200*,fuze*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)" + iaudiox5,iaudiom5: "डाटाबेस बन रहा है... %d मिले (LEFT to बढ़)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,sansafuze*: "डाटाबेस बन रहा है... %d मिले (PREV to बढ़)" *: "entries found for database" @@ -1620,7 +1620,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -2132,13 +2132,13 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" *: none alarm: "PLAY=लगा OFF=बंद" ipod*: "SELECT=लगा MENU=बंद" - h10,h10_5gb: "SELECT=लगा PREV=बंद" + iriverh10,iriverh10_5gb: "SELECT=लगा PREV=बंद" *: none @@ -3867,15 +3867,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "गाने खतम हो गये" - player: "खतम हो गये" + archosplayer: "खतम हो गये" *: "गाने खतम हो गये" - player: "खतम हो गये" + archosplayer: "खतम हो गये" @@ -3982,11 +3982,11 @@ user: core *: "No partition?" - player: "Partition?" + archosplayer: "Partition?" *: "पारटिशन नहीं है?" - player: "पारटिशन?" + archosplayer: "पारटिशन?" *: "" @@ -4044,20 +4044,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "दिसक भरी ह. Press OFF to continue." - h100,h120,h300: "दिसक भरी ह. Press STOP to continue." - m5,x5: "दिसक भरी ह. Press POWER to continue." - e200*,c200*: "दिसक भरी ह. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue." + iaudiom5,iaudiox5: "दिसक भरी ह. Press POWER to continue." + sansae200*,sansac200*: "दिसक भरी ह. Press PREV to continue." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -5058,18 +5058,18 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "The disk is full. Press LEFT to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "The disk is full. Press LEFT to continue." *: none recording: "दिसक भरी ह. Press OFF to continue." - h100,h120,h300: "दिसक भरी ह. Press STOP to continue." - m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "दिसक भरी ह. Press LEFT to continue." + iriverh100,iriverh120,iriverh300: "दिसक भरी ह. Press STOP to continue." + iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "दिसक भरी ह. Press LEFT to continue." *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" Index: apps/lang/norsk-nynorsk.lang =================================================================== --- apps/lang/norsk-nynorsk.lang (revision 23734) +++ apps/lang/norsk-nynorsk.lang (working copy) @@ -2145,15 +2145,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Linje inn" + recording,archosplayer: "Linje inn" *: none - recording,player: "Linje inn" + recording,archosplayer: "Linje inn" @@ -2399,17 +2399,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" *: none recording: "Mikrofon" - h100,h120,h300: "Intern mikrofon" + iriverh100,iriverh120,iriverh300: "Intern mikrofon" @@ -3256,7 +3256,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3270,7 +3270,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3284,7 +3284,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -4285,15 +4285,15 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Batteri: Top-off-lading" + archosrecorder: "Batteri: Top-off-lading" *: none @@ -4321,12 +4321,12 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Batteri: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" *: "Batterinivå" @@ -4382,12 +4382,12 @@ user: core *: none - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" *: none @@ -4518,22 +4518,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "A = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "A = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "AV = tilbakestill" - h100,h120,h300: "STOPP = tilbakestill" - ipod*,c200*,sa9200: "MENY = tilbakestill" - x5,m5: "OPPTAK = tilbakestill" - h10,h10_5gb,e200*,fuze*: "TILBAKE = tilbakestill" - gigabeatf: "A = tilbakestill" + iriverh100,iriverh120,iriverh300: "STOPP = tilbakestill" + ipod*,sansac200*,gogearsa9200: "MENY = tilbakestill" + iaudiox5,iaudiom5: "OPPTAK = tilbakestill" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "TILBAKE = tilbakestill" + gigabeatfx: "A = tilbakestill" mrobe100: "VIS = tilbakestill" gigabeats: "TILBAKE = tilbakestill" @@ -4614,14 +4614,14 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press UP to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press UP to continue." *: none recording: "Disken er full. Trykk AV for å halda fram." - h100,h120,h300: "Disken er full. Trykk STOPP for å halda fram." + iriverh100,iriverh120,iriverh300: "Disken er full. Trykk STOPP for å halda fram." *: none @@ -4784,14 +4784,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "SPEL = vel – AV = avbryt" ipod*: "VEL = vel – MENY = avbryt" - h10,h10_5gb: "VEL = vel – TILBAKE = avbryt" + iriverh10,iriverh10_5gb: "VEL = vel – TILBAKE = avbryt" gigabeats: "VEL = vel – PÅ/AV = avbryt" @@ -7277,21 +7277,21 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" *: "AV for å avbryta" - player,h100,h120,h300: "STOPP for å avbryta" + archosplayer,iriverh100,iriverh120,iriverh300: "STOPP for å avbryta" ipod*: "SPEL/PAUSE for å avbryta" - x5,m5: "SPEL (lenge) for å avbryta" - h10,h10_5gb,e200*,c200*: "TILBAKE for å avbryta" + iaudiox5,iaudiom5: "SPEL (lenge) for å avbryta" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "TILBAKE for å avbryta" *: "" @@ -8591,7 +8591,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -9688,17 +9688,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Byggjer database … Fann %d. (AV for å gå tilbake.)" - h100,h120,h300: "Byggjer database … Fann %d. (STOPP for å gå tilbake.)" + iriverh100,iriverh120,iriverh300: "Byggjer database … Fann %d. (STOPP for å gå tilbake.)" ipod*: "Byggjer database … Fann %d. (SPEL/PAUSE for å gå tilbake.)" - x5,m5,gigabeat*,mrobe100: "Byggjer database … Fann %d. (VENSTRE for å gå tilbake.)" - h10,h10_5gb,e200*,c200*,sa9200: "Byggjer database … Fann %d. (TILBAKE for å gå tilbake.)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Byggjer database … Fann %d. (VENSTRE for å gå tilbake.)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Byggjer database … Fann %d. (TILBAKE for å gå tilbake.)" *: "oppføringar funne til databasen" @@ -9871,17 +9871,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Avbrotstid for knappelys" - fuze*,e200*: "Avbrotstid for hjullys" + sansafuze*,sansae200*: "Avbrotstid for hjullys" *: none button_light: "Avbrotstid for knappelys" - fuze*,e200*: "Avbrotstid for hjullys" + sansafuze*,sansae200*: "Avbrotstid for hjullys" @@ -10149,11 +10149,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "" @@ -10227,15 +10227,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "SPEL = ja" - h100,h120,h300: "NAVI = ja" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "VEL = ja" - player: "(SPEL/STOPP)" + iriverh100,iriverh120,iriverh300: "NAVI = ja" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "VEL = ja" + archosplayer: "(SPEL/STOPP)" *: "" @@ -10248,14 +10248,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "PÅ = vel" - h100,h120,h300: "NAVI = vel" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "VEL = ja" + iriverh100,iriverh120,iriverh300: "NAVI = vel" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "VEL = ja" *: none @@ -10267,15 +10267,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Andre = nei" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -10416,15 +10416,15 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Slutt på songliste" - player: "Slutt på liste" + archosplayer: "Slutt på liste" *: "Slutt på songliste" - player: "Slutt på liste" + archosplayer: "Slutt på liste" @@ -11413,15 +11413,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Styreputefølsemd" + gigabeatfx: "Styreputefølsemd" *: none - gigabeatf: "Styreputefølsemd" + gigabeatfx: "Styreputefølsemd" @@ -11827,14 +11827,14 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Høg" + gigabeatfx: "Høg" *: none - gigabeatf: "Høg" + gigabeatfx: "Høg" Index: apps/lang/greek.lang =================================================================== --- apps/lang/greek.lang (revision 23734) +++ apps/lang/greek.lang (working copy) @@ -264,15 +264,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Επικύρωση" - h100,h120,h300: "NAVI = Επικύρωση" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Επικύρωση" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Επικύρωση" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Επικύρωση" + archosplayer: "(PLAY/STOP)" *: "" @@ -284,15 +284,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Any Other = Άκυρο" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -2368,17 +2368,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (OFF για επιστροφή)" - h100,h120,h300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)" + iriverh100,iriverh120,iriverh300: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (STOP για επιστροφή)" ipod*: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)" - x5,m5,gigabeat*,mrobe100: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)" - h10,h10_5gb,e200*,c200*,sa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (LEFT για επιστροφή)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Δημιουργία βάσεως δεδομένων... βρέθηκαν %d (PREV για επιστροφή)" *: "Kαταχωρήσεις βρέθηκαν για τη βάση δεδομένων" @@ -3178,7 +3178,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -3192,7 +3192,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -3206,7 +3206,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -3838,17 +3838,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Χρόνος σβησίματος πλήκτρων" - fuze*,e200*: "Χρόνος σβησίματος τροχού" + sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού" *: none button_light: "Χρόνος σβησίματος πλήκτρων" - fuze*,e200*: "Χρόνος σβησίματος τροχού" + sansafuze*,sansae200*: "Χρόνος σβησίματος τροχού" @@ -4129,14 +4129,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Ρύθμιση" - h100,h120,h300: "NAVI = Ρύθμιση" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Ρύθμιση" + iriverh100,iriverh120,iriverh300: "NAVI = Ρύθμιση" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Ρύθμιση" *: none @@ -4149,22 +4149,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Ακύρωση" - h100,h120,h300: "STOP = Ακύρωση" - ipod*,c200*,sa9200: "MENU = Ακύρωση" - x5,m5: "RECORD = Ακύρωση" - h10,h10_5gb,e200*,fuze*: "PREV = Ακύρωση" - gigabeatf: "POWER = Ακύρωση" + iriverh100,iriverh120,iriverh300: "STOP = Ακύρωση" + ipod*,sansac200*,gogearsa9200: "MENU = Ακύρωση" + iaudiox5,iaudiom5: "RECORD = Ακύρωση" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Ακύρωση" + gigabeatfx: "POWER = Ακύρωση" mrobe100: "DISPLAY = Ακύρωση" gigabeats: "BACK = Ακύρωση" @@ -4692,14 +4692,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Όρισε ΟFF=Ακύρωση" ipod*: "SELECT=Όρισε MENU=Ακύρωση" - h10,h10_5gb: "SELECT=Όρισε PREV=Ακύρωση" + iriverh10,iriverh10_5gb: "SELECT=Όρισε PREV=Ακύρωση" gigabeats: "SELECT=Όρισε POWER=Ακύρωση" @@ -5873,17 +5873,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Μικρόφωνο" - h100,h120,h300: "Εσωτερικό Μικρόφωνο" + iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο" *: none recording: "Μικρόφωνο" - h100,h120,h300: "Εσωτερικό Μικρόφωνο" + iriverh100,iriverh120,iriverh300: "Εσωτερικό Μικρόφωνο" @@ -5909,15 +5909,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Eίσοδος" + recording,archosplayer: "Eίσοδος" *: none - recording,player: "Eίσοδος" + recording,archosplayer: "Eίσοδος" @@ -6847,11 +6847,11 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Μνήμη:" - player: "Μνη:" + archosplayer: "Μνη:" *: "Μέγεθος μνήμης" @@ -6863,13 +6863,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "%d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Μπάτ: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Μπάτ: %d%% %dh %dm" *: "Επίπεδο μπαταρίας" @@ -6927,19 +6927,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "Έιτς Ντι 1" - e200*,c200*,fuze*: "μάικρο Ες Ντι" + sansae200*,sansac200*,sansafuze*: "μάικρο Ες Ντι" ondio*: "Εμ Εμ Σι" @@ -8051,11 +8051,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Τέλος λίστας κομματιών" - player: "Τέλος λίστας" + archosplayer: "Τέλος λίστας" *: "Τέλος λίστας κομματιών" @@ -8298,20 +8298,20 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Ο δίσκος είναι γεμάτος. Πατήστε OFF για συνέχεια." - h100,h120,h300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια." - m5,x5: "Ο δίσκος είναι γεμάτος. Πατήστε POWER για συνέχεια.." - e200*,c200*: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια." + iriverh100,iriverh120,iriverh300: "Ο δίσκος είναι γεμάτος. Πατήστε STOP για συνέχεια." + iaudiom5,iaudiox5: "Ο δίσκος είναι γεμάτος. Πατήστε POWER για συνέχεια.." + sansae200*,sansac200*: "Ο δίσκος είναι γεμάτος. Πατήστε PREV για συνέχεια." *: none - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" @@ -8395,25 +8395,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF για ακύρωση" - player,h100,h120,h300: "STOP για ακύρωση" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP για ακύρωση" ipod*: "PLAY/PAUSE για ακύρωση" - x5,m5: "Long PLAY για ακύρωση" - h10,h10_5gb,e200*,c200*: "PREV για ακύρωση" + iaudiox5,iaudiom5: "Long PLAY για ακύρωση" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV για ακύρωση" gigabeats: "BACK για ακύρωση" - gigabeatf: "POWER για ακύρωση" + gigabeatfx: "POWER για ακύρωση" *: "" @@ -8637,19 +8637,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Μπαταρία: Μέγιστη φόρτιση" + archosrecorder: "Μπαταρία: Μέγιστη φόρτιση" *: none - recorder: "Μπαταρία: Μέγιστη φόρτιση" + archosrecorder: "Μπαταρία: Μέγιστη φόρτιση" @@ -10466,7 +10466,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -11531,15 +11531,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Ευαισθησία πινακίδας αφής" + gigabeatfx: "Ευαισθησία πινακίδας αφής" *: none - gigabeatf: "Ευαισθησία πινακίδας αφής" + gigabeatfx: "Ευαισθησία πινακίδας αφής" @@ -11945,15 +11945,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Ψηλά" + gigabeatfx: "Ψηλά" *: none - gigabeatf: "Ψηλά" + gigabeatfx: "Ψηλά" Index: apps/lang/romaneste.lang =================================================================== --- apps/lang/romaneste.lang (revision 23734) +++ apps/lang/romaneste.lang (working copy) @@ -759,17 +759,17 @@ *: none recording: "Microphone" - h100,h120,h300: "Internal Microphone" + iriverh100,iriverh120,iriverh300: "Internal Microphone" *: none recording: "Microfon" - h100,h120,h300: "Microfon intern" + iriverh100,iriverh120,iriverh300: "Microfon intern" *: none recording: "Microfon" - h100,h120,h300: "Microfon intern" + iriverh100,iriverh120,iriverh300: "Microfon intern" @@ -1411,19 +1411,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Nivel maxim de incarcare" + archosrecorder: "Nivel maxim de incarcare" *: none - recorder: "" + archosrecorder: "" @@ -1449,13 +1449,13 @@ user: core *: "Battery: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Batt: %d%% %dh %dm" *: "Baterie: %d%% %dh %dm" - player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm" - h10,ipodmini,ipodmini2g: "Bat: %d%% %dh %dm" + archosplayer,archosrecorder,archosfmrecorder,archosrecorderv2,ondio*,iriverifp7xx: "%d%% %dh %dm" + iriverh10,ipodmini1g,ipodmini2g: "Bat: %d%% %dh %dm" *: "" @@ -1516,22 +1516,22 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF pentru anulare" - h100,h120,h300: "STOP pentru anulare" - ipod*,c200*,sa9200: "MENU pentru anulare" - x5,m5: "RECORD pentru anulare" - h10,h10_5gb,e200*,fuze*: "PREV pentru anulare" - gigabeatf: "POWER pentru anulare" + iriverh100,iriverh120,iriverh300: "STOP pentru anulare" + ipod*,sansac200*,gogearsa9200: "MENU pentru anulare" + iaudiox5,iaudiom5: "RECORD pentru anulare" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV pentru anulare" + gigabeatfx: "POWER pentru anulare" mrobe100: "DISPLAY pentru anulare" gigabeats: "BACK pentru anulare" @@ -1666,14 +1666,14 @@ *: none alarm: "PLAY=Set OFF=Cancel" ipod*: "SELECT=Set MENU=Cancel" - h10,h10_5gb: "SELECT=Set PREV=Cancel" + iriverh10,iriverh10_5gb: "SELECT=Set PREV=Cancel" gigabeats: "SELECT=Set POWER=Cancel" *: none alarm: "PLAY=Setat OFF=Anulare" ipod*: "SELECT=Setat MENU=Anulare" - h10,h10_5gb: "SELECT=Setat PREV=Anulare" + iriverh10,iriverh10_5gb: "SELECT=Setat PREV=Anulare" gigabeats: "SELECT=Setat POWER=Anulare" @@ -3226,17 +3226,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200*,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Creare bază de date... %d găsite (OFF pentru revenire)" - h100,h120,h300: "Creare bază de date... %d găsite (STOP pentru revenire)" + iriverh100,iriverh120,iriverh300: "Creare bază de date... %d găsite (STOP pentru revenire)" ipod*: "Creare bază de date... %d găsite (PREV pentru revenire)" - x5,m5,gigabeat*,mrobe100: "Creare bază de date... %d găsite (LEFT pentru revenire)" - h10,h10_5gb,e200*,c200*,sa9200: "Creare bază de date... %d găsite (PREV pentru revenire)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Creare bază de date... %d găsite (LEFT pentru revenire)" + iriverh10,iriverh10_5gb,sansae200*,sansac200*,gogearsa9200: "Creare bază de date... %d găsite (PREV pentru revenire)" *: "intrări găsite pentru baza de date" @@ -3757,7 +3757,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -4905,23 +4905,23 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200*,c200*: "The disk is full. Press PREV to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200*,sansac200*: "The disk is full. Press PREV to continue." *: none recording: "Discul este plin. Apasati OFF pentru a continua." - h100,h120,h300: "Discul este plin. Apasati STOP pentru a continua." - m5,x5: "Discul este plin. Apasati POWER pentru a continua." - e200*,c200*: "Discul este plin. Apasati PREV pentru a continua." + iriverh100,iriverh120,iriverh300: "Discul este plin. Apasati STOP pentru a continua." + iaudiom5,iaudiox5: "Discul este plin. Apasati POWER pentru a continua." + sansae200*,sansac200*: "Discul este plin. Apasati PREV pentru a continua." *: none recording: "" - h100,h120,h300: "" - m5,x5: "" - e200*,c200*: "" + iriverh100,iriverh120,iriverh300: "" + iaudiom5,iaudiox5: "" + sansae200*,sansac200*: "" @@ -5012,15 +5012,15 @@ user: core *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer:" - player: "Buf:" + archosplayer: "Buf:" *: "Buffer size" - player: "" + archosplayer: "" @@ -5243,15 +5243,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Da" - h100,h120,h300: "NAVI = Da" - yh*,ipod*,x5,m5,gigabeat*,e200*,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Da" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Da" + samsungyh*,ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200*,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Da" + archosplayer: "(PLAY/STOP)" *: "" @@ -5278,14 +5278,14 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Setat" - h100,h120,h300: "NAVI = Setat" - ipod*,x5,m5,h10,h10_5gb,e200*,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Setat" + iriverh100,iriverh120,iriverh300: "NAVI = Setat" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Setat" *: none @@ -5297,15 +5297,15 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Oricare altul = Nu" - player: none + archosplayer: none *: "" - player: none + archosplayer: none @@ -5668,25 +5668,25 @@ id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200*,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV to abort" gigabeats: "BACK to abort" - gigabeatf: "POWER to abort" + gigabeatfx: "POWER to abort" *: "OFF pentru anulare" - player,h100,h120,h300: "STOP pentru anulare" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP pentru anulare" ipod*: "PLAY/PAUSE pentru anulare" - x5,m5: "PLAY (apasare lunga) pentru anulare" - h10,h10_5gb,e200*,c200*: "PREV pentru anulare" + iaudiox5,iaudiom5: "PLAY (apasare lunga) pentru anulare" + iriverh10,iriverh10_5gb,sansae200*,sansac200*: "PREV pentru anulare" gigabeats: "BACK pentru anulare" - gigabeatf: "POWER pentru anulare" + gigabeatfx: "POWER pentru anulare" *: "" @@ -5965,11 +5965,11 @@ user: core *: "End of Song List" - player: "End of List" + archosplayer: "End of List" *: "Sfarsit lista melodii" - player: "Sfarsit lista" + archosplayer: "Sfarsit lista" *: "End of Song List" @@ -6827,7 +6827,7 @@ id: LANG_JUMP_SCROLL_DELAY - desc: (player) Delay before making a jump scroll + desc: (archosplayer) Delay before making a jump scroll user: core *: "Jump Scroll Delay" @@ -6872,7 +6872,7 @@ id: LANG_ONE_TIME - desc: (player) the jump scroll shall be done "one time" + desc: (archosplayer) the jump scroll shall be done "one time" user: core *: "One time" @@ -7885,15 +7885,15 @@ user: core *: none - recording,player: "Line In" + recording,archosplayer: "Line In" *: none - recording,player: "Intrare" + recording,archosplayer: "Intrare" *: none - recording,player: "Intrare" + recording,archosplayer: "Intrare" @@ -8982,19 +8982,19 @@ *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "HD1" - e200*,c200*,fuze*: "mSD:" + sansae200*,sansac200*,sansafuze*: "mSD:" ondio*: "MMC:" *: none multivolume: "H D 1" - e200*,c200*,fuze*: "micro S D" + sansae200*,sansac200*,sansafuze*: "micro S D" ondio*: "M M C" @@ -10287,17 +10287,17 @@ *: none button_light: "Button Light Timeout" - fuze*,e200*: "Wheel Light Timeout" + sansafuze*,sansae200*: "Wheel Light Timeout" *: none button_light: "Timp iluminare butoane" - fuze*,e200*: "Timp iluminare rotita" + sansafuze*,sansae200*: "Timp iluminare rotita" *: none button_light: "Timp iluminare butoane" - fuze*,e200*: "Timp iluminare rotita" + sansafuze*,sansae200*: "Timp iluminare rotita" @@ -10547,7 +10547,7 @@ id: LANG_JUMP_SCROLL - desc: (player) menu alternative for jump scroll + desc: (archosplayer) menu alternative for jump scroll user: core *: "Jump Scroll" @@ -11544,15 +11544,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Sensibilitate Touchpad" + gigabeatfx: "Sensibilitate Touchpad" *: none - gigabeatf: "Sensibilitate Touchpad" + gigabeatfx: "Sensibilitate Touchpad" @@ -11947,15 +11947,15 @@ user: core *: none - gigabeatf: "High" + gigabeatfx: "High" *: none - gigabeatf: "Mare" + gigabeatfx: "Mare" *: none - gigabeatf: "Mare" + gigabeatfx: "Mare" Index: apps/lang/turkce.lang =================================================================== --- apps/lang/turkce.lang (revision 23734) +++ apps/lang/turkce.lang (working copy) @@ -248,15 +248,15 @@ user: core *: "PLAY = Yes" - h100,h120,h300: "NAVI = Yes" - ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Yes" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Yes" + ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Yes" + archosplayer: "(PLAY/STOP)" *: "PLAY = Devam et" - h100,h120,h300: "NAVI = Devam et" - ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "SELECT = Devam et" - player: "(PLAY/STOP)" + iriverh100,iriverh120,iriverh300: "NAVI = Devam et" + ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "SELECT = Devam et" + archosplayer: "(PLAY/STOP)" *: "" @@ -268,17 +268,17 @@ user: core *: "Any Other = No" - player: none + archosplayer: none *: "Herhangi PLAY'dan başka = İptal et" - h100,h120,h300: "Herhangi NAVI'den başka = İptal et" - ipod*,x5,m5,gigabeat*,e200,c200*,h10,h10_5gb,mrobe100,sa9200: "Herhangi SELECT'ten başka = İptal et" - player: none + iriverh100,iriverh120,iriverh300: "Herhangi NAVI'den başka = İptal et" + ipod*,iaudiox5,iaudiom5,gigabeat*,sansae200,sansac200*,iriverh10,iriverh10_5gb,mrobe100,gogearsa9200: "Herhangi SELECT'ten başka = İptal et" + archosplayer: none *: "" - player: none + archosplayer: none @@ -1554,17 +1554,17 @@ user: core *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "Building database... %d found (OFF to return)" - h100,h120,h300: "Building database... %d found (STOP to return)" + iriverh100,iriverh120,iriverh300: "Building database... %d found (STOP to return)" ipod*: "Building database... %d found (PREV to return)" - x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" - h10,h10_5gb,e200,c200*,sa9200: "Building database... %d found (PREV to return)" + iaudiox5,iaudiom5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)" + iriverh10,iriverh10_5gb,sansae200,sansac200*,gogearsa9200: "Building database... %d found (PREV to return)" *: "entries found for database" @@ -1996,18 +1996,18 @@ user: core *: none - e200: "Wheel Light Timeout" - c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout" + sansae200: "Wheel Light Timeout" + sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout" *: none - e200: "Wheel Light Timeout" - c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout" + sansae200: "Wheel Light Timeout" + sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout" *: none - e200: "Wheel Light Timeout" - c200*,gigabeatf,mrobe100,sa9200: "Button Light Timeout" + sansae200: "Wheel Light Timeout" + sansac200*,gigabeatfx,mrobe100,gogearsa9200: "Button Light Timeout" @@ -2016,15 +2016,15 @@ user: core *: none - gigabeatf,mrobe100: "Button Light Brightness" + gigabeatfx,mrobe100: "Button Light Brightness" *: none - gigabeatf,mrobe100: "Button Light Brightness" + gigabeatfx,mrobe100: "Button Light Brightness" *: none - gigabeatf,mrobe100: "Button Light Brightness" + gigabeatfx,mrobe100: "Button Light Brightness" @@ -2093,19 +2093,19 @@ *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none rtc: "ON = Set" - h100,h120,h300: "NAVI = Set" - ipod*,x5,m5,h10,h10_5gb,e200,c200*,gigabeat*,mrobe100,sa9200: "SELECT = Set" + iriverh100,iriverh120,iriverh300: "NAVI = Set" + ipod*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: "SELECT = Set" *: none - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200,c200*,gigabeat*,mrobe100,sa9200: "" - rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200*,c200*,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" + rtc,iriverh100,iriverh120,iriverh300,iriverh10,iriverh10_5gb,iaudiox5,iaudiom5,ipod*,sansae200*,sansac200*,gigabeat*,mrobe100,gogearsa9200: "" @@ -2115,29 +2115,29 @@ *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none rtc: "OFF = Revert" - h100,h120,h300: "STOP = Revert" - ipod*,c200*,sa9200: "MENU = Revert" - x5,m5: "RECORD = Revert" - h10,h10_5gb,e200*,fuze*: "PREV = Revert" - gigabeatf: "POWER = Revert" + iriverh100,iriverh120,iriverh300: "STOP = Revert" + ipod*,sansac200*,gogearsa9200: "MENU = Revert" + iaudiox5,iaudiom5: "RECORD = Revert" + iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert" + gigabeatfx: "POWER = Revert" mrobe100: "DISPLAY = Revert" gigabeats: "BACK = Revert" *: none - rtc,h100,h120,h300,ipod*,e200,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" - rtc,h100,h120,h300,ipod*,e200*,c200*,x5,m5,h10,h10_5gb,gigabeat*,mrobe100,sa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" + rtc,iriverh100,iriverh120,iriverh300,ipod*,sansae200*,sansac200*,iaudiox5,iaudiom5,iriverh10,iriverh10_5gb,gigabeat*,mrobe100,gogearsa9200: "" @@ -2624,11 +2624,11 @@ user: core *: "Buffer: %d.%03dMB" - player: "Buf: %d.%03dMB" + archosplayer: "Buf: %d.%03dMB" *: "Buffer: %d.%03dMB" - player: "Buf: %d.%03dMB" + archosplayer: "Buf: %d.%03dMB" *: "Buffer size" @@ -2640,17 +2640,17 @@ user: core *: none - e200,c200*: "mSD:" + sansae200,sansac200*: "mSD:" ondio*: "MMC:" *: none - e200,c200*: "MSD:" + sansae200,sansac200*: "MSD:" ondio*: "MMC:" *: none - e200,c200*: "micro S D" + sansae200,sansac200*: "micro S D" ondio*: "M M C" @@ -2887,40 +2887,40 @@ *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200,c200*: "The disk is full. Press UP to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200,sansac200*: "The disk is full. Press UP to continue." *: none recording: "The disk is full. Press OFF to continue." - h100,h120,h300: "The disk is full. Press STOP to continue." - m5,x5: "The disk is full. Press POWER to continue." - e200,c200*: "The disk is full. Press UP to continue." + iriverh100,iriverh120,iriverh300: "The disk is full. Press STOP to continue." + iaudiom5,iaudiox5: "The disk is full. Press POWER to continue." + sansae200,sansac200*: "The disk is full. Press UP to continue." *: none - recording,h100,h120,h300,m5,x5,e200,c200*: "" - recording,h100,h120,h300,m5,x5,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200,sansac200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,sansae200*,sansac200*: "" id: LANG_OFF_ABORT - desc: Used on recorder models + desc: Used on archosrecorder models user: core *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200,sansac200*: "PREV to abort" *: "OFF to abort" - player,h100,h120,h300: "STOP to abort" + archosplayer,iriverh100,iriverh120,iriverh300: "STOP to abort" ipod*: "PLAY/PAUSE to abort" - x5,m5: "Long PLAY to abort" - h10,h10_5gb,e200,c200*: "PREV to abort" + iaudiox5,iaudiom5: "Long PLAY to abort" + iriverh10,iriverh10_5gb,sansae200,sansac200*: "PREV to abort" *: "" @@ -3032,19 +3032,19 @@ id: LANG_BATTERY_TOPOFF_CHARGE - desc: in info display, shows that top off charge is running Only for V1 recorder + desc: in info display, shows that top off charge is running Only for V1 archosrecorder user: core *: none - recorder: "Battery: Top-Off Chg" + archosrecorder: "Battery: Top-Off Chg" *: none - recorder: "Pil en son yüklemeler yapıyor" + archosrecorder: "Pil en son yüklemeler yapıyor" *: none - recorder: "Pil en son yüklemeler yapıyor" + archosrecorder: "Pil en son yüklemeler yapıyor" @@ -3524,7 +3524,7 @@ *: none - recording,h100,h120,h300,m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200*,c200*: "" + recording,iriverh100,iriverh120,iriverh300,iaudiom5,iaudiox5,ipod4g,ipodcolor,ipodnano1g,ipodvideo,sansae200*,sansac200*: "" @@ -4342,15 +4342,15 @@ user: core *: none - gigabeatf: "Touchpad Sensitivity" + gigabeatfx: "Touchpad Sensitivity" *: none - gigabeatf: "Touchpad Duyarlık" + gigabeatfx: "Touchpad Duyarlık" *: none - gigabeatf: "Touchpad Duyarlık" + gigabeatfx: "Touchpad Duyarlık" Index: firmware/export/config-h10.h =================================================================== --- firmware/export/config-h10.h (revision 23734) +++ firmware/export/config-h10.h (working copy) @@ -1,187 +0,0 @@ -/* - * This config file is for the iriver H10 20Gb - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 13 -#define MODEL_NAME "iriver H10 20GB" - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */ - -#ifndef BOOTLOADER -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - * should be defined as well. - * We can currently put the lcd to sleep but it won't wake up properly */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -#endif - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD IRIVER_H10_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_E8564 -#define HAVE_RTC_ALARM -#endif - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8731 audio codec */ -#define HAVE_WM8731 - -/* WM8731 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define AB_REPEAT_ENABLE 1 - -#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* Type of LCD */ -#define CONFIG_LCD LCD_H10_20GB - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 14 /* Match boot contrast */ - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.h10 file */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0B70 -#define USB_PRODUCT_ID 0x00BA - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#endif Index: firmware/export/config-player.h =================================================================== --- firmware/export/config-player.h (revision 23734) +++ firmware/export/config-player.h (working copy) @@ -1,109 +0,0 @@ -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -#define MODEL_NAME "Archos Player/Studio" - -/* define this if you have a charcell LCD display */ -#define HAVE_LCD_CHARCELLS - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -#define LCD_WIDTH 11 -#define LCD_HEIGHT 2 -#define LCD_DEPTH 1 -#define SIM_LCD_WIDTH 132 /* pixels */ -#define SIM_LCD_HEIGHT 64 /* pixels */ - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x7ee57e - -/* define this if you have the Player's keyboard */ -#define CONFIG_KEYPAD PLAYER_PAD - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x8000 - -/* Define this if you have a MAS3507D */ -#define CONFIG_CODEC MAS3507D - -/* Define this if you have a DAC3550A */ -#define HAVE_DAC3550A - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -#define CURRENT_NORMAL 145 /* usual current in mA */ -#define CURRENT_USB 500 /* usual current in mA in USB mode */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -#ifndef SIMULATOR - -/* Define this if you have a SH7034 */ -#define CONFIG_CPU SH7034 - -/* Define this if you control ata power player style - (with PB4, new player only) */ -#define ATA_POWER_PLAYERSTYLE - -/* Define this to the CPU frequency */ -#define CPU_FREQ 12000000 /* cycle time ~83.3ns */ - -/* Define this if you must discharge the data line by driving it low - and then set it to input to see if it stays low or goes high */ -#define HAVE_I2C_LOW_FIRST - -#define CONFIG_I2C I2C_PLAYREC - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 4 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 6 - -/* The start address index for ROM builds */ -#define ROM_START 0x7010 /* for behind BootBox */ - -/* Software controlled LED */ -#define CONFIG_LED LED_REAL - -#define CONFIG_LCD LCD_SSD1801 - -#define BOOTFILE_EXT "mod" -#define BOOTFILE "archos." BOOTFILE_EXT -#define BOOTDIR "/" - -#endif /* SIMULATOR */ - -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 31 -#define DEFAULT_CONTRAST_SETTING 30 - -#define HAVE_SERIAL - Index: firmware/export/config-iaudio7.h =================================================================== --- firmware/export/config-iaudio7.h (revision 23734) +++ firmware/export/config-iaudio7.h (working copy) @@ -1,165 +0,0 @@ -/* - * This config file is for the Iaudio7 series - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 32 -#define MODEL_NAME "Cowon iAudio7" - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* FM Tuner */ -#define CONFIG_TUNER LV24020LP -#define HAVE_TUNER_PWR_CTRL - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/* define hardware samples rate caps mask */ -#define HW_SAMPR_CAPS (/*SAMPR_CAP_88 | */SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you can flip your LCD */ -//#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -//#define HAVE_LCD_INVERT - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -#define HAVE_FAT16SUPPORT - -#if 0 && !defined(SIMULATOR) /* Enable for USB driver test */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x0e21 -#define USB_PRODUCT_ID 0x0750 -#endif - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_TCC - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -/* 16bits for now... */ -#define LCD_DEPTH 16 /* 262144 colours */ -#define LCD_PIXELFORMAT RGB565 /*rgb565*/ - -/*#define LCD_PIXELFORMAT VERTICAL_PACKING*/ - -/* define this to indicate your device's keypad */ -#define CONFIG_KEYPAD IAUDIO67_PAD - -/* #define HAVE_BUTTON_DATA */ - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50606 - -/* define this if you have RTC RAM available for settings */ -//#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Reduce Tremor's ICODE usage */ -#define ICODE_ATTR_TREMOR_NOT_MDCT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* The iaudio7 uses built-in WM8731 codec */ -#define HAVE_WM8731 -/* Codec is slave on serial bus */ -#define CODEC_SLAVE - -/* WM8731 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define CONFIG_I2C I2C_TCC77X - -#define BATTERY_CAPACITY_DEFAULT 540 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 540 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 540 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -#define CONFIG_CHARGING CHARGING_SIMPLE - -#ifndef SIMULATOR - -/* Define this if you have a TCC770 */ -#define CONFIG_CPU TCC770 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Define this to the CPU frequency */ -#define CPU_FREQ 120000000 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define CONFIG_LCD LCD_IAUDIO67 - -#define BOOTFILE_EXT "iaudio" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#ifdef BOOTLOADER -#define TCCBOOT -#endif - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif /* SIMULATOR */ Index: firmware/export/config-c200.h =================================================================== --- firmware/export/config-c200.h (revision 23734) +++ firmware/export/config-c200.h (working copy) @@ -1,211 +0,0 @@ -/* - * This config file is for the Sandisk Sansa e200 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 20 -#define MODEL_NAME "Sandisk Sansa c200 series" - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 132 -#define LCD_HEIGHT 80 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -/* TODO: #define HAVE_LCD_SLEEP */ -/* TODO: #define HAVE_LCD_SLEEP_SETTING <= optional */ - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -/* TODO: #define HAVE_LCD_INVERT */ - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 255 -#define DEFAULT_CONTRAST_SETTING 85 - -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD SANSA_C200_PAD - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -/* The PP5024 has a built-in AustriaMicrosystems AS3514 */ -#define HAVE_AS3514 - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_AS3514 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Some Sansa E200s seem to be FAT16 formatted */ -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner */ -#define CONFIG_TUNER LV24020LP -#define HAVE_TUNER_PWR_CTRL - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 530 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 530 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 530 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Charging implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_TARGET -#define HAVE_POWEROFF_WHILE_CHARGING - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* define current usage levels */ -#define CURRENT_NORMAL 30 /* Should be nearly identical to E200 */ -#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ -#define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/ - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5024 */ -#define CONFIG_CPU PP5022 - -/* Define this if you want to use the PP5024 i2c interface */ -#define CONFIG_I2C I2C_PP5024 - -/* define this if the hardware can be powered off while charging */ -/* Sansa can't be powered off while charging */ -/* #define HAVE_POWEROFF_WHILE_CHARGING */ - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* Type of LCD TODO: hopefully the same as the x5 but check this*/ -#define CONFIG_LCD LCD_C200 - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.e200 file */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -#ifndef BOOTLOADER -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 -#define HAVE_HOTSWAP -#endif - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x7451 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ - -/* Default recording levels */ -#define DEFAULT_REC_MIC_GAIN 23 -#define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 Index: firmware/export/config-iaudiom3.h =================================================================== --- firmware/export/config-iaudiom3.h (revision 23734) +++ firmware/export/config-iaudiom3.h (working copy) @@ -1,175 +0,0 @@ -/* - * This config file is for iAudio M3 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 25 - -#define MODEL_NAME "iAudio M3" - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 96 -#define LCD_DEPTH 2 - -#define LCD_PIXELFORMAT VERTICAL_INTERLEAVED - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x82b4fa - -/* define this if only the remote has an LCD */ -#define HAVE_REMOTE_LCD_AS_MAIN - -#define CONFIG_KEYPAD IAUDIO_M3_PAD - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -/* #define CONFIG_RTC FIXME: most probably none */ - -#define CONFIG_LCD LCD_TL0350A - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* FM Tuner */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define current usage levels */ -#define CURRENT_REMOTE 8 /* additional current when remote connected */ - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -/* Define this if you have a Motorola SCF5249 */ -#define CONFIG_CPU MCF5249 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_COLDFIRE - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Virtual LED (icon) */ -#define CONFIG_LED LED_VIRTUAL /* FIXME: implement hardware LED handling */ - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "iaudio" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 10 -#define MAX_CONTRAST_SETTING 35 -#define DEFAULT_CONTRAST_SETTING 24 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ Index: firmware/export/config-yh920.h =================================================================== --- firmware/export/config-yh920.h (revision 23734) +++ firmware/export/config-yh920.h (working copy) @@ -1,194 +0,0 @@ -/* - * This config file is for the Samsung YH-920 - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 58 -#define MODEL_NAME "Samsung YH-920" - -/* define this if you have recording possibility */ -/* todo #define HAVE_RECORDING */ - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN ) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_11 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_11 | SAMPR_CAP_8) - -/* Type of LCD */ -#define CONFIG_LCD LCD_S1D15E06 - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 2 -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xadd8e6 - -/* todo */ -/* #ifndef BOOTLOADER */ -#if 0 -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - * should be defined as well. - * We can currently put the lcd to sleep but it won't wake up properly */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -#endif - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* Define this if your LCD can set contrast */ -/* todo #define HAVE_LCD_CONTRAST */ - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 14 /* Match boot contrast */ - -/* define this if you can flip your LCD */ -/* todo #define HAVE_LCD_FLIP */ - -/* define this if you can invert the colours on your LCD */ -/* todo #define HAVE_LCD_INVERT */ - -/* put the lcd frame buffer in IRAM */ -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -#define CONFIG_KEYPAD SAMSUNG_YH_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_E8564 -/* TODO ??? */ -//#define HAVE_RTC_ALARM -#endif - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* We're able to shut off power to the HDD */ -#ifndef SIMULATOR -/* todo #define HAVE_ATA_POWER_OFF */ -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the AK4537 audio codec */ -#define HAVE_AK4537 - -/* AK4537 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define AB_REPEAT_ENABLE 1 - -#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x04e8 -#define USB_PRODUCT_ID 0x5022 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0x00 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 0x00 - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#endif /* !SIMULATOR */ Index: firmware/export/config-clip.h =================================================================== --- firmware/export/config-clip.h (revision 23734) +++ firmware/export/config-clip.h (working copy) @@ -1,210 +0,0 @@ -/* - * This config file is for the Sandisk Sansa Clip - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 40 -#define MODEL_NAME "Sandisk Sansa Clip" -#define FIRMWARE_OFFSET_FILE_DATA 8 -#define FIRMWARE_OFFSET_FILE_CRC 0 - -#if 0 /* disabled since there is no driver (yet) */ - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -#endif - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXELFORMAT VERTICAL_PACKING -#define HAVE_NEGATIVE_LCD /* bright on dark */ -#define HAVE_LCD_SPLIT /* split display */ - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x000000 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x0de2e5 - -#define LCD_DARKCOLOR_2 0x000000 -#define LCD_BRIGHTCOLOR_2 0x000000 -#define LCD_BL_DARKCOLOR_2 0x000000 -#define LCD_BL_BRIGHTCOLOR_2 0xffe60f - -#define LCD_SPLIT_POS 16 -#define LCD_SPLIT_LINES 2 - -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -#ifndef BOOTLOADER -/* Define this if your LCD can be put to sleep. - * HAVE_LCD_ENABLE should be defined as well. */ -//#define HAVE_LCD_SLEEP -//#define HAVE_LCD_SLEEP_SETTING -#endif - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the pixels */ -#define HAVE_LCD_INVERT - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 50 -#define DEFAULT_CONTRAST_SETTING 30 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD SANSA_CLIP_PAD - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -/* We're working on the assumption that the AS3525 has something - similar to the AS3514 for audio codec etc */ -#define HAVE_AS3514 - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_AS3514 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x48000 /* in IRAM */ - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x60000 - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner */ -#define CONFIG_TUNER SI4700 /* in fact SI4702 but let's hope it's compatible */ -//#define HAVE_TUNER_PWR_CTRL - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 350 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 350 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 350 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Charging implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_TARGET - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have a AMS AS3525 SoC */ -#define CONFIG_CPU AS3525 - -/* Define how much SD sectors are reserved for OF */ -#define AMS_OF_SIZE 0x5000 - -/* Define this if you want to use the AS3525 i2c interface */ -#define CONFIG_I2C I2C_AS3525 - -/* define this if the hardware can be powered off while charging */ -/* Sansa can't be powered off while charging */ -/* #define HAVE_POWEROFF_WHILE_CHARGING */ - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 250000000 - -/* Type of LCD */ -#define CONFIG_LCD LCD_SSD1303 - -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - -#define CONFIG_USBOTG USBOTG_AS3525 - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x7433 - -#endif /* BOOTLOADER */ - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "sansa" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ - -/** Port-specific settings **/ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Default recording levels */ -#define DEFAULT_REC_MIC_GAIN 23 -#define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 Index: firmware/export/config-ondiofm.h =================================================================== --- firmware/export/config-ondiofm.h (revision 23734) +++ firmware/export/config-ondiofm.h (working copy) @@ -1,143 +0,0 @@ -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define MODEL_NAME "Ondio FM" - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 112 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXEL_ASPECT_WIDTH 4 -#define LCD_PIXEL_ASPECT_HEIGHT 5 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x82b4fa - -/* define this if you have an Ondio style 6-key keyboard */ -#define CONFIG_KEYPAD ONDIO_PAD - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x8000 - -#ifndef BOOTLOADER -/* Define this if you have an FM Radio */ -#define CONFIG_TUNER (S1A0903X01 | TEA5767) /* to be decided at runtime */ -#define CONFIG_TUNER_XTAL 13000000 -#endif - -/* Define this if you have a MAS3587F */ -#define CONFIG_CODEC MAS3587F - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* define current usage levels */ -#define CURRENT_NORMAL 95 /* average, nearly proportional to 1/U */ -#define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ -#define CURRENT_BACKLIGHT 0 /* no backlight */ - -#ifndef SIMULATOR - -/* Define this if you have a SH7034 */ -#define CONFIG_CPU SH7034 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 12000000 - -/* Define this for different I2C pinout */ -#define CONFIG_I2C I2C_ONDIO - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 20 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 6 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 24 - -/* Define this if the tuner is switched on by software */ -#define HAVE_TUNER_PWR_CTRL - -/* The start address index for ROM builds */ -/* #define ROM_START 0x16010 for behind original Archos */ -#define ROM_START 0x7010 /* for behind BootBox */ - -/* Define this if the display is mounted upside down */ -#define HAVE_DISPLAY_FLIPPED - -/* Define this for different ADC channel assignment */ -#define HAVE_ONDIO_ADC - -/* Define this for MMC support instead of ATA harddisk */ -#define CONFIG_STORAGE STORAGE_MMC - -/* Define this to support mounting FAT16 partitions */ -#define HAVE_FAT16SUPPORT - -/* Define this if the MAS SIBI line can be controlled via PB8 */ -#define HAVE_MAS_SIBI_CONTROL - -/* define this if more than one device/partition can be used */ -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 - -/* define this if media can be exchanged on the fly */ -#define HAVE_HOTSWAP - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "ajz" -#define BOOTFILE "ajbrec." BOOTFILE_EXT -#define BOOTDIR "/" - -#endif /* SIMULATOR */ - -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 - Index: firmware/export/config-creativezvm.h =================================================================== --- firmware/export/config-creativezvm.h (revision 23734) +++ firmware/export/config-creativezvm.h (working copy) @@ -1,179 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the Creative Zen Vision:M - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x00900000 - -#define CREATIVE_ZVM 1 - -#define MODEL_NAME "Creative Zen Vision:M" - -/* This makes it part of the Creative Zen Vision family :) */ -#define CREATIVE_ZVx 1 - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 26 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -//#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define CONFIG_LCD LCD_CREATIVEZVM - -/* choose the lcd orientation. both work */ -#define CONFIG_ORIENTATION SCREEN_PORTRAIT - -#define LCD_WIDTH 320 -#define LCD_HEIGHT 240 - -#define LCD_DEPTH 16 /* 65k colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -/* Disabled until properly working -#define HAVE_LCD_ENABLE */ - -#define CONFIG_KEYPAD CREATIVEZVM_PAD -#define HAVE_HEADPHONE_DETECTION -//#define HAVE_TOUCHPAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -//#define CONFIG_RTC RTC_RX5X348AB - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -//#define HAVE_BACKLIGHT - -//#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -//#define MIN_BRIGHTNESS_SETTING 0 -//#define MAX_BRIGHTNESS_SETTING 127 -//#define DEFAULT_BRIGHTNESS_SETTING 85 /* OF "full brightness" */ -//#define DEFAULT_DIMNESS_SETTING 22 /* OF "most dim" */ - -/* Define this if you have a software controlled poweroff */ -//#define HAVE_SW_POWEROFF -//TODO: enable this back - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -/* Define this if you have the TLV320 audio codec -> controlled by the DSP */ -#define HAVE_TLV320 - -#define CONFIG_I2C I2C_DM320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ - SAMPR_CAP_11)*/ - -#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -//#define CONFIG_CHARGING CHARGING_MONITOR - -#ifndef SIMULATOR - -/* Define this if you have a TI TMS320DM320 */ -#define CONFIG_CPU DM320 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 16934400 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* define this if the backlight can be set to a brightness */ -//#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -/* #define HAVE_ADJUSTABLE_CPU_FREQ */ - -#define BOOTFILE_EXT "zvm" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define CONFIG_USBOTG USBOTG_ISP1583 -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x041e -#define USB_PRODUCT_ID 0x4133 -#define USB_NUM_ENDPOINTS 7 - -/*DEBUGGING!*/ -/* -#define THREAD_EXTRA_CHECKS 1 -#define DEBUG 1 -#define debug(msg) printf(msg) -#define BUTTON_DEBUG -*/ - -#endif Index: firmware/export/config-fuze.h =================================================================== --- firmware/export/config-fuze.h (revision 23734) +++ firmware/export/config-fuze.h (working copy) @@ -1,208 +0,0 @@ -/* - * This config file is for the Sandisk Sansa Fuze - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 43 -#define MODEL_NAME "Sandisk Sansa Fuze" - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -#if 0 -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -/* Default recording levels */ -#define DEFAULT_REC_MIC_GAIN 23 -#define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#endif -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -#ifndef BOOTLOADER/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -*/ - -/* define this if you can flip your LCD */ -//#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -//#define HAVE_LCD_INVERT - - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_AS3514 - -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -#endif /* !BOOTLOADER */ - -/* put the lcd frame buffer in IRAM */ -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR - -#define CONFIG_KEYPAD SANSA_FUZE_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - - -/* LCD dimensions */ -#define LCD_WIDTH 220 -#define LCD_HEIGHT 176 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - - -/* We're working on the assumption that the AS3525 has something - similar to the AS3514 for audio codec etc */ -#define HAVE_AS3514 - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Some Sansa Fuzes seem to be FAT16 formatted */ -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner - suspected to be the SI4702 */ -#define CONFIG_TUNER SI4700 -/* #define HAVE_TUNER_PWR_CTRL */ - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 540 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 1 - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 550 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 550 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 550 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Charging implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_TARGET - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have an AMS AS3525*/ -#define CONFIG_CPU AS3525 - -/* Define how much SD sectors are reserved for OF */ -#define AMS_OF_SIZE 0xF000 - -/* Define this if you want to use the AS2525 i2c interface */ -#define CONFIG_I2C I2C_AS3525 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 250000000 - -/* Type of LCD */ -#define CONFIG_LCD LCD_FUZE - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.e200 file */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -#ifndef BOOTLOADER -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 -#define HAVE_HOTSWAP -#endif - -#define USB_HANDLED_BY_OF - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_AS3525 - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x7423 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "sansa" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ - Index: firmware/export/config-e200v2.h =================================================================== --- firmware/export/config-e200v2.h (revision 23734) +++ firmware/export/config-e200v2.h (working copy) @@ -1,214 +0,0 @@ -/* - * This config file is for the Sandisk Sansa e200v2 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 41 -#define MODEL_NAME "Sandisk Sansa e200v2 series" - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -#if 0 -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -#endif -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 176 -#define LCD_HEIGHT 220 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#ifndef BOOTLOADER -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING - */ -#endif - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* put the lcd frame buffer in IRAM */ -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR - -#define CONFIG_KEYPAD SANSA_E200_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -/* We're working on the assumption that the AS3525 has something - similar to the AS3514 for audio codec etc */ -#define HAVE_AS3514 - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_AS3514 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Some Sansa E200s seem to be FAT16 formatted */ -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner - suspected to be the SI4702 */ -#define CONFIG_TUNER SI4700 -/* #define HAVE_TUNER_PWR_CTRL */ - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 540 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 1 - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 730 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 730 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 730 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Charging implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_TARGET - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have an AMS AS3525*/ -#define CONFIG_CPU AS3525 - -/* Define how much SD sectors are reserved for OF */ -#define AMS_OF_SIZE 0xF000 - -/* Define this if you want to use the AS2525 i2c interface */ -#define CONFIG_I2C I2C_AS3525 - -/* define this if the hardware can be powered off while charging */ -/* Sansa can't be powered off while charging */ -/* #define HAVE_POWEROFF_WHILE_CHARGING */ - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* Type of LCD TODO: hopefully the same as the x5 but check this*/ -#define CONFIG_LCD LCD_X5 - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.e200 file */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -#ifndef BOOTLOADER -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 -#define HAVE_HOTSWAP -#endif - -#define USB_HANDLED_BY_OF - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_AS3525 - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x7423 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "sansa" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ - -/* Default recording levels */ -#define DEFAULT_REC_MIC_GAIN 23 -#define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 Index: firmware/export/config-ifp7xx.h =================================================================== --- firmware/export/config-ifp7xx.h (revision 23734) +++ firmware/export/config-ifp7xx.h (working copy) @@ -1,130 +0,0 @@ -/* - * This config file is for iriver iFP-799 - */ -#define TARGET_TREE - -#define IRIVER_IFP7XX_SERIES 1 - -#define MODEL_NAME "iriver iFP-799" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 6 - -/* define this if you have recording possibility */ -/*#define HAVE_RECORDING*/ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -/* #define HAVE_LCD_COLOR */ - -/* define this if you would like tagcache to build on this target */ -/* #define HAVE_TAGCACHE */ - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5e6854 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x3ca0e6 - -#define CONFIG_KEYPAD IRIVER_IFP7XX_PAD - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_IFP7XX - -#define HAVE_FAT16SUPPORT - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x38000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x10000 - -/* Define this if you have the WM8975 audio codec */ -/* #define HAVE_WM8975 */ - -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 40 - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2800 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -#ifndef SIMULATOR - -/* Define this if you have a Philips PNX0101 */ -#define CONFIG_CPU PNX0101 - -/* Define this if you want to use the PNX0101 i2c interface */ -#define CONFIG_I2C I2C_PNX0101 - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* Define this to the CPU frequency */ -#define CPU_FREQ 48000000 - -#define CONFIG_LCD LCD_IFP7XX - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define USB_ISP1582 - -#define HAVE_GDB_API - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "iriver" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define IBSS_ATTR_VOICE_STACK -#define ICODE_ATTR_TREMOR_NOT_MDCT -#define ICODE_ATTR_TREMOR_MDCT -#define ICODE_ATTR_FLAC -#define IBSS_ATTR_FLAC_DECODED0 -#define ICONST_ATTR_MPA_HUFFMAN -#define IBSS_ATTR_MPC_SAMPLE_BUF -#define ICODE_ATTR_ALAC -#define IBSS_ATTR_SHORTEN_DECODED0 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif Index: firmware/export/config-mrobe100.h =================================================================== --- firmware/export/config-mrobe100.h (revision 23734) +++ firmware/export/config-mrobe100.h (working copy) @@ -1,201 +0,0 @@ -/* - * This config file is for the Olympus m:robe MR-100 - */ - -#define TARGET_TREE - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 23 -#define MODEL_NAME "Olympus m:robe MR-100" - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 1 - -#define LCD_PIXELFORMAT VERTICAL_PACKING -#define HAVE_NEGATIVE_LCD /* bright on dark */ - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x323232 -#define LCD_BL_DARKCOLOR 0x5e0202 -#define LCD_BL_BRIGHTCOLOR 0xf10603 - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#ifndef BOOTLOADER -/* Define this if you have an remote lcd */ -#define HAVE_REMOTE_LCD - -#define LCD_REMOTE_WIDTH 79 -#define LCD_REMOTE_HEIGHT 16 -#define LCD_REMOTE_DEPTH 1 -#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING - -/* Remote display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_REMOTE_DARKCOLOR 0x000000 -#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a -#define LCD_REMOTE_BL_DARKCOLOR 0x000000 -#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa -#endif /* BOOTLOADER */ - -#define CONFIG_KEYPAD MROBE100_PAD -#define CONFIG_REMOTE_KEYPAD MROBE_REMOTE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_MR100 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Wolfsom audio codec */ -#define HAVE_WM8751 -#define CODEC_SRCTRL_44100HZ (0x40|(0x11 << 1)|1) - -#define AB_REPEAT_ENABLE 1 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* We can fade the backlight by using PWM */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -#define HAVE_BUTTONLIGHT_BRIGHTNESS - -/* Remote LCD contrast range and defaults */ -#define MIN_REMOTE_CONTRAST_SETTING 0 -#define MAX_REMOTE_CONTRAST_SETTING 15 -#define DEFAULT_REMOTE_CONTRAST_SETTING 8 - -/* Define this if your LCD can be enabled/disabled */ -/* TODO: #define HAVE_LCD_ENABLE */ - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - * should be defined as well. - * We can currently put the lcd to sleep but it won't wake up properly */ -/*TODO: #define HAVE_LCD_SLEEP*/ -/*TODO: #define HAVE_LCD_SLEEP_SETTING <= optional */ - -#define BATTERY_CAPACITY_DEFAULT 720 /* default battery capacity */ - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* Type of mobile power */ -#define CONFIG_BATTERY BATT_LIION750 -#define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 750 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* Type of LCD */ -#define CONFIG_LCD LCD_MROBE100 - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 40 -#define DEFAULT_CONTRAST_SETTING 20 - - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x07B4 -#define USB_PRODUCT_ID 0x0280 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -/* Offset ( in the firmware file's header ) to the file CRC and data. - Not used for the mrobe 100, since it boots an mi4 file, but needed - for compatibility. */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x0 - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#endif Index: firmware/export/config-mrobe500.h =================================================================== --- firmware/export/config-mrobe500.h (revision 23734) +++ firmware/export/config-mrobe500.h (working copy) @@ -1,251 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2007 by Karl Kurbjun - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the M:Robe 500i - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x00900000 - -#define OLYMPUS_MROBE_500 1 -#define MODEL_NAME "Olympus M:Robe 500i" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 22 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* Define this to add support for ATA DMA */ -//#define HAVE_ATA_DMA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define CONFIG_LCD LCD_MROBE500 - -/* These defines are used internal to this header */ -#define _LCD_RES_QVGA 1 -#define _LCD_RES_VGA 2 -#define _LCD_PORTRAIT 1 -#define _LCD_LANDSCAPE 2 - -/* Setup the resolution and orientation */ -#define _RESOLUTION _LCD_RES_VGA -#define _ORIENTATION _LCD_LANDSCAPE - -#if _RESOLUTION == _LCD_RES_VGA -#define LCD_NATIVE_WIDTH 480 -#define LCD_NATIVE_HEIGHT 640 -#else -#define LCD_NATIVE_WIDTH 240 -#define LCD_NATIVE_HEIGHT 320 -#endif - -/* choose the lcd orientation. CONFIG_ORIENTATION defined in config.h */ -#if _ORIENTATION == _LCD_PORTRAIT -/* This is the Portrait setup */ -#define LCD_WIDTH LCD_NATIVE_WIDTH -#define LCD_HEIGHT LCD_NATIVE_HEIGHT -#else -/* This is the Landscape setup */ -#define LCD_WIDTH LCD_NATIVE_HEIGHT -#define LCD_HEIGHT LCD_NATIVE_WIDTH -#endif - -#define LCD_DEPTH 16 /* 65k colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#define MAX_ICON_HEIGHT 35 -#define MAX_ICON_WIDTH 35 - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING - -/* remote LCD */ -#define HAVE_REMOTE_LCD -#define LCD_REMOTE_WIDTH 79 -#define LCD_REMOTE_HEIGHT 16 -#define LCD_REMOTE_DEPTH 1 - -/* Remote display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_REMOTE_DARKCOLOR 0x000000 -#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a -#define LCD_REMOTE_BL_DARKCOLOR 0x000000 -#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa - -#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING - -#define CONFIG_REMOTE_KEYPAD MROBE_REMOTE - -#define MIN_REMOTE_CONTRAST_SETTING 0 -#define MAX_REMOTE_CONTRAST_SETTING 15 -#define DEFAULT_REMOTE_CONTRAST_SETTING 7 - -#define CONFIG_KEYPAD MROBE500_PAD -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -//#define HAVE_HARDWARE_BEEP - -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_RX5X348AB - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define HAVE_BACKLIGHT_BRIGHTNESS - -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 0 -#define MAX_BRIGHTNESS_SETTING 127 -#define DEFAULT_BRIGHTNESS_SETTING 85 /* OF "full brightness" */ -#define DEFAULT_DIMNESS_SETTING 22 /* OF "most dim" */ - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#if LCD_NATIVE_WIDTH < 480 -#define PLUGIN_BUFFER_SIZE 0x100000 -#else -/* THe larger screen needs larger bitmaps in plugins */ -#define PLUGIN_BUFFER_SIZE 0x200000 -#endif - -#define HW_SAMPR_CAPS SAMPR_CAP_44 - -#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1000 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2000 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* define current usage levels */ -#define CURRENT_NORMAL 100 /* Measured */ -#define CURRENT_BACKLIGHT 100 /* Over 200 mA total measured when on */ -#define CURRENT_RECORD 0 /* no recording */ - -/* Hardware controlled charging with monitoring */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* Define this if you have a Texas Instruments TSC2100 touch screen */ -#define HAVE_TSC2100 - -#if !defined(SIMULATOR) - -/* M66591 register base */ -#define M66591_BASE 0x60000000 - -/* enable these for the usb stack */ -#define CONFIG_USBOTG USBOTG_M66591 -#define USE_ROCKBOX_USB -//#define USB_ENABLE_SERIAL -#define HAVE_USBSTACK -/* usb stack and driver settings */ -#define USB_NUM_ENDPOINTS 7 -#define USB_VENDOR_ID 0x07b4 -#define USB_PRODUCT_ID 0x0281 - -/* Define this if hardware supports alternate blitting */ -#define HAVE_LCD_MODES LCD_MODE_RGB565 | LCD_MODE_YUV | LCD_MODE_PAL256 - -#define CONFIG_CPU DM320 - -#define CONFIG_I2C I2C_DM320 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 87500000 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* define this if the backlight can be set to a brightness */ -#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "mrobe500" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif Index: firmware/export/config-yps3.h =================================================================== --- firmware/export/config-yps3.h (revision 23734) +++ firmware/export/config-yps3.h (working copy) @@ -1,186 +0,0 @@ -/* - * This config file is for Samsung YP-S3 - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 53 - -#define MODEL_NAME "Samsumg YP-S3" - -/* define this if you have recording possibility */ -//#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -//#define HAVE_LCD_FLIP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -//#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_SAMSUNG - -/* LCD dimensions */ -#define LCD_WIDTH 176 -#define LCD_HEIGHT 220 -#define LCD_DEPTH 16 /* pseudo 262.144 colors */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -//#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -//#define HAVE_LCD_SLEEP - -/* We have button lights */ -#define HAVE_BUTTON_LIGHT - -#define CONFIG_KEYPAD MEIZU_M3_PAD - -/* We have headphone detection */ -#define HAVE_HEADPHONE_DETECTION - -//#define AB_REPEAT_ENABLE 1 -//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_S35390A - -/* Define the type of audio codec */ -//#define HAVE_WM.... - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* FM Tuner */ -#define CONFIG_TUNER SI4700 -#define CONFIG_TUNER_XTAL 32768 - -/* assume no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 580 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 580 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 580 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging, software can monitor plug and charge state */ -#define CONFIG_CHARGING CHARGING_MONITOR - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -//#define HAVE_LCD_CONTRAST - -/* We have a Samsung S5L8700 */ -#define CONFIG_CPU S5L8700 - -/* We use the S5L8700 i2c interface */ -#define CONFIG_I2C I2C_S5L8700 - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 200000000 - -/* Define this if you have ATA power-off control */ -//#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB */ -//#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x04E8 -#define USB_PRODUCT_ID 0x5090 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "yps3" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -//#define BOOTLOADER_ENTRYPOINT 0x001F0000 -//#define FLASH_ENTRYPOINT 0x00001000 -//#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 1 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 0 -#define MAX_BRIGHTNESS_SETTING 15 -#define DEFAULT_BRIGHTNESS_SETTING 10 - Index: firmware/export/config-e200.h =================================================================== --- firmware/export/config-e200.h (revision 23734) +++ firmware/export/config-e200.h (working copy) @@ -1,219 +0,0 @@ -/* - * This config file is for the Sandisk Sansa e200 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 16 -#define MODEL_NAME "Sandisk Sansa e200 series" - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 176 -#define LCD_HEIGHT 220 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#ifndef BOOTLOADER -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -#endif - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD SANSA_E200_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS -/* The PP5024 has a built-in AustriaMicrosystems AS3514 */ -#define HAVE_AS3514 - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_AS3514 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Some Sansa E200s seem to be FAT16 formatted */ -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner */ -#define CONFIG_TUNER LV24020LP -#define HAVE_TUNER_PWR_CTRL - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 540 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 1 - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 750 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Charging implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_TARGET -#define HAVE_POWEROFF_WHILE_CHARGING - -/* define current usage levels */ -#define CURRENT_NORMAL 30 /* Toni's measurements in Nov 2008 */ -#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ -#define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/ - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5024 */ -#define CONFIG_CPU PP5024 - -/* Define this if you want to use the PP5024 i2c interface */ -#define CONFIG_I2C I2C_PP5024 - -/* define this if the hardware can be powered off while charging */ -/* Sansa can't be powered off while charging */ -/* #define HAVE_POWEROFF_WHILE_CHARGING */ - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* Type of LCD TODO: hopefully the same as the x5 but check this*/ -#define CONFIG_LCD LCD_X5 - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.e200 file */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -#ifndef BOOTLOADER -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 -#define HAVE_HOTSWAP -#endif - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x7421 - - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ - - -/** Port-specific settings **/ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Default recording levels */ -#define DEFAULT_REC_MIC_GAIN 23 -#define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 - -#ifdef E200R_INSTALLER -#define IRAMORIG 0x40004000 -#endif - Index: firmware/export/config-m200.h =================================================================== --- firmware/export/config-m200.h (revision 23734) +++ firmware/export/config-m200.h (working copy) @@ -1,136 +0,0 @@ -/* - * This config file is for the Sansa M200 series - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 29 - -#define MODEL_NAME "Sandisk Sansa m200 series" - -/* Enable FAT16 support */ -#define HAVE_FAT16SUPPORT - -/* define this if you have recording possibility */ -//#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -//#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_TCC - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_BARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5e6854 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x3ca0e6 - -/* define this to indicate your device's keypad */ -#define CONFIG_KEYPAD SANSA_M200_PAD - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_TCC77X - -/* define this if you have RTC RAM available for settings */ -//#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x38000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x10000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* Define this if you have the TLV320 audio codec */ -#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define CONFIG_I2C I2C_TCC77X - -#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -#ifndef SIMULATOR - -/* Define this if you have a TCC770 */ -#define CONFIG_CPU TCC770 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Define this to the CPU frequency */ -#define CPU_FREQ 120000000 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "m200" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/" - -#define IBSS_ATTR_VOICE_STACK -#define ICODE_ATTR_TREMOR_NOT_MDCT -#define ICODE_ATTR_TREMOR_MDCT -#define ICODE_ATTR_FLAC -#define IBSS_ATTR_FLAC_DECODED0 -#define ICONST_ATTR_MPA_HUFFMAN -#define IBSS_ATTR_MPC_SAMPLE_BUF -#define ICODE_ATTR_ALAC -#define IBSS_ATTR_SHORTEN_DECODED0 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif /* SIMULATOR */ Index: firmware/export/config-yh925.h =================================================================== --- firmware/export/config-yh925.h (revision 23734) +++ firmware/export/config-yh925.h (working copy) @@ -1,192 +0,0 @@ -/* - * This config file is for the Samsung YH-925 - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 59 -#define MODEL_NAME "Samsung YH-925" - -/* define this if you have recording possibility */ -/* todo #define HAVE_RECORDING */ - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN ) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_11 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_11 | SAMPR_CAP_8) - -/* Type of LCD */ -#define CONFIG_LCD LCD_YH925 - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 - -/* todo */ -/* #ifndef BOOTLOADER */ -#if 0 -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - * should be defined as well. - * We can currently put the lcd to sleep but it won't wake up properly */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -#endif - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 14 /* Match boot contrast */ - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -/* todo #define HAVE_LCD_INVERT */ - -/* put the lcd frame buffer in IRAM */ -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -#define CONFIG_KEYPAD SAMSUNG_YH_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_E8564 -/* TODO */ -//#define HAVE_RTC_ALARM -#endif - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* We're able to shut off power to the HDD */ -#ifndef SIMULATOR -/* todo #define HAVE_ATA_POWER_OFF */ -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the AK4537 audio codec */ -#define HAVE_AK4537 - -/* AK4537 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define AB_REPEAT_ENABLE 1 - -#define BATTERY_CAPACITY_DEFAULT 900 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1150 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -/* todo - check */ -#define USB_VENDOR_ID 0x04e8 -#define USB_PRODUCT_ID 0x5024 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0x00 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 0x00 - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#endif /* !SIMULATOR */ Index: firmware/export/config-ipodvideo.h =================================================================== --- firmware/export/config-ipodvideo.h (revision 23734) +++ firmware/export/config-ipodvideo.h (working copy) @@ -1,225 +0,0 @@ -/* - * This config file is for the Apple iPod Video - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod Video" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 5 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS HW_SAMPR_CAPS - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 320 -#define LCD_HEIGHT 240 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* LCD stays visible without backlight - simulator hint */ -#define HAVE_TRANSFLECTIVE_LCD - -#define CONFIG_KEYPAD IPOD_4G_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50605 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this if you can switch on/off the accessory power supply */ -#define HAVE_ACCESSORY_SUPPLY - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8758 audio codec */ -#define HAVE_WM8758 - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -#ifndef BOOTLOADER -/* Support for LCD sleep/BCM shutdown */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -/* The same code may also be used when shutting down the iPod */ -#define HAVE_LCD_SHUTDOWN -#endif - -/* We can fade the backlight by using PWM */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 32 -#define DEFAULT_BRIGHTNESS_SETTING 16 - - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 270 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 3 - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -/* Type of mobile power */ -#if (MEM==32) /* this is the 30GB-model */ -# define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity for the 30GB model */ -# define BATTERY_CAPACITY_MIN 300 /* min. capacity selectable */ -# define BATTERY_CAPACITY_MAX 800 /* max. capacity selectable */ -#else /* these are the 60/80GB-models */ -# define BATTERY_CAPACITY_DEFAULT 600 /* default battery capacity for the 60/80GB model */ -# define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -# define BATTERY_CAPACITY_MAX 1000 /* max. capacity selectable */ -#endif -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* define current usage levels */ -#define CURRENT_NORMAL 35 /* MP3: ~11h out of 400mAh battery (30GB) or ~17h out of 600mAh (60GB) */ -#define CURRENT_BACKLIGHT 20 /* FIXME: this needs adjusting */ -#if defined(HAVE_RECORDING) -#define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ -#endif - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5022 */ -#define CONFIG_CPU PP5022 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -#define CONFIG_LCD LCD_IPODVIDEO - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -/*Disable USB for the release due to charging issues */ -/*#define USE_ROCKBOX_USB*/ -#define USB_VENDOR_ID 0x05ac -#define USB_PRODUCT_ID 0x1209 - -/* Virtual LED (icon) */ -#define CONFIG_LED LED_VIRTUAL - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -/* Define this if you can read an absolute wheel position */ -#define HAVE_WHEEL_POSITION - -/* define this if the device has larger sectors when accessed via USB */ -/* (only relevant in disk.c, fat.c now always supports large virtual sectors) */ -#define MAX_LOG_SECTOR_SIZE 2048 - -/* define this if the hard drive uses large physical sectors (ATA-7 feature) */ -/* and doesn't handle them in the drive firmware */ -#define MAX_PHYS_SECTOR_SIZE 1024 - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IPOD_ACCESSORY_PROTOCOL -#define HAVE_SERIAL - -#endif Index: firmware/export/config-h10_5gb.h =================================================================== --- firmware/export/config-h10_5gb.h (revision 23734) +++ firmware/export/config-h10_5gb.h (working copy) @@ -1,167 +0,0 @@ -/* - * This config file is for the iriver H10 5/6Gb model - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 14 -#define MODEL_NAME "iriver H10 5/6GB" - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */ - -/*#define IRAM_LCDFRAMEBUFFER IDATA_ATTR*//* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD IRIVER_H10_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_E8564 -#define HAVE_RTC_ALARM -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8731 audio codec */ -#define HAVE_WM8731 - -/* WM8731 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define AB_REPEAT_ENABLE 1 - -#define BATTERY_CAPACITY_DEFAULT 820 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 900 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 10 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -/* TODO: this is probably wrong */ -#define CPU_FREQ 75000000 - -/* Type of LCD */ -#define CONFIG_LCD LCD_H10_5GB - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0x8 - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.h10 file */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0B70 -#define USB_PRODUCT_ID 0x00BA - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#endif Index: firmware/export/config-ipod3g.h =================================================================== --- firmware/export/config-ipod3g.h (revision 23734) +++ firmware/export/config-ipod3g.h (working copy) @@ -1,175 +0,0 @@ -/* - * This config file is for the Apple iPod 3g - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod 3g" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 7 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -/*#define HAVE_RECORDING*/ - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if the LCD needs to be shutdown */ -#define HAVE_LCD_SHUTDOWN - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 2 /* 4 colours - 2bpp */ - -#define LCD_PIXELFORMAT HORIZONTAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xadd8e6 - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -#define HAVE_LCD_CONTRAST - -/* LCD contrast */ -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 40 /* Match boot contrast */ - -#define CONFIG_KEYPAD IPOD_3G_PAD - -#define HAVE_SCROLLWHEEL - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50605 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this if you can switch on/off the accessory power supply */ -#define HAVE_ACCESSORY_SUPPLY - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8731L audio codec */ -#define HAVE_WM8731 - -/* WM8731 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -#define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 10 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5002 */ -#define CONFIG_CPU PP5002 - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* Define this if you want to use the PP5002 i2c interface */ -#define CONFIG_I2C I2C_PP5002 - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -#define CONFIG_LCD LCD_IPOD2BPP - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define USB_HANDLED_BY_OF -/* actually both firewire and USB, USB isn't handled yet */ - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif /* SIMULATOR */ Index: firmware/export/config-ipodcolor.h =================================================================== --- firmware/export/config-ipodcolor.h (revision 23734) +++ firmware/export/config-ipodcolor.h (working copy) @@ -1,180 +0,0 @@ -/* - * This config file is for the Apple iPod Color/Photo - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod Color/Photo" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 3 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 220 -#define LCD_HEIGHT 176 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */ - -/* LCD stays visible without backlight - simulator hint */ -#define HAVE_TRANSFLECTIVE_LCD - -#define CONFIG_KEYPAD IPOD_4G_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50605 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this if you can switch on/off the accessory power supply */ -#define HAVE_ACCESSORY_SUPPLY - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8975 audio codec */ -#define HAVE_WM8975 - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 270 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 3 - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 10 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -#define CONFIG_LCD LCD_IPODCOLOR - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -/*Disable USB for the release due to charging issues */ -/*#define USE_ROCKBOX_USB*/ -#define USB_VENDOR_ID 0x05ac -#define USB_PRODUCT_ID 0x1204 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -/* Define this if you can read an absolute wheel position */ -#define HAVE_WHEEL_POSITION - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IPOD_ACCESSORY_PROTOCOL -#define HAVE_SERIAL - -#endif Index: firmware/export/config-ipodnano2g.h =================================================================== --- firmware/export/config-ipodnano2g.h (revision 23734) +++ firmware/export/config-ipodnano2g.h (working copy) @@ -1,173 +0,0 @@ -/* - * This config file is for iPod Nano 2nd Generation - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 62 - -#define MODEL_NAME "Apple iPod Nano 2g" - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_LINEIN) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -//#define HAVE_LCD_FLIP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -//#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_SAMSUNG - -/* LCD dimensions */ -#define LCD_WIDTH 176 -#define LCD_HEIGHT 132 -#define LCD_DEPTH 16 /* pseudo 262.144 colors */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -//#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -//#define HAVE_LCD_SLEEP - -#define CONFIG_KEYPAD IPOD_4G_PAD - -//#define AB_REPEAT_ENABLE 1 -//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -//#define CONFIG_RTC RTC_S5L8700 -#define CONFIG_RTC RTC_S35390A - -#define CONFIG_LCD LCD_NANO2G - -/* Define the type of audio codec */ -#define HAVE_WM8975 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - - -#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -//#define HAVE_LCD_CONTRAST - -/* The exact type of CPU */ -#define CONFIG_CPU S5L8701 - -/* I2C interface */ -#define CONFIG_I2C I2C_S5L8700 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 200000000 - -/* Define this if you have ATA power-off control */ -//#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -//#define CONFIG_USBOTG USBOTG_M5636 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 1 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 0 -#define MAX_BRIGHTNESS_SETTING 15 -#define DEFAULT_BRIGHTNESS_SETTING 10 - Index: firmware/export/config-ipodmini.h =================================================================== --- firmware/export/config-ipodmini.h (revision 23734) +++ firmware/export/config-ipodmini.h (working copy) @@ -1,195 +0,0 @@ -/* - * This config file is for the Apple iPod Mini (1st Gen) - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod Mini 1g" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 9 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -/*#define HAVE_RECORDING*/ - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if the LCD needs to be shutdown */ -#define HAVE_LCD_SHUTDOWN - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 138 -#define LCD_HEIGHT 110 -#define LCD_DEPTH 2 /* 4 colours - 2bpp */ - -#define LCD_PIXELFORMAT HORIZONTAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x648764 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xdfd8ff - -#define HAVE_LCD_CONTRAST - -/* LCD contrast */ -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 40 /* Match boot contrast */ - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -#define CONFIG_KEYPAD IPOD_4G_PAD - -#define HAVE_SCROLLWHEEL - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50605 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this if you can switch on/off the accessory power supply */ -#define HAVE_ACCESSORY_SUPPLY - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8721 audio codec */ -#define HAVE_WM8731 - -/* WM8721 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* We can fade the backlight by using PWM */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -#define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 800 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 10 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* define current usage levels */ -#define CURRENT_NORMAL 50 /* PP5024 uses ~40mA, so add some for disk */ -#define CURRENT_BACKLIGHT 20 /* FIXME: This needs to be measured */ -#define CURRENT_RECORD 110 /* FIXME: Needs to be measured */ - -/* Hardware controlled charging? */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -#define CONFIG_LCD LCD_IPODMINI - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -/*Disable USB for the release due to charging issues */ -/*#define USE_ROCKBOX_USB*/ -#define USB_VENDOR_ID 0x05ac -#define USB_PRODUCT_ID 0x1205 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif Index: firmware/export/config-h120.h =================================================================== --- firmware/export/config-h120.h (revision 23734) +++ firmware/export/config-h120.h (working copy) @@ -1,214 +0,0 @@ -#define TARGET_TREE /* this target is using the target tree system */ -/* - * This config file is for iriver H120 and H140 - */ -#define IRIVER_H100_SERIES 1 - -#define MODEL_NAME "iriver H120/H140" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 0 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 2 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xadd8e6 - -/* remote LCD */ -#define LCD_REMOTE_WIDTH 128 -#define LCD_REMOTE_HEIGHT 64 -#define LCD_REMOTE_DEPTH 1 - -#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING - -/* Remote display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_REMOTE_DARKCOLOR 0x000000 -#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a -#define LCD_REMOTE_BL_DARKCOLOR 0x000000 -#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa - -#define CONFIG_KEYPAD IRIVER_H100_PAD - -#define CONFIG_REMOTE_KEYPAD H100_REMOTE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this if you have an remote lcd */ -#define HAVE_REMOTE_LCD - -/* Define if we have a hardware defect that causes ticking on the audio line */ -#define HAVE_REMOTE_LCD_TICKING - -#define CONFIG_LCD LCD_S1D15E06 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* We can fade the backlight by using PWM */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -#define HAVE_UDA1380 - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | \ - SRC_CAP_FMRADIO | SRC_CAP_SPDIF) - -/* define hardware samples rate caps mask */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -#define HAVE_AGC - -#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define current usage levels */ -#define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ -#define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ -#define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ -#define CURRENT_RECORD 105 /* additional current while recording */ -#define CURRENT_REMOTE 8 /* additional current when remote connected */ - -#ifndef SIMULATOR - -/* Define this if you have a Motorola SCF5249 */ -#define CONFIG_CPU MCF5249 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_COLDFIRE - -/* Define this if you can run rockbox from flash memory */ -#define HAVE_FLASHED_ROCKBOX - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x200000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define HAVE_ATA_LED_CTRL - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "iriver" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_RAMIMAGE_ENTRY 0x00001000 -#define FLASH_ROMIMAGE_ENTRY 0x00100000 -#define FLASH_MAGIC 0xfbfbfbf2 - -/* Define this if there is an EEPROM chip */ -#define HAVE_EEPROM - -/* Define this if the EEPROM chip is used */ -#define HAVE_EEPROM_SETTINGS - -#endif /* !SIMULATOR */ - -/* Define this for S/PDIF output available */ -#define HAVE_SPDIF_OUT - -/* Define this if you can control the S/PDIF power */ -#define HAVE_SPDIF_POWER - -/* Define this if you have a serial port */ -/*#define HAVE_SERIAL*/ - -/** Port-specific settings **/ - -#define HAVE_LCD_CONTRAST - -/* Main LCD backlight brightness range and defaults */ -#define MIN_CONTRAST_SETTING 14 /* White screen a bit higher than this */ -#define MAX_CONTRAST_SETTING 63 /* Black screen a bit lower than this */ -#define DEFAULT_CONTRAST_SETTING 27 - -/* Remote LCD contrast range and defaults */ -#define MIN_REMOTE_CONTRAST_SETTING 5 -#define MAX_REMOTE_CONTRAST_SETTING 63 -#define DEFAULT_REMOTE_CONTRAST_SETTING 42 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ Index: firmware/export/config-ipod1g2g.h =================================================================== --- firmware/export/config-ipod1g2g.h (revision 23734) +++ firmware/export/config-ipod1g2g.h (working copy) @@ -1,171 +0,0 @@ -/* - * This config file is for the Apple iPod 1g and 2g - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod 1g/2g" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 19 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility -#define HAVE_RECORDING */ - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if the LCD needs to be shutdown */ -#define HAVE_LCD_SHUTDOWN - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 2 /* 4 colours - 2bpp */ - -#define LCD_PIXELFORMAT HORIZONTAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x648764 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xdfd8ff - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -#define HAVE_LCD_CONTRAST - -/* LCD contrast */ -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 30 /* Match boot contrast */ - -#define CONFIG_KEYPAD IPOD_1G2G_PAD - -#define HAVE_SCROLLWHEEL - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8731L audio codec */ -#define HAVE_WM8721 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* WM8721 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* Define this if the backlight unverts LCD appearance */ -#define HAVE_BACKLIGHT_INVERSION - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -#define BATTERY_CAPACITY_DEFAULT 1200 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1200 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1900 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -//#define CONFIG_CHARGING CHARGING_SIMPLE - -/* FIXME: Don't shutdown on low battery until we have proper suspend. */ -#define NO_LOW_BATTERY_SHUTDOWN - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5002 */ -#define CONFIG_CPU PP5002 - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* Define this if you want to use the PP5002 i2c interface */ -#define CONFIG_I2C I2C_PP5002 - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -#define CONFIG_LCD LCD_IPOD2BPP - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define USB_HANDLED_BY_OF -/* actually firewire only, but handled like USB */ - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif /* SIMULATOR */ Index: firmware/export/config-c200v2.h =================================================================== --- firmware/export/config-c200v2.h (revision 23734) +++ firmware/export/config-c200v2.h (working copy) @@ -1,210 +0,0 @@ -/* - * This config file is for the Sandisk Sansa c200v2 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 44 -#define MODEL_NAME "Sandisk Sansa c200v2 series" -#define FIRMWARE_OFFSET_FILE_DATA 8 -#define FIRMWARE_OFFSET_FILE_CRC 0 - -#if 0 - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -#endif - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 132 -#define LCD_HEIGHT 80 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -/* TODO: #define HAVE_LCD_SLEEP */ -/* TODO: #define HAVE_LCD_SLEEP_SETTING <= optional */ - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -/* TODO: #define HAVE_LCD_INVERT */ - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 255 -#define DEFAULT_CONTRAST_SETTING 85 - -#if 0 /* not enough room for a 16 bits framebuffer */ -#define IRAM_LCDFRAMEBUFFER IDATA_ATTR /* put the lcd frame buffer in IRAM */ -#endif - -#define CONFIG_KEYPAD SANSA_C200_PAD - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -/* The AS3525 has a built-in AS3514 (or a newer version) */ -#define HAVE_AS3514 - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_AS3514 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Some Sansa E200s seem to be FAT16 formatted */ -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x48000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* FM Tuner - suspected to be the SI4702 */ -#define CONFIG_TUNER SI4700 -/* #define HAVE_TUNER_PWR_CTRL */ - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 530 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 530 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 530 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5024 */ -#define CONFIG_CPU AS3525 - -/* Define how much SD sectors are reserved for OF */ -#define AMS_OF_SIZE 0x5000 - -/* Define this if you want to use the PP5024 i2c interface */ -#define CONFIG_I2C I2C_AS3525 - -/* define this if the hardware can be powered off while charging */ -/* Sansa can't be powered off while charging */ -/* #define HAVE_POWEROFF_WHILE_CHARGING */ - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 250000000 - -/* Type of LCD : Samsung S6B33B2 */ -#define CONFIG_LCD LCD_C200 - -#ifndef BOOTLOADER -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 -#define HAVE_HOTSWAP - -#define USB_HANDLED_BY_OF - -#define CONFIG_USBOTG USBOTG_AS3525 - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x7452 - -#endif /* BOOTLOADER */ - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "sansa" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ - -/** Port-specific settings **/ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Default recording levels */ -#define DEFAULT_REC_MIC_GAIN 23 -#define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 Index: firmware/export/config-recorderv2.h =================================================================== --- firmware/export/config-recorderv2.h (revision 23734) +++ firmware/export/config-recorderv2.h (working copy) @@ -1,143 +0,0 @@ -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -#define MODEL_NAME "Archos Recorder v2" - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN -/* define this if you have the button bar */ -#define HAVE_BUTTONBAR - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 112 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXEL_ASPECT_WIDTH 4 -#define LCD_PIXEL_ASPECT_HEIGHT 5 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x7ee57e - -/* define this if you have a Recorder style 10-key keyboard */ -#define CONFIG_KEYPAD RECORDER_PAD - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_M41ST84W - -/* FM recorders can wake up from RTC alarm */ -#define HAVE_RTC_ALARM - -/* define this if you have RTC RAM available for settings */ -#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x8000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you have a MAS3587F */ -#define CONFIG_CODEC MAS3587F - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define CONFIG_I2C I2C_PLAYREC - -#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -#define CURRENT_NORMAL 145 /* usual current in mA */ -#define CURRENT_RECORD 35 /* additional recording current */ -#define CURRENT_USB 500 /* usual current in mA in USB mode */ - -/* Hardware controlled charging with monitoring */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a SH7034 */ -#define CONFIG_CPU SH7034 - -/* Define this if you have a FM Recorder key system */ -#define HAVE_FMADC - -/* Define this if battery voltage can only be measured with ATA powered */ -#define NEED_ATA_POWER_BATT_MEASURE - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11059200 - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 20 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 6 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 24 - -#ifndef BOOTLOADER -/* Define this if you have an FM Radio */ -#define CONFIG_TUNER S1A0903X01 -#endif - -/* The start address index for ROM builds */ -/* #define ROM_START 0x12010 for behind original Archos */ -#define ROM_START 0x7010 /* for behind BootBox */ - -/* Software controlled LED */ -#define CONFIG_LED LED_REAL - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "ajz" -#define BOOTFILE "ajbrec." BOOTFILE_EXT -#define BOOTDIR "/" - -#endif /* SIMULATOR */ - -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 - Index: firmware/export/config-ipodmini2g.h =================================================================== --- firmware/export/config-ipodmini2g.h (revision 23734) +++ firmware/export/config-ipodmini2g.h (working copy) @@ -1,205 +0,0 @@ -/* - * This config file is for the Apple iPod Mini 2nd Gen - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod Mini 2g" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 11 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -/*#define HAVE_RECORDING*/ - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if the LCD needs to be shutdown */ -#define HAVE_LCD_SHUTDOWN - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 138 -#define LCD_HEIGHT 110 -#define LCD_DEPTH 2 /* 4 colours - 2bpp */ - -#define LCD_PIXELFORMAT HORIZONTAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x648764 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xdfd8ff - -#define HAVE_LCD_CONTRAST - -/* LCD contrast */ -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 40 /* Match boot contrast */ - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -#define CONFIG_KEYPAD IPOD_4G_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50605 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this if you can switch on/off the accessory power supply */ -#define HAVE_ACCESSORY_SUPPLY - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8711 audio codec */ -#define HAVE_WM8711 - -/* WM8721 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* We can fade the backlight by using PWM */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 270 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 3 - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -#define BATTERY_CAPACITY_DEFAULT 400 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 400 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 800 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* define current usage levels */ -#define CURRENT_NORMAL 50 /* PP5024 uses ~40mA, so add some for disk */ -#define CURRENT_BACKLIGHT 20 /* FIXME: This needs to be measured */ -#define CURRENT_RECORD 110 /* FIXME: Needs to be measured */ - -/* Hardware controlled charging? */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5022 */ -#define CONFIG_CPU PP5022 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -#define CONFIG_LCD LCD_IPODMINI - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -/*Disable USB for the release due to charging issues */ -/*#define USE_ROCKBOX_USB*/ -#define USB_VENDOR_ID 0x05ac -#define USB_PRODUCT_ID 0x1205 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -/* Define this if you can read an absolute wheel position */ -#define HAVE_WHEEL_POSITION - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif Index: firmware/export/config.h =================================================================== --- firmware/export/config.h (revision 23734) +++ firmware/export/config.h (working copy) @@ -279,121 +279,121 @@ /* now go and pick yours */ #if defined(ARCHOS_PLAYER) -#include "config-player.h" +#include "config/archosplayer.h" #elif defined(ARCHOS_RECORDER) -#include "config-recorder.h" +#include "config/archosrecorder.h" #elif defined(ARCHOS_FMRECORDER) -#include "config-fmrecorder.h" +#include "config/archosfmrecorder.h" #elif defined(ARCHOS_RECORDERV2) -#include "config-recorderv2.h" +#include "config/archosrecorderv2.h" #elif defined(ARCHOS_ONDIOSP) -#include "config-ondiosp.h" +#include "config/archosondiosp.h" #elif defined(ARCHOS_ONDIOFM) -#include "config-ondiofm.h" +#include "config/archosondiofm.h" #elif defined(ARCHOS_AV300) -#include "config-av300.h" +#include "config/archosav300.h" #elif defined(IRIVER_H100) -#include "config-h100.h" +#include "config/iriverh100.h" #elif defined(IRIVER_H120) -#include "config-h120.h" +#include "config/iriverh120.h" #elif defined(IRIVER_H300) -#include "config-h300.h" +#include "config/iriverh300.h" #elif defined(IAUDIO_X5) -#include "config-iaudiox5.h" +#include "config/iaudiox5.h" #elif defined(IAUDIO_M5) -#include "config-iaudiom5.h" +#include "config/iaudiom5.h" #elif defined(IAUDIO_M3) -#include "config-iaudiom3.h" +#include "config/iaudiom3.h" #elif defined(IPOD_COLOR) -#include "config-ipodcolor.h" +#include "config/ipodcolor.h" #elif defined(IPOD_NANO) -#include "config-ipodnano.h" +#include "config/ipodnano1g.h" #elif defined(IPOD_VIDEO) -#include "config-ipodvideo.h" +#include "config/ipodvideo.h" #elif defined(IPOD_1G2G) -#include "config-ipod1g2g.h" +#include "config/ipod1g2g.h" #elif defined(IPOD_3G) -#include "config-ipod3g.h" +#include "config/ipod3g.h" #elif defined(IPOD_4G) -#include "config-ipod4g.h" +#include "config/ipod4g.h" #elif defined(IPOD_NANO2G) -#include "config-ipodnano2g.h" +#include "config/ipodnano2g.h" #elif defined(IRIVER_IFP7XX) -#include "config-ifp7xx.h" +#include "config/iriverifp7xx.h" #elif defined(GIGABEAT_F) -#include "config-gigabeat.h" +#include "config/gigabeatfx.h" #elif defined(GIGABEAT_S) -#include "config-gigabeat-s.h" +#include "config/gigabeats.h" #elif defined(IPOD_MINI) -#include "config-ipodmini.h" +#include "config/ipodmini1g.h" #elif defined(IPOD_MINI2G) -#include "config-ipodmini2g.h" +#include "config/ipodmini2g.h" #elif defined(IRIVER_H10) -#include "config-h10.h" +#include "config/iriverh10.h" #elif defined(IRIVER_H10_5GB) -#include "config-h10_5gb.h" +#include "config/iriverh10_5gb.h" #elif defined(SANSA_E200) -#include "config-e200.h" +#include "config/sansae200.h" #elif defined(SANSA_C200) -#include "config-c200.h" +#include "config/sansac200.h" #elif defined(SANSA_M200) -#include "config-m200.h" +#include "config/sansam200.h" #elif defined(ELIO_TPJ1022) -#include "config-tpj1022.h" +#include "config/tatungtpj1022.h" #elif defined(MROBE_100) -#include "config-mrobe100.h" +#include "config/mrobe100.h" #elif defined(MROBE_500) -#include "config-mrobe500.h" +#include "config/mrobe500.h" #elif defined(LOGIK_DAX) -#include "config-logikdax.h" +#include "config/logikdax.h" #elif defined(IAUDIO_7) -#include "config-iaudio7.h" +#include "config/iaudio7.h" #elif defined(COWON_D2) -#include "config-cowond2.h" +#include "config/cowond2.h" #elif defined(CREATIVE_ZVM) -#include "config-creativezvm.h" +#include "config/zenvisionm30gb.h" #elif defined(CREATIVE_ZVM60GB) -#include "config-creativezvm60gb.h" +#include "config/zenvisionm60gb.h" #elif defined(CREATIVE_ZV) -#include "config-creativezv.h" +#include "config/zenvision.h" #elif defined(PHILIPS_SA9200) -#include "config-sa9200.h" +#include "config/gogearsa9200.h" #elif defined(PHILIPS_HDD1630) -#include "config-hdd1630.h" +#include "config/gogearhdd1630.h" #elif defined(SANSA_C100) -#include "config-c100.h" +#include "config/sansac100.h" #elif defined(MEIZU_M6SL) -#include "config-meizu-m6sl.h" +#include "config/meizum6sl.h" #elif defined(MEIZU_M6SP) -#include "config-meizu-m6sp.h" +#include "config/meizum6sp.h" #elif defined(MEIZU_M3) -#include "config-meizu-m3.h" +#include "config/meizum3.h" #elif defined(ONDA_VX747) || defined(ONDA_VX747P) || defined(ONDA_VX777) -#include "config-ondavx747.h" +#include "config/ondavx747.h" #elif defined(ONDA_VX767) -#include "config-ondavx767.h" +#include "config/ondavx767.h" #elif defined(SANSA_CLIP) -#include "config-clip.h" +#include "config/sansaclip.h" #elif defined(SANSA_E200V2) -#include "config-e200v2.h" +#include "config/sansae200v2.h" #elif defined(SANSA_M200V4) -#include "config-m200v4.h" +#include "config/sansam200v4.h" #elif defined(SANSA_FUZE) -#include "config-fuze.h" +#include "config/sansafuze.h" #elif defined(SANSA_C200V2) -#include "config-c200v2.h" +#include "config/sansac200v2.h" #elif defined(SANSA_VIEW) -#include "config-view.h" +#include "config/view.h" #elif defined(LYRE_PROTO1) -#include "config-lyre_proto1.h" +#include "config/lyre_proto1.h" #elif defined(SAMSUNG_YH820) -#include "config-yh820.h" +#include "config/samsungyh820.h" #elif defined(SAMSUNG_YH920) -#include "config-yh920.h" +#include "config/samsungyh920.h" #elif defined(SAMSUNG_YH925) -#include "config-yh925.h" +#include "config/samsungyh925.h" #elif defined(SAMSUNG_YPS3) -#include "config-yps3.h" +#include "config/samsungyps3.h" #else /* no known platform */ #endif Index: firmware/export/config-c100.h =================================================================== --- firmware/export/config-c100.h (revision 23734) +++ firmware/export/config-c100.h (working copy) @@ -1,131 +0,0 @@ -/* - * This config file is for the Sansa C100 series - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define MODEL_NAME "Sandisk Sansa c100 series" - -/* For Rolo and bootloader */ -#define MODEL_NUMBER 30 - -/* define hardware samples rate caps mask */ -#define HW_SAMPR_CAPS (/*SAMPR_CAP_88 | */SAMPR_CAP_44/* | SAMPR_CAP_22 | SAMPR_CAP_11*/) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you can flip your LCD */ -/*#define HAVE_LCD_FLIP*/ - -/* define this if you can invert the colours on your LCD */ -/*#define HAVE_LCD_INVERT*/ - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* Only v1 */ -#define CONFIG_STORAGE STORAGE_NAND -#define CONFIG_NAND NAND_TCC - -/* c100's with direct-to-NAND access are FAT16 */ -#define HAVE_FAT16SUPPORT - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /*rgb565*/ - -/*#define LCD_PIXELFORMAT VERTICAL_PACKING*/ - -/* define this to indicate your device's keypad */ -#define CONFIG_KEYPAD SANSA_C100_PAD - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_TCC77X - -/* define this if you have RTC RAM available for settings */ -//#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x50000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x50000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* Define this if you have the TLV320 audio codec */ -#define HAVE_TLV320 - -/*#define CONFIG_TUNER TEA5767*/ - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define CONFIG_I2C I2C_TCC77X - -#define BATTERY_CAPACITY_DEFAULT 540 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 540 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 540 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -#ifndef SIMULATOR - -/* Define this if you have a TCC770 */ -#define CONFIG_CPU TCC770 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Define this to the CPU frequency */ -#define CPU_FREQ 120000000 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* The start address index for ROM builds */ -/* #define ROM_START 0x11010 for behind original Archos */ -#define ROM_START 0x7010 /* for behind BootBox */ - -#define CONFIG_LCD LCD_S6B33B2 - -#define BOOTFILE_EXT "c100" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#ifdef BOOTLOADER -#define TCCBOOT -#endif - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif /* SIMULATOR */ Index: firmware/export/config-ipodnano.h =================================================================== --- firmware/export/config-ipodnano.h (revision 23734) +++ firmware/export/config-ipodnano.h (working copy) @@ -1,190 +0,0 @@ -/* - * This config file is for the Apple iPod Nano - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod Nano 1g" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 4 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 176 -#define LCD_HEIGHT 132 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565SWAPPED /* rgb565 byte-swapped */ - -/* LCD stays visible without backlight - simulator hint */ -#define HAVE_TRANSFLECTIVE_LCD - -#define CONFIG_KEYPAD IPOD_4G_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50605 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this if you can switch on/off the accessory power supply */ -#define HAVE_ACCESSORY_SUPPLY - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8975 audio codec */ -#define HAVE_WM8975 - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS -/* We can fade the backlight by using PWM */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 32 -#define DEFAULT_BRIGHTNESS_SETTING 16 - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 270 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 3 - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define BATTERY_CAPACITY_DEFAULT 300 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 200 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 600 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 20 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -//#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#define CURRENT_NORMAL 32 /* MP3: ~9h playback out of 300mAh battery */ -#define CURRENT_BACKLIGHT 20 /* FIXME: this needs adjusting */ -#if defined(HAVE_RECORDING) -#define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ -#endif - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5022 */ -#define CONFIG_CPU PP5022 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 24000000 - -#define CONFIG_LCD LCD_IPODNANO - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -/*Disable USB for the release due to charging issues */ -/*#define USE_ROCKBOX_USB*/ -#define USB_VENDOR_ID 0x05ac -#define USB_PRODUCT_ID 0x120a - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -/* Define this if you can read an absolute wheel position */ -#define HAVE_WHEEL_POSITION - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IPOD_ACCESSORY_PROTOCOL -#define HAVE_SERIAL - -#endif Index: firmware/export/config-hdd1630.h =================================================================== --- firmware/export/config-hdd1630.h (revision 23734) +++ firmware/export/config-hdd1630.h (working copy) @@ -1,201 +0,0 @@ -/* - * This config file is for the Philips GoGear HDD16x0/HDD63x0 - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 31 -#define MODEL_NAME "Philips GoGear HDD16x0" - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 byte-swapped */ - -#ifndef BOOTLOADER -/* Define this if your LCD can be enabled/disabled */ -/* #define HAVE_LCD_ENABLE */ - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - * should be defined as well. - * We can currently put the lcd to sleep but it won't wake up properly */ -/* #define HAVE_LCD_SLEEP */ -/* #define HAVE_LCD_SLEEP_SETTING */ -#endif - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD PHILIPS_HDD1630_PAD - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock. The HDD16x0 has a PCF8563 RTC, - but it's register compatible with the E8564. */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_E8564 -#define HAVE_RTC_ALARM -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8731 audio codec */ -#define HAVE_WM8731 - -/* WM8731 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* TODO: #define AB_REPEAT_ENABLE 1 */ - -/* FM Tuner */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS -/* #define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING */ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 16 -#define DEFAULT_BRIGHTNESS_SETTING 13 /* match OF brightness */ - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT -#define HAVE_BUTTONLIGHT_BRIGHTNESS - -#define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 630 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5022 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* Type of LCD */ -#define CONFIG_LCD LCD_HDD1630 - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 127 -#define DEFAULT_CONTRAST_SETTING 63 /* Match boot contrast */ - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.e200 file */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0471 -#define USB_PRODUCT_ID 0x014C - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#endif Index: firmware/export/config-yh820.h =================================================================== --- firmware/export/config-yh820.h (revision 23734) +++ firmware/export/config-yh820.h (working copy) @@ -1,188 +0,0 @@ -/* - * This config file is for the Samsung YH-820 - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 57 -#define MODEL_NAME "Samsung YH-820" - -/* define this if you have recording possibility */ -/* todo #define HAVE_RECORDING */ - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN ) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_11 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_11 | SAMPR_CAP_8) - -/* Type of LCD */ -#define CONFIG_LCD LCD_S6B33B2 - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 96 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 - -#ifndef BOOTLOADER - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_E8564 -/* TODO ??? */ -//#define HAVE_RTC_ALARM - -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. - HAVE_LCD_ENABLE should be defined as well. */ -/* todo #define HAVE_LCD_SLEEP*/ -/* todo #define HAVE_LCD_SLEEP_SETTING */ -#endif /* !BOOTLOADER */ - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 255 -#define DEFAULT_CONTRAST_SETTING 137 - -/* define this if you can flip your LCD */ -/* #define HAVE_LCD_FLIP */ - -/* define this if you can invert the colours on your LCD */ -/* todo #define HAVE_LCD_INVERT */ - -/* put the lcd frame buffer in IRAM */ -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -#define CONFIG_KEYPAD SAMSUNG_YH_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* We're able to shut off power to the HDD */ -#ifndef SIMULATOR -/* todo #define HAVE_ATA_POWER_OFF */ -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the AK4537 audio codec */ -#define HAVE_AK4537 - -/* AK4537 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define AB_REPEAT_ENABLE 1 - -#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -/* todo - check */ -#define USB_VENDOR_ID 0x04e8 -#define USB_PRODUCT_ID 0x5023 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0x00 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 0x00 - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#endif /* !SIMULATOR */ Index: firmware/export/config-iaudiom5.h =================================================================== --- firmware/export/config-iaudiom5.h (revision 23734) +++ firmware/export/config-iaudiom5.h (working copy) @@ -1,193 +0,0 @@ -/* - * This config file is for iAudio M5 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 17 - -#define MODEL_NAME "iAudio M5" - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#ifdef HAVE_FMRADIO_IN /* FM modded M5 */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) -#else /* stock M5 */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) -#endif - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 2 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x648764 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xdfd8ff - -/* remote LCD */ -#define LCD_REMOTE_WIDTH 128 -#define LCD_REMOTE_HEIGHT 96 -#define LCD_REMOTE_DEPTH 2 - -#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED - -/* Remote display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_REMOTE_DARKCOLOR 0x000000 -#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a -#define LCD_REMOTE_BL_DARKCOLOR 0x000000 -#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa - -#define CONFIG_KEYPAD IAUDIO_X5M5_PAD - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50606 - -/* Define this if you have an remote lcd */ -#define HAVE_REMOTE_LCD - -#define CONFIG_LCD LCD_S1D15E06 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#ifdef HAVE_FMRADIO_IN /* FM modded M5 */ -/* FM Tuner */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 -#endif - -#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define current usage levels */ -#define CURRENT_REMOTE 8 /* additional current when remote connected */ - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -/* Define this if you have a Motorola SCF5250 */ -#define CONFIG_CPU MCF5250 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_COLDFIRE - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "iaudio" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 24 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 40 - -/* Remote LCD contrast range and defaults */ -#define MIN_REMOTE_CONTRAST_SETTING 10 -#define MAX_REMOTE_CONTRAST_SETTING 35 -#define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */ - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ Index: firmware/export/config-sa9200.h =================================================================== --- firmware/export/config-sa9200.h (revision 23734) +++ firmware/export/config-sa9200.h (working copy) @@ -1,196 +0,0 @@ -/* - * This config file is for the Philips GoGear SA9200 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 34 -#define MODEL_NAME "Philips GoGear SA200" - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 160 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#ifndef BOOTLOADER -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. - HAVE_LCD_ENABLE should be defined as well. */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -#endif - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD PHILIPS_SA9200_PAD - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -/* The PP5024 has a built-in AustriaMicrosystems AS3514 */ -#define HAVE_AS3514 - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_AS3514 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Some Sansa E200s seem to be FAT16 formatted */ -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_SETTING - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT -/* Can't control the brightness on all the buttons */ -/* #define HAVE_BUTTONLIGHT_BRIGHTNESS */ - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 750 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Charging implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_TARGET -#define HAVE_POWEROFF_WHILE_CHARGING - -/* define current usage levels (copied from the e200v1 )*/ -#define CURRENT_NORMAL 30 /* Toni's measurements in Nov 2008 */ -#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ -#define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/ - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5024 */ -#define CONFIG_CPU PP5024 - -/* Define this if you want to use the PP5024 i2c interface */ -#define CONFIG_I2C I2C_PP5024 - -/* define this if the hardware can be powered off while charging */ -/* Sansa can't be powered off while charging */ -/* #define HAVE_POWEROFF_WHILE_CHARGING */ - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 75000000 - -/* Type of LCD */ -#define CONFIG_LCD LCD_SA9200 - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 31 -#define DEFAULT_CONTRAST_SETTING 22 /* Match boot contrast */ - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0471 -#define USB_PRODUCT_ID 0x014f - -/* WARNING! Enable Rockbox USB mass storage. */ -#ifndef BOOTLOADER -#define USE_ROCKBOX_USB -#endif - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -/* These values are unused, but need to be defined */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ Index: firmware/export/config-lyre_proto1.h =================================================================== --- firmware/export/config-lyre_proto1.h (revision 23734) +++ firmware/export/config-lyre_proto1.h (working copy) @@ -1,106 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * - * - * Copyright (C) 2009 by Jorge Pinto - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the Lyre prototype 1. - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x20000000 - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 130 - -/* define this if the flash memory uses the - * SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD -#define HAVE_FLASH_STORAGE - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -#define CONFIG_LCD LCD_LYRE_PROTO1 - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 128 -/* The LCD used is just rgb444, 64 colours. We do a bit conversion on LCD - * drivers. */ -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -#define CONFIG_KEYPAD LYRE_PROTO1_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -/* Lyre prototype 1 do not use I2C, just SPI */ -#define CONFIG_I2C I2C_NONE - -/* Define this if you have the TLV320 audio codec -> controlled by the DSP */ -#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 1100 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -#ifndef SIMULATOR - -#define CONFIG_CPU AT91SAM9260 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 198656000 -#define MCK_FREQ 99328000 -#define SLOW_CLOCK 32768 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define BOOTFILE_EXT "lyre_proto1" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#endif Index: firmware/export/config-logikdax.h =================================================================== --- firmware/export/config-logikdax.h (revision 23734) +++ firmware/export/config-logikdax.h (working copy) @@ -1,150 +0,0 @@ -/* - * This config file is for the Logik DAX MP3/DAB - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 33 - -#define MODEL_NAME "Logik DAX MP3/DAB" - -/* define this if you have recording possibility */ -//#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -//#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) - -#if 0 /* Enable for USB driver test */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x13d1 -#define USB_PRODUCT_ID 0x1002 -#endif - - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -#define HAVE_FAT16SUPPORT - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_TCC - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x82b4fa - -/* define this to indicate your device's keypad */ -#define CONFIG_KEYPAD LOGIK_DAX_PAD - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_TCC77X - -/* define this if you have RTC RAM available for settings */ -//#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x38000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x10000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* The DAX uses built-in WM8731 codec */ -#define HAVE_WM8731 -/* Codec is slave on serial bus */ -#define CODEC_SLAVE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define CONFIG_I2C I2C_TCC77X - -#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -#ifndef SIMULATOR - -/* Define this if you have a TCC773L */ -#define CONFIG_CPU TCC773L - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -#define HAVE_FAT16SUPPORT - -/* Define this to the CPU frequency */ -#define CPU_FREQ 120000000 - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 4 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 6 - -/* The start address index for ROM builds */ -/* #define ROM_START 0x11010 for behind original Archos */ -#define ROM_START 0x7010 /* for behind BootBox */ - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "logik" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/" - -#define IBSS_ATTR_VOICE_STACK -#define ICODE_ATTR_TREMOR_NOT_MDCT -#define ICODE_ATTR_TREMOR_MDCT -#define ICODE_ATTR_FLAC -#define IBSS_ATTR_FLAC_DECODED0 -#define ICONST_ATTR_MPA_HUFFMAN -#define IBSS_ATTR_MPC_SAMPLE_BUF -#define ICODE_ATTR_ALAC -#define IBSS_ATTR_SHORTEN_DECODED0 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif /* SIMULATOR */ Index: firmware/export/config-ondavx767.h =================================================================== --- firmware/export/config-ondavx767.h (revision 23734) +++ firmware/export/config-ondavx767.h (working copy) @@ -1,173 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the Onda VX747 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x80004000 - -#define ONDA_VX767 1 - -#define MODEL_NAME "Onda VX767" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 64 - -//#define HAVE_ATA_SD -//#define HAVE_HOTSWAP - -//#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) -#define CONFIG_STORAGE STORAGE_SD /* Multivolume currently handled at firmware/target/ level */ - -#define CONFIG_NAND NAND_CC - -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define CONFIG_LCD LCD_ONDAVX767 - -#define LCD_WIDTH 320 -#define LCD_HEIGHT 240 - -#define LCD_DEPTH 16 /* 16bit colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -//#define HAVE_LCD_ENABLE - -#define CONFIG_KEYPAD ONDAVX767_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_JZ47XX - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 0 /* TODO */ -#define MAX_BRIGHTNESS_SETTING 127 -#define DEFAULT_BRIGHTNESS_SETTING 85 -#define DEFAULT_DIMNESS_SETTING 22 - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -/* Define this if you have the Jz4740 internal codec */ -#define HAVE_JZ4740_CODEC - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* Tuner config */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -/* Define this if you have a speaker */ -//#define HAVE_SPEAKER - -#define CONFIG_I2C I2C_JZ47XX - -/* TLV320 has no tone controls, so we use the software ones */ -//#define HAVE_SW_TONE_CONTROLS - -/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ - SAMPR_CAP_11)*/ - -#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -//#define CONFIG_CHARGING CHARGING_MONITOR - -#ifndef SIMULATOR - -/* Define this if you have a Ingenic JZ4740 */ -#define CONFIG_CPU JZ4732 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* Define this to the CPU frequency */ -#define CPU_FREQ 336000000 /* CPU clock: 336 MHz */ -#define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the backlight can be set to a brightness */ -#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "vx767" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define CONFIG_USBOTG USBOTG_JZ4740 -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x07C4 -#define USB_PRODUCT_ID 0xA4A5 - -#endif Index: firmware/export/config-h100.h =================================================================== --- firmware/export/config-h100.h (revision 23734) +++ firmware/export/config-h100.h (working copy) @@ -1,217 +0,0 @@ -#define TARGET_TREE /* this target is using the target tree system */ - -/* - * This config file is for iriver iHP-100, iHP-110, iHP-115 - */ -#define IRIVER_H100_SERIES 1 - -#define MODEL_NAME "iriver iHP-100 series" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 1 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 2 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xadd8e6 - -/* remote LCD */ -#define LCD_REMOTE_WIDTH 128 -#define LCD_REMOTE_HEIGHT 64 -#define LCD_REMOTE_DEPTH 1 - -#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING - -/* Remote display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_REMOTE_DARKCOLOR 0x000000 -#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a -#define LCD_REMOTE_BL_DARKCOLOR 0x000000 -#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa - -#define CONFIG_KEYPAD IRIVER_H100_PAD - -#define CONFIG_REMOTE_KEYPAD H100_REMOTE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* Define this if you have an remote lcd */ -#define HAVE_REMOTE_LCD - -/* Define if we have a hardware defect that causes ticking on the audio line */ -#define HAVE_REMOTE_LCD_TICKING - -#define CONFIG_LCD LCD_S1D15E06 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* We can fade the backlight by using PWM */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_PWM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -#define HAVE_UDA1380 - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* define hardware samples rate caps mask */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -#define HAVE_AGC - -#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define current usage levels */ -#define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery */ -#define CURRENT_BACKLIGHT 23 /* from IriverBattery twiki page */ -#define CURRENT_SPDIF_OUT 10 /* optical SPDIF output on */ -#define CURRENT_RECORD 105 /* additional current while recording */ -#define CURRENT_REMOTE 8 /* additional current when remote connected */ - -#ifndef SIMULATOR - -/* Define this if you have a Motorola SCF5249 */ -#define CONFIG_CPU MCF5249 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_COLDFIRE - -/* Define this if you can run rockbox from flash memory */ -/* In theory we can, but somebody needs to verify there are no issues. */ -#define HAVE_FLASHED_ROCKBOX - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x200000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define HAVE_ATA_LED_CTRL - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "iriver" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_RAMIMAGE_ENTRY 0x00001000 -#define FLASH_ROMIMAGE_ENTRY 0x00100000 -#define FLASH_MAGIC 0xfbfbfbf2 - -/* Define this if there is an EEPROM chip */ -#define HAVE_EEPROM - -/* Define this if the EEPROM chip is used */ -#define HAVE_EEPROM_SETTINGS - -#endif /* !SIMULATOR */ - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | \ - SRC_CAP_FMRADIO | SRC_CAP_SPDIF) - -/* Define this for S/PDIF output available */ -#define HAVE_SPDIF_OUT - -/* Define this if you can control the S/PDIF power */ -#define HAVE_SPDIF_POWER -#define SPDIF_POWER_INVERTED - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -#define HAVE_LCD_CONTRAST - -/* Main LCD backlight brightness range and defaults */ -#define MIN_CONTRAST_SETTING 14 /* White screen a bit higher than this */ -#define MAX_CONTRAST_SETTING 63 /* Black screen a bit lower than this */ -#define DEFAULT_CONTRAST_SETTING 27 - -/* Remote LCD contrast range and defaults */ -#define MIN_REMOTE_CONTRAST_SETTING 5 -#define MAX_REMOTE_CONTRAST_SETTING 63 -#define DEFAULT_REMOTE_CONTRAST_SETTING 42 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ Index: firmware/export/config-h300.h =================================================================== --- firmware/export/config-h300.h (revision 23734) +++ firmware/export/config-h300.h (working copy) @@ -1,205 +0,0 @@ -#define TARGET_TREE /* this target is using the target tree system */ -/* - * This config file is for iriver H320, H340 - */ -#define IRIVER_H300_SERIES 1 - -#define MODEL_NAME "iriver H300 series" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 2 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 220 -#define LCD_HEIGHT 176 -#define LCD_DEPTH 16 /* 65k colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* remote LCD */ -#define LCD_REMOTE_WIDTH 128 -#define LCD_REMOTE_HEIGHT 64 -#define LCD_REMOTE_DEPTH 1 - -#define LCD_REMOTE_PIXELFORMAT VERTICAL_PACKING - -/* Remote display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_REMOTE_DARKCOLOR 0x000000 -#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a -#define LCD_REMOTE_BL_DARKCOLOR 0x000000 -#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa - -#define CONFIG_KEYPAD IRIVER_H300_PAD - -#define CONFIG_REMOTE_KEYPAD H300_REMOTE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50606 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this if you have an remote lcd */ -#define HAVE_REMOTE_LCD - -/* Define if we have a hardware defect that causes ticking on the audio line */ -#define HAVE_REMOTE_LCD_TICKING - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_HW_REG -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -#define HAVE_UDA1380 - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define hardware samples rate caps mask */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -#define HAVE_AGC - -#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* define current usage levels */ -#define CURRENT_NORMAL 80 /* 16h playback on 1300mAh battery from IriverRuntime wiki page */ -#define CURRENT_BACKLIGHT 23 /* FIXME: This needs to be measured, copied from H100 */ -#define CURRENT_RECORD 110 /* additional current while recording */ -#define CURRENT_MAX_CHG 650 /* maximum charging current */ -#define CURRENT_REMOTE 8 /* additional current when remote connected */ - -/* define this if the unit can have USB charging disabled by user - - * if USB/MAIN power is discernable and hardware doesn't compel charging */ -#define HAVE_USB_CHARGING_ENABLE - -#ifndef SIMULATOR - -/* Define this if you have a Motorola SCF5249 */ -#define CONFIG_CPU MCF5249 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_COLDFIRE - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -#define CONFIG_LCD LCD_H300 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ISP1362 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "iriver" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -/* Define this if there is an EEPROM chip */ -#define HAVE_EEPROM - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 40 - -/* Main LCD backlight brightness range and defaults */ -/* accepts 0..15 but note that 0 and 1 give a black display on H300! */ -#define MIN_BRIGHTNESS_SETTING 2 /* 2/16 (12.50%) */ -#define MAX_BRIGHTNESS_SETTING 15 /* 15/16 (93.75%) */ -#define DEFAULT_BRIGHTNESS_SETTING 9 /* 9/16 (56.25%) */ - -/* Remote LCD contrast range and defaults */ -#define MIN_REMOTE_CONTRAST_SETTING 5 -#define MAX_REMOTE_CONTRAST_SETTING 63 -#define DEFAULT_REMOTE_CONTRAST_SETTING 42 Property changes on: firmware/export/config/gogearhdd1630.h ___________________________________________________________________ Deleted: svn:executable - * Property changes on: firmware/export/config/gogearsa9200.h ___________________________________________________________________ Deleted: svn:executable - * Index: firmware/export/config-creativezvm60gb.h =================================================================== --- firmware/export/config-creativezvm60gb.h (revision 23734) +++ firmware/export/config-creativezvm60gb.h (working copy) @@ -1,171 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the Creative Zen Vision:M 60GB - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x00900000 - -#define CREATIVE_ZVM60GB 1 - -#define MODEL_NAME "Creative Zen Vision:M 60GB" - -/* This makes it part of the Creative Zen Vision family :) */ -#define CREATIVE_ZVx 1 - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 27 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -//#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define CONFIG_LCD LCD_CREATIVEZVM - -/* choose the lcd orientation. both work */ -#define CONFIG_ORIENTATION SCREEN_PORTRAIT - -#define LCD_WIDTH 320 -#define LCD_HEIGHT 240 - -#define LCD_DEPTH 16 /* 65k colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -#define CONFIG_KEYPAD CREATIVEZVM_PAD -#define HAVE_HEADPHONE_DETECTION -//#define HAVE_TOUCHPAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -//#define CONFIG_RTC RTC_RX5X348AB - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -//#define HAVE_BACKLIGHT - -//#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -//#define MIN_BRIGHTNESS_SETTING 0 -//#define MAX_BRIGHTNESS_SETTING 127 -//#define DEFAULT_BRIGHTNESS_SETTING 85 /* OF "full brightness" */ -//#define DEFAULT_DIMNESS_SETTING 22 /* OF "most dim" */ - -/* Define this if you have a software controlled poweroff */ -//#define HAVE_SW_POWEROFF -//TODO: enable this back - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -/* Define this if you have the TLV320 audio codec -> controlled by the DSP */ -#define HAVE_TLV320 - -#define CONFIG_I2C I2C_DM320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ - SAMPR_CAP_11)*/ - -#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -//#define CONFIG_CHARGING CHARGING_MONITOR - -#ifndef SIMULATOR - -/* Define this if you have a TI TMS320DM320 */ -#define CONFIG_CPU DM320 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 16934400 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* define this if the backlight can be set to a brightness */ -//#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -/* #define HAVE_ADJUSTABLE_CPU_FREQ */ - -#define BOOTFILE_EXT "zvm60" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -/* #define CONFIG_USBOTG USBOTG_ISP1761 */ -#define CONFIG_USBOTG USBOTG_ISP1583 -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x041e -#define USB_PRODUCT_ID 0x4133 -#define USB_NUM_ENDPOINTS 7 - -#endif /* SIMULATOR */ Index: firmware/export/config-creativezv.h =================================================================== --- firmware/export/config-creativezv.h (revision 23734) +++ firmware/export/config-creativezv.h (working copy) @@ -1,173 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the Creative Zen Vision - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x00900000 - -#define CREATIVE_ZV 1 - -#define MODEL_NAME "Creative Zen Vision" - -/* This makes it part of the Creative Zen Vision family :) */ -#define CREATIVE_ZVx 1 - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 28 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -//#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define CONFIG_LCD LCD_CREATIVEZVM - -/* choose the lcd orientation. both work */ -#define CONFIG_ORIENTATION SCREEN_PORTRAIT - -#define LCD_WIDTH 640 -#define LCD_HEIGHT 480 - -#define LCD_DEPTH 16 /* 65k colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -#define CONFIG_KEYPAD CREATIVEZV_PAD -#define HAVE_HEADPHONE_DETECTION -//#define HAVE_TOUCHPAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -//#define CONFIG_RTC RTC_RX5X348AB - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -//#define HAVE_BACKLIGHT - -//#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -//#define MIN_BRIGHTNESS_SETTING 0 -//#define MAX_BRIGHTNESS_SETTING 127 -//#define DEFAULT_BRIGHTNESS_SETTING 85 /* OF "full brightness" */ -//#define DEFAULT_DIMNESS_SETTING 22 /* OF "most dim" */ - -/* Define this if you have a software controlled poweroff */ -//#define HAVE_SW_POWEROFF -//TODO: enable this back - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -/* Define this if you have the TLV320 audio codec -> controlled by the DSP */ -#define HAVE_TLV320 - -#define CONFIG_I2C I2C_DM320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/*#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ - SAMPR_CAP_11)*/ - -#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -//#define CONFIG_CHARGING CHARGING_MONITOR - -#ifndef SIMULATOR - -/* Define this if you have a TI TMS320DM320 */ -#define CONFIG_CPU DM320 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 16934400 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Virtual LED (icon) */ -#define CONFIG_LED LED_VIRTUAL - -/* define this if the backlight can be set to a brightness */ -//#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -/* #define HAVE_ADJUSTABLE_CPU_FREQ */ - -#define BOOTFILE_EXT "zv" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define CONFIG_USBOTG USBOTG_ISP1583 -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x041e -#define USB_PRODUCT_ID 0x4133 -#define USB_NUM_ENDPOINTS 7 - -#endif /* SIMULATOR */ Index: firmware/export/config-ipod4g.h =================================================================== --- firmware/export/config-ipod4g.h (revision 23734) +++ firmware/export/config-ipod4g.h (working copy) @@ -1,208 +0,0 @@ -/* - * This config file is for the Apple iPod 4g Grayscale - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define IPOD_ARCH 1 - -#define MODEL_NAME "Apple iPod 4g Grayscale" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 8 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if the LCD needs to be shutdown */ -#define HAVE_LCD_SHUTDOWN - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 2 /* 4 colours - 2bpp */ -#define LCD_PIXELFORMAT HORIZONTAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0xadd8e6 - -#define HAVE_LCD_CONTRAST - -/* LCD contrast */ -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 40 /* Match boot contrast */ - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -#define CONFIG_KEYPAD IPOD_4G_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50605 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this if you can switch on/off the accessory power supply */ -#define HAVE_ACCESSORY_SUPPLY - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8975 audio codec */ -#define HAVE_WM8975 - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 270 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 3 - -/* Define this if you can detect headphones */ -#define HAVE_HEADPHONE_DETECTION - -#define BATTERY_CAPACITY_DEFAULT 630 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 630 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 10 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* define current usage levels */ -#define CURRENT_NORMAL 100 /* MP3: ~10.5h out of 1100mAh battery */ -#define CURRENT_BACKLIGHT 20 /* FIXME: this needs adjusting */ -#if defined(HAVE_RECORDING) -#define CURRENT_RECORD 35 /* FIXME: this needs adjusting */ -#endif - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* We're able to shut off power to the HDD */ -#define HAVE_ATA_POWER_OFF - -/* define this if the hardware can be powered off while charging */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x100000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -#define CONFIG_LCD LCD_IPOD2BPP - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -/*Disable USB for the release due to charging issues */ -/*#define USE_ROCKBOX_USB*/ -#define USB_VENDOR_ID 0x05ac -#define USB_PRODUCT_ID 0x1203 - -/* Virtual LED (icon) */ -#define CONFIG_LED LED_VIRTUAL - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -/* Define this if you can read an absolute wheel position */ -#define HAVE_WHEEL_POSITION - -#define BOOTFILE_EXT "ipod" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define IPOD_ACCESSORY_PROTOCOL -#define HAVE_SERIAL - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif Index: firmware/export/config-iaudiox5.h =================================================================== --- firmware/export/config-iaudiox5.h (revision 23734) +++ firmware/export/config-iaudiox5.h (working copy) @@ -1,206 +0,0 @@ -/* - * This config file is for iAudio X5 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 10 - -#define MODEL_NAME "iAudio X5" - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 160 -#define LCD_HEIGHT 128 -#define LCD_DEPTH 16 /* pseudo 262.144 colors */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* remote LCD */ -#define LCD_REMOTE_WIDTH 128 -#define LCD_REMOTE_HEIGHT 96 -#define LCD_REMOTE_DEPTH 2 - -#define LCD_REMOTE_PIXELFORMAT VERTICAL_INTERLEAVED - -/* Remote display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_REMOTE_DARKCOLOR 0x000000 -#define LCD_REMOTE_BRIGHTCOLOR 0x5a915a -#define LCD_REMOTE_BL_DARKCOLOR 0x000000 -#define LCD_REMOTE_BL_BRIGHTCOLOR 0x82b4fa - -#ifndef BOOTLOADER -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -#define HAVE_LCD_SLEEP -#define HAVE_LCD_SLEEP_SETTING -#endif - -#define CONFIG_KEYPAD IAUDIO_X5M5_PAD - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50606 - -/* Define this if you have an remote lcd */ -#define HAVE_REMOTE_LCD - -#define CONFIG_LCD LCD_X5 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_HW_REG - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* FM Tuner */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 950 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 950 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define current usage levels */ -#define CURRENT_REMOTE 8 /* additional current when remote connected */ - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -/* Define this if you have a Motorola SCF5250 */ -#define CONFIG_CPU MCF5250 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_COLDFIRE - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_M5636 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "iaudio" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 1 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ - -/* Main LCD backlight brightness range and defaults */ -/* PCF50506 can output 0%-100% duty cycle but D305A expects %15-100%. */ -#define MIN_BRIGHTNESS_SETTING 1 /* 15/16 (93.75%) */ -#define MAX_BRIGHTNESS_SETTING 13 /* 3/16 (18.75%) */ -#define DEFAULT_BRIGHTNESS_SETTING 8 /* 8/16 (50.00%) = x5 boot default */ - -/* Remote LCD contrast range and defaults */ -#define MIN_REMOTE_CONTRAST_SETTING 10 -#define MAX_REMOTE_CONTRAST_SETTING 35 -#define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */ Index: firmware/export/config-m200v4.h =================================================================== --- firmware/export/config-m200v4.h (revision 23734) +++ firmware/export/config-m200v4.h (working copy) @@ -1,171 +0,0 @@ -/* - * This config file is for the Sansa M200 V4 series - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 42 - -#define MODEL_NAME "Sandisk Sansa m200 v4 series" - -/* Enable FAT16 support */ -#define HAVE_FAT16SUPPORT - -#if 0 /* disabled since there is no driver (yet) */ - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -#endif - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -//#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -//#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -/* LCD dimensions */ -#define LCD_WIDTH 128 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5e6854 -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x3ca0e6 - -/* define this to indicate your device's keypad */ -#define CONFIG_KEYPAD SANSA_M200_PAD - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -#define CONFIG_RTC RTC_AS3514 -#endif - -/* define this if you have RTC RAM available for settings */ -//#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x48000 /* in IRAM */ - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x60000 - -#define AB_REPEAT_ENABLE 1 - -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* Define this if you have the TLV320 audio codec */ -/*#define HAVE_TLV320*/ - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* We're working on the assumption that the AS3525 has something - similar to the AS3514 for audio codec etc */ -#define HAVE_AS3514 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* Define how much SD sectors are reserved for OF */ -#define AMS_OF_SIZE 0x5000 - -#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -#ifndef SIMULATOR - -/* Define this if you have an AMS AS3525 */ -#define CONFIG_CPU AS3525 - -/* Define this if you want to use the AS3525 i2c interface */ -#define CONFIG_I2C I2C_AS3525 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 250000000 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#ifndef BOOTLOADER - -#define USB_HANDLED_BY_OF - -#define CONFIG_USBOTG USBOTG_AS3525 - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x7431 - -#endif /* BOOTLOADER */ - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "sansa" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define IBSS_ATTR_VOICE_STACK -#define ICODE_ATTR_TREMOR_NOT_MDCT -#define ICODE_ATTR_TREMOR_MDCT -#define ICODE_ATTR_FLAC -#define IBSS_ATTR_FLAC_DECODED0 -#define ICONST_ATTR_MPA_HUFFMAN -#define IBSS_ATTR_MPC_SAMPLE_BUF -#define ICODE_ATTR_ALAC -#define IBSS_ATTR_SHORTEN_DECODED0 - -#define IRAM_LCDFRAMEBUFFER IBSS_ATTR /* put the lcd frame buffer in IRAM */ - -#endif /* SIMULATOR */ Index: firmware/export/config-tpj1022.h =================================================================== --- firmware/export/config-tpj1022.h (revision 23734) +++ firmware/export/config-tpj1022.h (working copy) @@ -1,142 +0,0 @@ -/* - * This config file is for the Tatung Elio TPJ-1022 - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -#define MODEL_NAME "Tatung Elio TPJ-1022" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 15 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have recording possibility */ -/*#define HAVE_RECORDING*/ /* TODO: add support for this */ - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates -#define REC_SAMPR_CAPS (SAMPR_CAP_96 | SAMPR_CAP_88 | SAMPR_CAP_48 | \ - SAMPR_CAP_44 | SAMPR_CAP_32 | SAMPR_CAP_8) */ - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* LCD dimensions */ -#define LCD_WIDTH 220 -#define LCD_HEIGHT 176 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 - -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ - -#define CONFIG_KEYPAD ELIO_TPJ1022_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -//#define CONFIG_RTC RTC_E8564 -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have the WM8731 audio codec */ -#define HAVE_WM8731 - -#define AB_REPEAT_ENABLE 1 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity - TODO: check this, probably different - for different models too */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1600 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 10 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* define this if the unit can be powered or charged via USB */ -/*#define HAVE_USB_POWER*/ - -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5020 */ -#define CONFIG_CPU PP5020 - -/* Define this if you want to use the PP5020 i2c interface */ -#define CONFIG_I2C I2C_PP5020 - -/* define this if the hardware can be powered off while charging */ -/* TODO: should this be set for the H10? */ -//#define HAVE_POWEROFF_WHILE_CHARGING - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -/* TODO: this is probably wrong */ -#define CPU_FREQ 11289600 - -/* Type of LCD */ -#define CONFIG_LCD LCD_TPJ1022 - -#define DEFAULT_CONTRAST_SETTING 19 - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* enable these for the experimental usb stack ROOLKU */ -#define HAVE_USBSTACK -#define USB_VENDOR_ID 0x07B4 -#define USB_PRODUCT_ID 0x0280 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "elio" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#endif Index: firmware/export/config-gigabeat.h =================================================================== --- firmware/export/config-gigabeat.h (revision 23734) +++ firmware/export/config-gigabeat.h (working copy) @@ -1,197 +0,0 @@ -/* - * This config file is for toshiba Gigabeat F - */ -#define TARGET_TREE /* this target is using the target tree system */ - -#define TOSHIBA_GIGABEAT_F 1 - -#define MODEL_NAME "Toshiba Gigabeat F" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 18 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define LCD_WIDTH 240 -#define LCD_HEIGHT 320 -#define LCD_DEPTH 16 /* 65k colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#ifndef BOOTLOADER -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -#define HAVE_LCD_SLEEP -/* We don't use a setting but a fixed delay after the backlight has - * turned off */ -#define LCD_SLEEP_TIMEOUT (5*HZ) - -#define HAVE_TOUCHPAD_SENSITIVITY_SETTING - -#ifndef SIMULATOR -#define HAVE_HARDWARE_BEEP -#endif - -#endif /* BOOTLOADER */ - -#define CONFIG_KEYPAD GIGABEAT_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_S3C2440 - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define HAVE_BUTTON_LIGHT - -#define HAVE_BACKLIGHT_BRIGHTNESS - -#define HAVE_BUTTONLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 /* 0.5 mA */ -#define MAX_BRIGHTNESS_SETTING 12 /* 32 mA */ -#define DEFAULT_BRIGHTNESS_SETTING 10 /* 16 mA */ - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you have the WM8975 audio codec */ -#define HAVE_WM8751 - -/* Define this if you want to use the adaptive bass capibility of the 8751 */ -/* #define USE_ADAPTIVE_BASS */ - -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | \ - SAMPR_CAP_11) - -/* All exact rates for 16.9344MHz clock */ -#define CODEC_SRCTRL_11025HZ (0x19 << 1) -#define CODEC_SRCTRL_22050HZ (0x1b << 1) -#define CODEC_SRCTRL_44100HZ (0x11 << 1) -#define CODEC_SRCTRL_88200HZ (0x1f << 1) - -#define HAVE_HEADPHONE_DETECTION - -#define BATTERY_CAPACITY_DEFAULT 830 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 830 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 830 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 25 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define current usage levels */ -#define CURRENT_NORMAL 46 /* 18 hours from an 830 mah battery*/ -#define CURRENT_BACKLIGHT 30 /* seems reasonable */ -#define CURRENT_RECORD 0 /* no recording on the gigabeat F/X */ - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* define this if the unit has a battery switch or battery can be removed - * when running */ -#define HAVE_BATTERY_SWITCH - -#ifndef SIMULATOR - -/* The LCD on a Gigabeat is 240x320 - it is portrait */ -#define HAVE_PORTRAIT_LCD - -#define HAVE_LCD_FLIP - -/* Define this if your LCD can set contrast */ -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 0 -#define MAX_CONTRAST_SETTING 63 -#define DEFAULT_CONTRAST_SETTING 47 /* Match boot contrast */ - -/* LCD invert - does not currently work */ -/* #define HAVE_LCD_INVERT */ - -/* Define this if you have a Motorola SCF5249 */ -#define CONFIG_CPU S3C2440 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_S3C2440 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 16934400 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -#define CONFIG_LCD LCD_GIGABEAT - -/* define this if the backlight can be set to a brightness */ -#define HAVE_BACKLIGHT_SET_FADING -#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -/* #define HAVE_ADJUSTABLE_CPU_FREQ */ - -#define BOOTFILE_EXT "gigabeat" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#endif Index: firmware/export/config-gigabeat-s.h =================================================================== --- firmware/export/config-gigabeat-s.h (revision 23734) +++ firmware/export/config-gigabeat-s.h (working copy) @@ -1,227 +0,0 @@ -/* - * This config file is for toshiba Gigabeat S - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -#define TOSHIBA_GIGABEAT_S 1 - -#define MODEL_NAME "Toshiba Gigabeat S" - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 21 - -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define LCD_WIDTH 240 -#define LCD_HEIGHT 320 -#define LCD_DEPTH 16 /* 65k colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#define CONFIG_KEYPAD GIGABEAT_S_PAD - -/* Define keyboard features */ -#define KBD_CURSOR_KEYS /* allow non-line edit cursor movement */ -#define KBD_MODES /* enable line edit */ -#define KBD_MORSE_INPUT /* enable morse code input */ - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_MC13783 - -/* Define if the device can wake from an RTC alarm */ -#define HAVE_RTC_ALARM - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* Define this if you have a SI4700 fm radio tuner */ -#define CONFIG_TUNER SI4700 - -/* Define this if you have the WM8978 audio codec */ -#define HAVE_WM8978 - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS SRC_CAP_FMRADIO - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS HW_SAMPR_CAPS /* Same as playback */ - -/* define default recording levels */ -#define DEFAULT_REC_LEFT_GAIN 0 -#define DEFAULT_REC_RIGHT_GAIN 0 - -/* Define this if you have recording capability */ -#define HAVE_RECORDING - -/* Define this if your LCD can be put to sleep. */ -#define HAVE_LCD_SLEEP -/* We don't use a setting but a fixed delay after the backlight has - * turned off */ -#define LCD_SLEEP_TIMEOUT (2*HZ) - -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -#ifndef BOOTLOADER - -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 24 -#define DEFAULT_BRIGHTNESS_SETTING 12 - -/* Implementation-defined fading type with bool settings */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_TARGET - -#define HAVE_HEADPHONE_DETECTION -#endif /* BOOTLOADER */ - -#ifndef SIMULATOR - -/* The LCD on a Gigabeat is 240x320 - it is portrait */ -#define HAVE_PORTRAIT_LCD - -#define CONFIG_CPU IMX31L - -/* Define this if you want to use imx31l's i2c interface */ -#define CONFIG_I2C I2C_IMX31L - -/* Define the bitmask of modules used */ -#define SPI_MODULE_MASK (USE_CSPI2_MODULE) -#define I2C_MODULE_MASK (USE_I2C1_MODULE | USE_I2C2_MODULE) -#define GPIO_EVENT_MASK (USE_GPIO1_EVENTS) - -/* Define this if target has an additional number of threads specific to it */ -#define TARGET_EXTRA_THREADS 2 - -/* Type of mobile power - check this out */ -#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 25 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* TODO: have a proper status displayed in the bootloader and have it - * work! */ -/* Charing implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_TARGET - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -/* TODO */ -#define CPU_FREQ 264000000 /* Set by retailOS loader */ - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER -#define USBPOWER_BUTTON BUTTON_MENU -#define USBPOWER_BTN_IGNORE BUTTON_POWER - -/* define this if the unit has a battery switch or battery can be removed - * when running */ -#define HAVE_BATTERY_SWITCH - -/* USB On-the-go */ -#define CONFIG_USBOTG USBOTG_ARC - -/* enable these for the usb stack */ -#define USE_ROCKBOX_USB -#define HAVE_USBSTACK -/* usb stack and driver settings */ -#define USB_PORTSCX_PHY_TYPE PORTSCX_PTS_ULPI -#define USB_VENDOR_ID 0x0930 -#define USB_PRODUCT_ID 0x0010 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Define this to add support for ATA DMA */ -#define HAVE_ATA_DMA - -#define CONFIG_LCD LCD_GIGABEAT - -/* define this if the backlight can be set to a brightness */ -//#define HAVE_BACKLIGHT_SET_FADING -#define __BACKLIGHT_INIT - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -//#define HAVE_SERIAL -#define HAVE_VOLUME_IN_LIST - -/*Remove Comments from UART_INT to enable the UART interrupts,*/ -/*otherwise iterrupts will be disabled. For now we will test */ -/*UART state by polling the registers, and if necessary update this */ -/*method by using the interrupts instead*/ -//#define UART_INT - -/* Define this if you have adjustable CPU frequency */ -/* #define HAVE_ADJUSTABLE_CPU_FREQ */ - -#define HAVE_PCM_DMA_ADDRESS - -#define BOOTFILE_EXT "gigabeat" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#endif Index: firmware/export/config-recorder.h =================================================================== --- firmware/export/config-recorder.h (revision 23734) +++ firmware/export/config-recorder.h (working copy) @@ -1,134 +0,0 @@ -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -#define MODEL_NAME "Archos Recorder" - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN -/* define this if you have the button bar */ -#define HAVE_BUTTONBAR - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 112 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXEL_ASPECT_WIDTH 4 -#define LCD_PIXEL_ASPECT_HEIGHT 5 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x7ee57e - -/* define this if you have the Recorder's 10-key keyboard */ -#define CONFIG_KEYPAD RECORDER_PAD - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_M41ST84W - -/* define this if you have RTC RAM available for settings */ -#define HAVE_RTC_RAM - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x8000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you have a MAS3587F */ -#define CONFIG_CODEC MAS3587F - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -#define CONFIG_I2C I2C_PLAYREC - -#define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -#define CURRENT_NORMAL 145 /* usual current in mA */ -#define CURRENT_RECORD 35 /* additional recording current */ -#define CURRENT_USB 500 /* usual current in mA in USB mode */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -/* Software controlled charging */ -#define CONFIG_CHARGING CHARGING_TARGET - -#ifndef SIMULATOR - -/* Define this if you have a SH7034 */ -#define CONFIG_CPU SH7034 - -/* Define this if you have ATA power-off control */ -#define HAVE_ATA_POWER_OFF - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11059200 - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 0 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 4 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 6 - -/* The start address index for ROM builds */ -/* #define ROM_START 0x11010 for behind original Archos */ -#define ROM_START 0x7010 /* for behind BootBox */ - -/* Software controlled LED */ -#define CONFIG_LED LED_REAL - -/* Define this for S/PDIF output available */ -#define HAVE_SPDIF_OUT - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "ajz" -#define BOOTFILE "ajbrec." BOOTFILE_EXT -#define BOOTDIR "/" - -#endif /* SIMULATOR */ - -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 - -#define HAVE_SERIAL - Index: firmware/export/config-view.h =================================================================== --- firmware/export/config-view.h (revision 23734) +++ firmware/export/config-view.h (working copy) @@ -1,205 +0,0 @@ -/* - * This config file is for the Sandisk Sansa View - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 63 -#define MODEL_NAME "Sandisk View" - -#define HW_SAMPR_CAPS (SAMPR_CAP_44) - -/* define this if you have recording possibility */ -/* #define HAVE_RECORDING */ - -#define REC_SAMPR_CAPS (SAMPR_CAP_22) -#define REC_FREQ_DEFAULT REC_FREQ_22 /* Default is not 44.1kHz */ -#define REC_SAMPR_DEFAULT SAMPR_22 - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have a light associated with the buttons */ -#define HAVE_BUTTON_LIGHT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 240 -#define LCD_HEIGHT 320 -#define LCD_DEPTH 16 /* 65536 colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -#ifndef BOOTLOADER -/* define this if you have LCD enable function */ -/* #define HAVE_LCD_ENABLE */ - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -/* #define HAVE_LCD_SLEEP */ -/* #define HAVE_LCD_SLEEP_SETTING */ -#endif - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* #define IRAM_LCDFRAMEBUFFER IDATA_ATTR *//* put the lcd frame buffer in IRAM */ - -/* The only difference is that the power/hold is on the left instead of right on Fuze */ -#define CONFIG_KEYPAD SANSA_FUZE_PAD - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC -/* There is no hardware tone control */ -#define HAVE_SW_TONE_CONTROLS - -/* define this if you have a real-time clock */ -#ifndef BOOTLOADER -/* #define CONFIG_RTC RTC_ */ -#endif - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Required for MicroSD cards */ -#define HAVE_FAT16SUPPORT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -/* #define HAVE_BACKLIGHT_BRIGHTNESS */ - -/* define this if the unit uses a scrollwheel for navigation */ -#define HAVE_SCROLLWHEEL -/* define to activate advanced wheel acceleration code */ -#define HAVE_WHEEL_ACCELERATION -/* define from which rotation speed [degree/sec] on the acceleration starts */ -#define WHEEL_ACCEL_START 540 -/* define type of acceleration (1 = ^2, 2 = ^3, 3 = ^4) */ -#define WHEEL_ACCELERATION 1 - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* define this if the flash memory uses the SecureDigital Memory Card protocol */ -#define CONFIG_STORAGE STORAGE_SD - -#define BATTERY_CAPACITY_DEFAULT 750 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 750 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 750 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 0 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Charging implemented in a target-specific algorithm */ -#define CONFIG_CHARGING CHARGING_SIMPLE -#define HAVE_POWEROFF_WHILE_CHARGING - -/* define current usage levels */ -#define CURRENT_NORMAL 30 /* Toni's measurements in Nov 2008 */ -#define CURRENT_BACKLIGHT 40 /* Screen is about 20, blue LEDs are another 20, so 40 if both */ -#define CURRENT_RECORD 30 /* flash player, so this is just unboosted current*/ - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/** Non-simulator section **/ -#ifndef SIMULATOR - -/* Define this if you have a PortalPlayer PP5024 */ -#define CONFIG_CPU PP6100 - -/* Define this if you want to use the PP5024 i2c interface */ -#define CONFIG_I2C I2C_PP5024 - -/* define this if the hardware can be powered off while charging */ -/* Sansa can't be powered off while charging */ -/* #define HAVE_POWEROFF_WHILE_CHARGING */ - -/* The start address index for ROM builds */ -#define ROM_START 0x00000000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 250000000 - -/* Type of LCD TODO: hopefully the same as the x5 but check this*/ -#define CONFIG_LCD LCD_VIEW - -/* Offset ( in the firmware file's header ) to the file CRC and data. These are - only used when loading the old format rockbox.e200 file - Required for bootloader/common.c to compile */ -#define FIRMWARE_OFFSET_FILE_CRC 0x0 -#define FIRMWARE_OFFSET_FILE_DATA 0x8 - -#ifndef BOOTLOADER -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 -#define HAVE_HOTSWAP -#endif - -/* USB On-the-go */ -/* #define CONFIG_USBOTG USBOTG_ARC */ - -/* enable these for the experimental usb stack */ -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0781 -#define USB_PRODUCT_ID 0x74b1 - -/* Define this if you have adjustable CPU frequency */ -/* #define HAVE_ADJUSTABLE_CPU_FREQ */ - -#define MI4_FORMAT -#define BOOTFILE_EXT "mi4" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define ICODE_ATTR_TREMOR_NOT_MDCT - -#define INCLUDE_TIMEOUT_API - -#endif /* SIMULATOR */ - -/** Port-specific settings **/ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 12 -#define DEFAULT_BRIGHTNESS_SETTING 6 - -/* Default recording levels */ -#define DEFAULT_REC_MIC_GAIN 23 -#define DEFAULT_REC_LEFT_GAIN 23 -#define DEFAULT_REC_RIGHT_GAIN 23 Index: firmware/export/config-cowond2.h =================================================================== --- firmware/export/config-cowond2.h (revision 23734) +++ firmware/export/config-cowond2.h (working copy) @@ -1,175 +0,0 @@ -/* - * This config file is for the Cowon D2 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 24 - -#define MODEL_NAME "Cowon D2" - -#if 0 -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x0e21 -#define USB_PRODUCT_ID 0x0800 -#endif - - -/* Produce a dual-boot bootloader.bin for mktccboot */ -#define TCCBOOT - -/* define this if you have recording possibility */ -//#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you can flip your LCD */ -/* #define HAVE_LCD_FLIP */ - -/* define this if you can invert the colours on your LCD */ -/* #define HAVE_LCD_INVERT */ - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* FM Tuner */ -#define CONFIG_TUNER LV24020LP -#define HAVE_TUNER_PWR_CTRL - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#ifndef SIMULATOR -#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) -#define HAVE_MULTIDRIVE -#define HAVE_HOTSWAP -#define NUM_DRIVES 2 -#else -#define CONFIG_STORAGE STORAGE_NAND -#endif - -#define CONFIG_NAND NAND_TCC - -/* Some (2Gb?) D2s seem to be FAT16 formatted */ -#define HAVE_FAT16SUPPORT - -/* LCD dimensions */ -#define LCD_WIDTH 320 -#define LCD_HEIGHT 240 -#define LCD_DEPTH 16 -#define LCD_PIXELFORMAT 565 - -/* define this if you have LCD enable function */ -#define HAVE_LCD_ENABLE - -/* define this to indicate your device's keypad */ -#define CONFIG_KEYPAD COWOND2_PAD -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_PCF50606 - -/* define this if you have RTC RAM available for settings */ -//#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* Reduce Tremor's ICODE usage */ -#define ICODE_ATTR_TREMOR_NOT_MDCT - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* The D2 uses a WM8985 codec */ -#define HAVE_WM8985 - -/* Use WM8985 EQ1 & EQ5 as hardware tone controls */ -/* #define HAVE_SW_TONE_CONTROLS */ - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -/* Enable LCD brightness control */ -#define HAVE_BACKLIGHT_BRIGHTNESS -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_HW_REG - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 14 -#define DEFAULT_BRIGHTNESS_SETTING 8 - -#define CONFIG_I2C I2C_TCC780X - -#define BATTERY_CAPACITY_DEFAULT 1600 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -/* Define current usage levels. */ -#define CURRENT_NORMAL 88 /* 18 hours from a 1600 mAh battery */ -#define CURRENT_BACKLIGHT 30 /* TBD */ -#define CURRENT_RECORD 0 /* no recording yet */ - -#ifndef SIMULATOR -/* Define this if you have a TCC7801 */ -#define CONFIG_CPU TCC7801 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 48000000 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define INCLUDE_TIMEOUT_API - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -#define CONFIG_LCD LCD_COWOND2 - -#define BOOTFILE_EXT "d2" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - - -#endif /* SIMULATOR */ Index: firmware/export/config-ondiosp.h =================================================================== --- firmware/export/config-ondiosp.h (revision 23734) +++ firmware/export/config-ondiosp.h (working copy) @@ -1,127 +0,0 @@ -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -#define MODEL_NAME "Ondio SP" - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 112 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXEL_ASPECT_WIDTH 4 -#define LCD_PIXEL_ASPECT_HEIGHT 5 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x82b4fa - -/* define this if you have an Ondio style 6-key keyboard */ -#define CONFIG_KEYPAD ONDIO_PAD - -#define AB_REPEAT_ENABLE 1 -#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x8000 - -/* Define this if you have a MAS3539F */ -#define CONFIG_CODEC MAS3539F - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define BATTERY_CAPACITY_DEFAULT 1000 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 1500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 2 /* Alkalines or NiMH */ - -/* define this if the unit should not shut down on low battery. */ -#define NO_LOW_BATTERY_SHUTDOWN - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -/* define current usage levels */ -#define CURRENT_NORMAL 95 /* average, nearly proportional to 1/U */ -#define CURRENT_USB 1 /* host powered in USB mode; avoid zero-div */ -#define CURRENT_BACKLIGHT 0 /* no backlight */ - -#ifndef SIMULATOR - -/* Define this if you have a SH7034 */ -#define CONFIG_CPU SH7034 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 12000000 - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 20 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 6 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 24 - -/* The start address index for ROM builds */ -/* #define ROM_START 0x12010 for behind original Archos */ -#define ROM_START 0x7010 /* for behind BootBox */ - -/* Define this if the display is mounted upside down */ -#define HAVE_DISPLAY_FLIPPED - -/* Define this for different I2C pinout */ -#define CONFIG_I2C I2C_ONDIO - -/* Define this for different ADC channel assignment */ -#define HAVE_ONDIO_ADC - -/* Define this for MMC support instead of ATA harddisk */ -#define CONFIG_STORAGE STORAGE_MMC - -/* Define this to support mounting FAT16 partitions */ -#define HAVE_FAT16SUPPORT - -/* Define this if the MAS SIBI line can be controlled via PB8 */ -#define HAVE_MAS_SIBI_CONTROL - -/* define this if more than one device/partition can be used */ -#define HAVE_MULTIDRIVE -#define NUM_DRIVES 2 - -/* define this if media can be exchanged on the fly */ -#define HAVE_HOTSWAP - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "ajz" -#define BOOTFILE "ajbrec." BOOTFILE_EXT -#define BOOTDIR "/" - -#endif /* SIMULATOR */ - -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 - Index: firmware/export/config-fmrecorder.h =================================================================== --- firmware/export/config-fmrecorder.h (revision 23734) +++ firmware/export/config-fmrecorder.h (working copy) @@ -1,143 +0,0 @@ -/* define this if you use an ATA controller */ -#define CONFIG_STORAGE STORAGE_ATA - -#define MODEL_NAME "Archos FM Recorder" - -/* define this if you have recording possibility */ -#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_SPDIF) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -#define HAVE_LCD_FLIP - -/* define this if you can invert the colours on your LCD */ -#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN -/* define this if you have the button bar */ -#define HAVE_BUTTONBAR - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* LCD dimensions */ -#define LCD_WIDTH 112 -#define LCD_HEIGHT 64 -#define LCD_DEPTH 1 - -#define LCD_PIXEL_ASPECT_WIDTH 4 -#define LCD_PIXEL_ASPECT_HEIGHT 5 - -#define LCD_PIXELFORMAT VERTICAL_PACKING - -/* Display colours, for screenshots and sim (0xRRGGBB) */ -#define LCD_DARKCOLOR 0x000000 -#define LCD_BRIGHTCOLOR 0x5a915a -#define LCD_BL_DARKCOLOR 0x000000 -#define LCD_BL_BRIGHTCOLOR 0x7ee57e - -/* define this if you have a Recorder style 10-key keyboard */ -#define CONFIG_KEYPAD RECORDER_PAD - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_M41ST84W - -/* FM recorders can wake up from RTC alarm */ -#define HAVE_RTC_ALARM - -/* define this if you have RTC RAM available for settings */ -#define HAVE_RTC_RAM - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x8000 - -#ifndef BOOTLOADER -/* Define this if you have an FM Radio */ -#define CONFIG_TUNER S1A0903X01 -#endif - -#define AB_REPEAT_ENABLE 1 - -/* Define this if you have a MAS3587F */ -#define CONFIG_CODEC MAS3587F - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT - -/* define this if you have a disk storage, i.e. something - that needs spinups and can cause skips when shaked */ -#define HAVE_DISK_STORAGE - -#define CONFIG_I2C I2C_PLAYREC - -#define BATTERY_CAPACITY_DEFAULT 2200 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 2200 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -#define CURRENT_NORMAL 145 /* usual current in mA */ -#define CURRENT_RECORD 35 /* additional recording current */ -#define CURRENT_USB 500 /* usual current in mA in USB mode */ - -/* Hardware controlled charging with monitoring */ -#define CONFIG_CHARGING CHARGING_MONITOR - -/* define this if the unit can be powered or charged via USB */ -#define HAVE_USB_POWER - -#ifndef SIMULATOR - -/* Define this if you have a SH7034 */ -#define CONFIG_CPU SH7034 - -/* Define this if you have a FM Recorder key system */ -#define HAVE_FMADC - -/* Define this if battery voltage can only be measured with ATA powered */ -#define NEED_ATA_POWER_BATT_MEASURE - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11059200 - -/* Offset ( in the firmware file's header ) to the file length */ -#define FIRMWARE_OFFSET_FILE_LENGTH 20 - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 6 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 24 - -/* The start address index for ROM builds */ -/* #define ROM_START 0x14010 for behind original Archos */ -#define ROM_START 0x7010 /* for behind BootBox */ - -/* Software controlled LED */ -#define CONFIG_LED LED_REAL - -#define CONFIG_LCD LCD_SSD1815 - -#define BOOTFILE_EXT "ajz" -#define BOOTFILE "ajbrec." BOOTFILE_EXT -#define BOOTDIR "/" - -#endif /* SIMULATOR */ - -#define HAVE_LCD_CONTRAST - -#define MIN_CONTRAST_SETTING 5 -#define MAX_CONTRAST_SETTING 63 - Index: firmware/export/config-ondavx747.h =================================================================== --- firmware/export/config-ondavx747.h (revision 23734) +++ firmware/export/config-ondavx747.h (working copy) @@ -1,220 +0,0 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id$ - * - * Copyright (C) 2008 by Maurus Cuelenaere - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - -/* - * This config file is for the Onda VX747(+)/VX777 - */ - -#define TARGET_TREE /* this target is using the target tree system */ - -#define CONFIG_SDRAM_START 0x80004000 - -#ifdef ONDA_VX747P -#define MODEL_NAME "Onda VX747+" -#define MODEL_NUMBER 54 -/* Define something for camera interface... */ -#elif defined(ONDA_VX777) -#define MODEL_NAME "Onda VX777" -#define MODEL_NUMBER 61 -#else -#define MODEL_NAME "Onda VX747" -#define MODEL_NUMBER 45 -#endif - -/* Support FAT16 for SD cards <= 2GB */ -#define HAVE_FAT16SUPPORT - -/* ChinaChip NAND FTL */ -#define CONFIG_NAND NAND_CC - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if the target has volume keys which can be used in the lists */ -//#define HAVE_VOLUME_IN_LIST - -/* LCD dimensions */ -#define CONFIG_LCD LCD_ONDAVX747 - -#ifdef BOOTLOADER /* OF requires landscape */ -#define LCD_WIDTH 400 -#define LCD_HEIGHT 240 -#else -#define LCD_WIDTH 240 -#define LCD_HEIGHT 400 -#endif - -#define LCD_DEPTH 16 /* 16bit colours */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -#define HAVE_LCD_ENABLE - -#ifdef ONDA_VX777 -#define CONFIG_KEYPAD ONDAVX777_PAD -#else -#define CONFIG_KEYPAD ONDAVX747_PAD -#endif -#define HAVE_TOUCHSCREEN -#define HAVE_BUTTON_DATA - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_JZ47XX - -/* Tuner config */ -#define CONFIG_TUNER TEA5767 -#define CONFIG_TUNER_XTAL 32768 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Which backlight fading type? */ -#define CONFIG_BACKLIGHT_FADING BACKLIGHT_FADING_SW_HW_REG - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 1 -#define MAX_BRIGHTNESS_SETTING 16 -#define DEFAULT_BRIGHTNESS_SETTING 16 /* "full brightness" */ -#define DEFAULT_DIMNESS_SETTING 1 /* "most dim" */ - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x100000 - -/* Define this if you have the Jz4740 internal codec */ -#define HAVE_JZ4740_CODEC - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) - -/* has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -/* has no volume control, so we use the software ones */ -#ifndef SIMULATOR -#define HAVE_SW_VOLUME_CONTROL -#endif - -/* software controlled volume ranges from -73 -> 0 dB, other than that - is controlled by hardware */ -#define SW_VOLUME_MIN -73 -#define SW_VOLUME_MAX 0 - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_48 | SAMPR_CAP_44 | SAMPR_CAP_32 | \ - SAMPR_CAP_24 | SAMPR_CAP_22 | SAMPR_CAP_16 | \ - SAMPR_CAP_12 | SAMPR_CAP_11 | SAMPR_CAP_8) - -#define CONFIG_I2C I2C_JZ47XX - -#define NEED_ADC_CLOSE 1 - -#define BATTERY_CAPACITY_DEFAULT 1250 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2500 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 100 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging with monitoring */ -#define CONFIG_CHARGING CHARGING_MONITOR - -#define CFG_EXTAL 12000000 /* EXT clock: 12 Mhz */ - -#ifndef SIMULATOR - -#define CONFIG_STORAGE (STORAGE_NAND | STORAGE_SD) -#define NUM_DRIVES 2 - -/* Define this if media can be exchanged on the fly */ -//#define HAVE_HOTSWAP - -/* Define this if you have a Ingenic JZ4732 */ -#define CONFIG_CPU JZ4732 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* Define this if you have a speaker */ -#define HAVE_SPEAKER - -/* Define this to the CPU frequency */ -#define CPU_FREQ 336000000 /* CPU clock: 336 MHz */ - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#ifdef ONDA_VX747P -#define BOOTFILE_EXT "vx747p" -#elif defined(ONDA_VX777) -#define BOOTFILE_EXT "vx777" -#else -#define BOOTFILE_EXT "vx747" -#endif -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define CONFIG_USBOTG USBOTG_JZ4740 -#define HAVE_USBSTACK -#define USE_ROCKBOX_USB -#define USB_VENDOR_ID 0x07C4 -#define USB_PRODUCT_ID 0xA4A5 - -#endif Index: firmware/export/config-meizu-m3.h =================================================================== --- firmware/export/config-meizu-m3.h (revision 23734) +++ firmware/export/config-meizu-m3.h (working copy) @@ -1,181 +0,0 @@ -/* - * This config file is for Meizu M3 - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 39 - -#define MODEL_NAME "Meizu M3" - -/* define this if you have recording possibility */ -//#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -//#define HAVE_LCD_FLIP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -//#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_SAMSUNG - -/* LCD dimensions */ -#define LCD_WIDTH 176 -#define LCD_HEIGHT 132 -#define LCD_DEPTH 16 /* pseudo 262.144 colors */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -//#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -//#define HAVE_LCD_SLEEP - -#define CONFIG_KEYPAD MEIZU_M3_PAD - -//#define AB_REPEAT_ENABLE 1 -//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -//#define CONFIG_RTC RTC_S5L8700 -#define CONFIG_RTC RTC_S35390A - -#define CONFIG_LCD LCD_MEIZUM6 - -/* Define the type of audio codec */ -#define HAVE_UDA1380 - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* FM Tuner */ -#define CONFIG_TUNER TEA5760 -#define CONFIG_TUNER_XTAL 32768 - -//#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging, software can monitor plug and charge state */ -#define CONFIG_CHARGING CHARGING_MONITOR - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -//#define HAVE_LCD_CONTRAST - -/* Define this if you have a Motorola SCF5250 */ -#define CONFIG_CPU S5L8700 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_S5L8700 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -//#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -//#define CONFIG_USBOTG USBOTG_M5636 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "meizu" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 1 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ - -/* Main LCD backlight brightness range and defaults */ -#define MIN_BRIGHTNESS_SETTING 0 -#define MAX_BRIGHTNESS_SETTING 15 -#define DEFAULT_BRIGHTNESS_SETTING 10 - Index: firmware/export/config-meizu-m6sl.h =================================================================== --- firmware/export/config-meizu-m6sl.h (revision 23734) +++ firmware/export/config-meizu-m6sl.h (working copy) @@ -1,182 +0,0 @@ -/* - * This config file is for Meizu M6SL - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 38 - -#define MODEL_NAME "Meizu M6SL" - -/* define this if you have recording possibility */ -//#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -//#define HAVE_LCD_FLIP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -//#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_SAMSUNG - -/* LCD dimensions */ -#define LCD_WIDTH 320 -#define LCD_HEIGHT 240 -#define LCD_DEPTH 16 /* pseudo 262.144 colors */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -//#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -//#define HAVE_LCD_SLEEP - -#define CONFIG_KEYPAD MEIZU_M6SL_PAD - -//#define AB_REPEAT_ENABLE 1 -//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_S5L8700 -//#define CONFIG_RTC RTC_S35390A - -#define CONFIG_LCD LCD_MEIZUM6 - -/* Define this if you have the WM8975 audio codec */ -#define HAVE_WM8751 //FIXME - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* FM Tuner */ -#define CONFIG_TUNER TEA5760 -#define CONFIG_TUNER_XTAL 32768 - -//#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -//#define HAVE_LCD_CONTRAST - -/* Define this if you have a Motorola SCF5250 */ -#define CONFIG_CPU S5L8700 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_S5L8700 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -//#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -//#define CONFIG_USBOTG USBOTG_M5636 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "meizu" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 1 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ - -/* Main LCD backlight brightness range and defaults */ -/* PCF50506 can output 0%-100% duty cycle but D305A expects %15-100%. */ -#define MIN_BRIGHTNESS_SETTING 1 /* 15/16 (93.75%) */ -#define MAX_BRIGHTNESS_SETTING 13 /* 3/16 (18.75%) */ -#define DEFAULT_BRIGHTNESS_SETTING 8 /* 8/16 (50.00%) = x5 boot default */ - Index: firmware/export/config-meizu-m6sp.h =================================================================== --- firmware/export/config-meizu-m6sp.h (revision 23734) +++ firmware/export/config-meizu-m6sp.h (working copy) @@ -1,182 +0,0 @@ -/* - * This config file is for Meizu M6SP - */ -#define TARGET_TREE /* this target is using the target tree system */ - -/* For Rolo and boot loader */ -#define MODEL_NUMBER 37 - -#define MODEL_NAME "Meizu M6SP" - -/* define this if you have recording possibility */ -//#define HAVE_RECORDING - -/* Define bitmask of input sources - recordable bitmask can be defined - explicitly if different */ -#define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_LINEIN | SRC_CAP_FMRADIO) - -/* define the bitmask of hardware sample rates */ -#define HW_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define the bitmask of recording sample rates */ -#define REC_SAMPR_CAPS (SAMPR_CAP_88 | SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11) - -/* define this if you have a bitmap LCD display */ -#define HAVE_LCD_BITMAP - -/* define this if you can flip your LCD */ -//#define HAVE_LCD_FLIP - -/* define this if you have a colour LCD */ -#define HAVE_LCD_COLOR - -/* define this if you want album art for this target */ -#define HAVE_ALBUMART - -/* define this to enable bitmap scaling */ -#define HAVE_BMP_SCALING - -/* define this to enable JPEG decoding */ -#define HAVE_JPEG - -/* define this if you can invert the colours on your LCD */ -//#define HAVE_LCD_INVERT - -/* define this if you have access to the quickscreen */ -#define HAVE_QUICKSCREEN - -/* define this if you have access to the pitchscreen */ -#define HAVE_PITCHSCREEN - -/* define this if you would like tagcache to build on this target */ -#define HAVE_TAGCACHE - -/* define this if you have a flash memory storage */ -#define HAVE_FLASH_STORAGE - -#define CONFIG_STORAGE STORAGE_NAND - -#define CONFIG_NAND NAND_SAMSUNG - -/* LCD dimensions */ -#define LCD_WIDTH 320 -#define LCD_HEIGHT 240 -#define LCD_DEPTH 16 /* pseudo 262.144 colors */ -#define LCD_PIXELFORMAT RGB565 /* rgb565 */ - -/* Define this if your LCD can be enabled/disabled */ -//#define HAVE_LCD_ENABLE - -/* Define this if your LCD can be put to sleep. HAVE_LCD_ENABLE - should be defined as well. */ -//#define HAVE_LCD_SLEEP - -#define CONFIG_KEYPAD MEIZU_M6SP_PAD - -//#define AB_REPEAT_ENABLE 1 -//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE - -/* Define this if you do software codec */ -#define CONFIG_CODEC SWCODEC - -/* define this if you have a real-time clock */ -#define CONFIG_RTC RTC_S5L8700 -//#define CONFIG_RTC RTC_S35390A - -#define CONFIG_LCD LCD_MEIZUM6 - -/* Define this if you have the WM8975 audio codec */ -#define HAVE_WM8751 //FIXME - -/* Define this for LCD backlight available */ -#define HAVE_BACKLIGHT -#define HAVE_BACKLIGHT_BRIGHTNESS - -/* Define this if you have a software controlled poweroff */ -#define HAVE_SW_POWEROFF - -/* The number of bytes reserved for loadable codecs */ -#define CODEC_SIZE 0x100000 - -/* The number of bytes reserved for loadable plugins */ -#define PLUGIN_BUFFER_SIZE 0x80000 - -/* FM Tuner */ -#define CONFIG_TUNER TEA5760 -#define CONFIG_TUNER_XTAL 32768 - -//#define HAVE_TLV320 - -/* TLV320 has no tone controls, so we use the software ones */ -#define HAVE_SW_TONE_CONTROLS - -#define BATTERY_CAPACITY_DEFAULT 700 /* default battery capacity */ -#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */ -#define BATTERY_CAPACITY_MAX 2250 /* max. capacity selectable */ -#define BATTERY_CAPACITY_INC 50 /* capacity increment */ -#define BATTERY_TYPES_COUNT 1 /* only one type */ - -/* Hardware controlled charging? FIXME */ -#define CONFIG_CHARGING CHARGING_SIMPLE - -#ifndef SIMULATOR - -/* Define this if your LCD can set contrast */ -//#define HAVE_LCD_CONTRAST - -/* Define this if you have a Motorola SCF5250 */ -#define CONFIG_CPU S5L8700 - -/* Define this if you want to use coldfire's i2c interface */ -#define CONFIG_I2C I2C_S5L8700 - -/* define this if the hardware can be powered off while charging */ -#define HAVE_POWEROFF_WHILE_CHARGING - -/* The size of the flash ROM */ -#define FLASH_SIZE 0x400000 - -/* Define this to the CPU frequency */ -#define CPU_FREQ 11289600 - -/* Define this if you have ATA power-off control */ -//#define HAVE_ATA_POWER_OFF - -/* Offset ( in the firmware file's header ) to the file CRC */ -#define FIRMWARE_OFFSET_FILE_CRC 0 - -/* Offset ( in the firmware file's header ) to the real data */ -#define FIRMWARE_OFFSET_FILE_DATA 8 - -/* USB On-the-go */ -//#define CONFIG_USBOTG USBOTG_M5636 - -/* Define this if you have adjustable CPU frequency */ -#define HAVE_ADJUSTABLE_CPU_FREQ - -#define BOOTFILE_EXT "meizu" -#define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/.rockbox" - -#define BOOTLOADER_ENTRYPOINT 0x001F0000 -#define FLASH_ENTRYPOINT 0x00001000 -#define FLASH_MAGIC 0xfbfbfbf1 - -#endif /* SIMULATOR */ - -/* Define this for FM radio input available */ -#define HAVE_FMRADIO_IN - -/** Port-specific settings **/ - -/* Main LCD contrast range and defaults */ -#define MIN_CONTRAST_SETTING 1 -#define MAX_CONTRAST_SETTING 30 -#define DEFAULT_CONTRAST_SETTING 19 /* Match boot contrast */ - -/* Main LCD backlight brightness range and defaults */ -/* PCF50506 can output 0%-100% duty cycle but D305A expects %15-100%. */ -#define MIN_BRIGHTNESS_SETTING 1 /* 15/16 (93.75%) */ -#define MAX_BRIGHTNESS_SETTING 13 /* 3/16 (18.75%) */ -#define DEFAULT_BRIGHTNESS_SETTING 8 /* 8/16 (50.00%) = x5 boot default */ - Index: manual/plugins/snow.tex =================================================================== --- manual/plugins/snow.tex (revision 23773) +++ manual/plugins/snow.tex (working copy) @@ -3,7 +3,7 @@ This demo replicates snow falling on your screen. If you love winter, you will love this demo. Or maybe not. % -\opt{player}{Press \ButtonStop\ to quit.}% +\opt{archosplayer}{Press \ButtonStop\ to quit.}% \opt{RECORDER_PAD,ONDIO_PAD,IRIVER_H100_PAD,IRVER_H300_PAD}{Press \ButtonOff\ to quit.}% \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Press \ButtonMenu\ to quit.}% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD}% Index: manual/plugins/mandelbrot.tex =================================================================== --- manual/plugins/mandelbrot.tex (revision 23773) +++ manual/plugins/mandelbrot.tex (working copy) @@ -1,7 +1,7 @@ \subsection{Mandelbrot} \screenshot{plugins/images/ss-mandelbrot}{Mandelbrot}{img:mandelbrot} This demonstration draws fractal images from the Mandelbrot set -\opt{archos,h100}{using the greyscale engine}. +\opt{archos,iriverh100}{using the greyscale engine}. \begin{table} \begin{btnmap}{}{} Direction keys Index: manual/plugins/rockboy.tex =================================================================== --- manual/plugins/rockboy.tex (revision 23773) +++ manual/plugins/rockboy.tex (working copy) @@ -64,7 +64,7 @@ & Select\\ % } - \opt{RECORDER_PAD,IRIVER_H100_PAD,m5}{ + \opt{RECORDER_PAD,IRIVER_H100_PAD,iaudiom5}{ \opt{RECORDER_PAD}{\ButtonOn} \opt{IRIVER_H100_PAD,IAUDIO_X5_PAD}{\ButtonHold{} switch} \opt{HAVEREMOTEKEYMAP}{& } @@ -100,7 +100,7 @@ Chose whether the original aspect ratio should be kept when scaling the picture to the screen% % targets with bigger displays than the original gameboy - \opt{gigabeat,h300,ipodcolor,ipodvideo,e200}{ + \opt{gigabeat,iriverh300,ipodcolor,ipodvideo,sansae200}{ or whether it should be displayed unscaled% }. \item[Screen Rotate.] Index: manual/plugins/main.tex =================================================================== --- manual/plugins/main.tex (revision 23773) +++ manual/plugins/main.tex (working copy) @@ -16,7 +16,7 @@ \section{Games} \opt{lcd_bitmap} {See also the Chip{}-8 emulator in \reference{ref:Chip8emulator} - \opt{recorder,recorderv2fm,h100,m5,lcd_color} + \opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color} {and Rockboy in \reference{ref:Rockboy}}.} \opt{lcd_bitmap}{\input{plugins/blackjack.tex}} @@ -39,7 +39,7 @@ \opt{lcd_bitmap}{\input{plugins/goban.tex}} -\opt{lcd_non-mono}{\nopt{h10_5gb,ipodmini,c200}{ +\opt{lcd_non-mono}{\nopt{iriverh10_5gb,ipodmini1g,sansac200}{ \input{plugins/invadrox.tex}}} {\input{plugins/jackpot.tex}} @@ -50,9 +50,9 @@ \opt{lcd_bitmap}{\input{plugins/minesweeper.tex}} -\opt{player}{\input{plugins/nim.tex}} +\opt{archosplayer}{\input{plugins/nim.tex}} -\opt{h100,m5,lcd_color}{\nopt{c200}{\input{plugins/pacbox.tex}}} +\opt{iriverh100,iaudiom5,lcd_color}{\nopt{sansac200}{\input{plugins/pacbox.tex}}} \opt{lcd_bitmap}{\input{plugins/pegbox.tex}} @@ -133,7 +133,7 @@ \opt{swcodec}{\input{plugins/midiplay.tex}} -\opt{recorder,recorderv2fm,ondio}{\input{plugins/movieplayer.tex}} +\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/movieplayer.tex}} \opt{lcd_bitmap}{\opt{swcodec}{\input{plugins/mpegplayer.tex}}} @@ -141,9 +141,9 @@ \opt{lcd_color}{\input{plugins/ppmviewer.tex}} -\opt{recorder,recorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}} +\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/rockbox_flash.tex}} -\opt{recorder,recorderv2fm,h100,m5,lcd_color}{\input{plugins/rockboy.tex}} +\opt{archosrecorder,archosrecorderv2fm,iriverh100,iaudiom5,lcd_color}{\input{plugins/rockboy.tex}} {\input{plugins/search.tex}} @@ -153,13 +153,13 @@ {\input{plugins/vbrfix.tex}} -\opt{recorder,recorderv2fm,ondio}{\input{plugins/wavplay.tex}} +\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/wavplay.tex}} \opt{lcd_bitmap}{\input{plugins/zxbox.tex}} \section{Applications} -\opt{player,recorder,recorderv2fm}{\input{plugins/alpinecdc.tex}} +\opt{archosplayer,archosrecorder,archosrecorderv2fm}{\input{plugins/alpinecdc.tex}} {\input{plugins/batterybenchmark.tex}} @@ -173,9 +173,9 @@ {\input{plugins/disktidy.tex}} -\opt{player}{\input{plugins/euro_converter.tex}} +\opt{archosplayer}{\input{plugins/euro_converter.tex}} -\opt{recorder,recorderv2fm,ondio}{\input{plugins/firmware_flash.tex}} +\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/firmware_flash.tex}} {\input{plugins/keybox.tex}} @@ -191,7 +191,7 @@ \opt{lcd_color}{\input{plugins/rockpaint.tex}} -\opt{recorder,recorderv2fm,ondio}{\input{plugins/split_editor.tex}} +\opt{archosrecorder,archosrecorderv2fm,ondio}{\input{plugins/split_editor.tex}} {\input{plugins/stats.tex}} Index: manual/plugins/stats.tex =================================================================== --- manual/plugins/stats.tex (revision 23773) +++ manual/plugins/stats.tex (working copy) @@ -2,7 +2,7 @@ \screenshot{plugins/images/ss-stats}{The stats-plugin}{} The stats-plugin simply counts the number of files% -\nopt{player}{, music files }% +\nopt{archosplayer}{, music files }% and directories on your \dap. Press % \opt{PLAYER_PAD}{\ButtonStop}% Index: manual/plugins/pacbox.tex =================================================================== --- manual/plugins/pacbox.tex (revision 23773) +++ manual/plugins/pacbox.tex (working copy) @@ -29,27 +29,27 @@ \begin{table} \begin{btnmap}{}{} \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,% - IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight} + IPOD_3G_PAD,iriverh10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonRight} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonUp} - \opt{h10_5gb}{\ButtonScrollUp} + \opt{iriverh10_5gb}{\ButtonScrollUp} \opt{HAVEREMOTEKEYMAP}{& } & Move Up\\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,IPOD_4G_PAD,% - IPOD_3G_PAD,h10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft} - \opt{h10_5gb}{\ButtonScrollDown} + IPOD_3G_PAD,iriverh10,SANSA_E200_PAD,MROBE100_PAD}{\ButtonLeft} + \opt{iriverh10_5gb}{\ButtonScrollDown} \opt{GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonDown} \opt{HAVEREMOTEKEYMAP}{& } & Move Down\\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonUp} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonMenu} - \opt{h10}{\ButtonScrollUp} - \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft} + \opt{iriverh10}{\ButtonScrollUp} + \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonLeft} \opt{HAVEREMOTEKEYMAP}{& } & Move Left\\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD,SANSA_E200_PAD,MROBE100_PAD}{\ButtonDown} \opt{IPOD_4G_PAD,IPOD_3G_PAD}{\ButtonPlay} - \opt{h10}{\ButtonScrollDown} - \opt{h10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight} + \opt{iriverh10}{\ButtonScrollDown} + \opt{iriverh10_5gb,GIGABEAT_PAD,GIGABEAT_S_PAD}{\ButtonRight} \opt{HAVEREMOTEKEYMAP}{& } & Move Right\\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD,IAUDIO_X5_PAD}{\ButtonRec} Index: manual/plugins/midiplay.tex =================================================================== --- manual/plugins/midiplay.tex (revision 23773) +++ manual/plugins/midiplay.tex (working copy) @@ -9,7 +9,7 @@ select a MIDI file with either the \fname{.mid} or \fname{.midi} extension in the file browser to start playback. % portalplayer targets -\opt{ipod,sansa,h10,h10_5gb,mrobe100}{ +\opt{ipod,sansa,iriverh10,iriverh10_5gb,mrobe100}{ \note{Currently playing MIDI files is still in its early stages and you might experience ``Buffer miss!'' with many files, except simple ones.} } Index: manual/plugins/chessbox.tex =================================================================== --- manual/plugins/chessbox.tex (revision 23773) +++ manual/plugins/chessbox.tex (working copy) @@ -23,7 +23,7 @@ saved, save the current position and start a new game without having to quit the game. -\opt{recorder,recorderv2fm,ondio}{ +\opt{archosrecorder,archosrecorderv2fm,ondio}{ \note{This plugin will stop playback.} } Index: manual/platform/keymap-h100_h300.tex =================================================================== --- manual/platform/keymap-h100_h300.tex (revision 23734) +++ manual/platform/keymap-h100_h300.tex (working copy) @@ -1,109 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonUp}{\btnfnt{Up}} -\newcommand{\ButtonDown}{\btnfnt{Down}} -\newcommand{\ButtonSelect}{\btnfnt{Navi}} -\newcommand{\ButtonMode}{\btnfnt{A-B}} -\newcommand{\ButtonRec}{\btnfnt{Rec}} -\newcommand{\ButtonOn}{\btnfnt{Play}} -\newcommand{\ButtonOff}{\btnfnt{Stop}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} -\newcommand{\ActionStdNext}{\ButtonDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} -\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonMode} -\newcommand{\ActionQuickScreenExit}{\ButtonMode} -\newcommand{\ActionStdMenu}{\ButtonMode} -\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdUsbCharge}{\ButtonMode} -\newcommand{\ActionStdRec}{Long \ButtonRec} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonOn} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonOn{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonOn{} + \ButtonLeft} -\newcommand{\ActionWpsStop}{\ButtonOff} -\newcommand{\ActionWpsVolDown}{\ButtonDown} -\newcommand{\ActionWpsVolUp}{\ButtonUp} -\newcommand{\ActionWpsPitchScreen}{\ButtonOn{} + \ButtonUp/\ButtonDown} -\newcommand{\ActionWpsQuickScreen}{Long \ButtonMode} -\newcommand{\ActionWpsMenu}{\ButtonMode} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsAbReset}{\ButtonOn{} + \ButtonSelect} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonOn{} + \ButtonMode} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonOn} -\newcommand{\ActionTreeStop}{\ButtonOff} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonUp} -\newcommand{\ActionSettingDec}{\ButtonDown} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft} -\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight} -\newcommand{\ActionKbdPageFlip}{\ButtonMode} -\newcommand{\ActionKbdDone}{\ButtonOn} -\newcommand{\ActionKbdAbort}{\ButtonOff} -\newcommand{\ActionKbdBackSpace}{\ButtonRec} -\newcommand{\ActionKbdMorseInput}{\ButtonOn{} + \ButtonMode} -\newcommand{\ActionKbdMorseSelect}{\ButtonSelect} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonMode} -\newcommand{\ActionPsIncSmall}{\ButtonUp} -\newcommand{\ActionPsIncBig}{Long \ButtonUp} -\newcommand{\ActionPsDecSmall}{\ButtonDown} -\newcommand{\ActionPsDecBig}{Long \ButtonDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonSelect} -\newcommand{\ActionPsExit}{\ButtonOn{} or \ButtonOff} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonOn} -\newcommand{\ActionRecNewfile}{\ButtonRec} -\newcommand{\ActionRecSettingsInc}{\ButtonRight} -\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonUp} -\newcommand{\ActionRecNext}{\ButtonDown} -\newcommand{\ActionRecMenu}{\ButtonMode} -\newcommand{\ActionRecExit}{\ButtonOff} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonSelect} -\newcommand{\ActionFMMenu}{Long \ButtonSelect} -\newcommand{\ActionFMMode}{Long \ButtonOn} -\newcommand{\ActionFMStop}{\ButtonOff} -\newcommand{\ActionFMExit}{\ButtonMode} -\newcommand{\ActionFMPlay}{\ButtonOn} -\newcommand{\ActionFMSettingsInc}{\ActionSettingInc} -\newcommand{\ActionFMSettingsDec}{\ActionSettingDec} -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{\ButtonRec} \ No newline at end of file Index: manual/platform/sansae200.tex =================================================================== --- manual/platform/sansae200.tex (revision 23773) +++ manual/platform/sansae200.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{e200} +\def\UseOption{sansae200} \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} \edef\UseOption{\UseOption,SANSA_E200_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} @@ -7,15 +7,15 @@ \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} \edef\UseOption{\UseOption,sansa} -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{e200 and e200R Series} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Sansa} +\newcommand{\archosplayertype}{sansae200 and e200R Series} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{176x220x16} -\newcommand{\specimg}{e200} +\newcommand{\specimg}{sansae200} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.mi4}} \newcommand{\firmwareextension}{\fname{mi4}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/x5.tex =================================================================== --- manual/platform/x5.tex (revision 23734) +++ manual/platform/x5.tex (working copy) @@ -1,26 +0,0 @@ -% $Id$ % -\def\UseOption{x5} -\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} -\edef\UseOption{\UseOption,IAUDIO_X5_PAD} -\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,iaudio} - -\newcommand{\playerman}{Iaudio} -\newcommand{\playertype}{X5} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{160x128x16} -\newcommand{\specimg}{x5} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} -\newcommand{\firmwareextension}{\fname{iaudio}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-mx5.tex} Index: manual/platform/keymap-fuze.tex =================================================================== --- manual/platform/keymap-fuze.tex (revision 23734) +++ manual/platform/keymap-fuze.tex (working copy) @@ -1,109 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonHome}{\btnfnt{Home}} -\newcommand{\ButtonUp}{\btnfnt{Play}} -\newcommand{\ButtonDown}{\btnfnt{Submenu}} -\newcommand{\ButtonSelect}{\btnfnt{Select}} -\newcommand{\ButtonPower}{\btnfnt{Power}} -\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}} -\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonScrollBack} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonScrollBack} -\newcommand{\ActionStdNext}{\ButtonScrollFwd} -\newcommand{\ActionStdNextRepeat}{Long \ButtonScrollFwd} -\newcommand{\ActionStdCancel}{\ButtonLeft} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonDown} -\newcommand{\ActionQuickScreenExit}{\ButtonSelect} -\newcommand{\ActionStdMenu}{\ButtonDown} -\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdUsbCharge}{\ButtonSelect} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonUp} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} - -\newcommand{\ActionWpsStop}{Long \ButtonHome} -\newcommand{\ActionWpsVolDown}{\ButtonScrollBack} -\newcommand{\ActionWpsVolUp}{\ButtonScrollFwd} - -\newcommand{\ActionWpsQuickScreen}{Long \ButtonDown} -\newcommand{\ActionWpsMenu}{\ButtonDown} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsPitchScreen}{\ButtonSelect{} + \ButtonUp} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown} - -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonHome{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonHome{} + \ButtonLeft} -\newcommand{\ActionWpsAbReset}{\ButtonHome{} + \ButtonUp} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonUp} -\newcommand{\ActionTreeStop}{\ButtonHome} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonScrollFwd} -\newcommand{\ActionSettingDec}{\ButtonScrollBack} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdDone}{\ButtonUp} -\newcommand{\ActionKbdAbort}{Long \ButtonHome} -\newcommand{\ActionKbdUp}{\ButtonScrollBack} -\newcommand{\ActionKbdDown}{\ButtonScrollFwd} -\newcommand{\ActionKbdCursorLeft}{\ButtonHome{} + \ButtonLeft} -\newcommand{\ActionKbdCursorRight}{\ButtonHome{} + \ButtonRight} -\newcommand{\ActionKbdBackSpace}{\ButtonDown} -\newcommand{\ActionKbdPageFlip}{\ButtonHome{} + \ButtonSelect} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonHome} -\newcommand{\ActionPsIncSmall}{\ButtonScrollFwd} -\newcommand{\ActionPsIncBig}{Long \ButtonScrollFwd} -\newcommand{\ActionPsDecSmall}{\ButtonScrollBack} -\newcommand{\ActionPsDecBig}{Long \ButtonScrollBack} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonSelect} -\newcommand{\ActionPsExit}{Long \ButtonHome{} or \ButtonUp} - -%Button actions, Recording screen context -%\newcommand{\ActionRecPause}{\ButtonUp} -%\newcommand{\ActionRecExit}{\ButtonDown} -%\newcommand{\ActionRecNewfile}{\ButtonHome} -%\newcommand{\ActionRecMenu}{Long \ButtonSelect} -%\newcommand{\ActionRecSettingsInc}{\ButtonRight} -%\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -%\newcommand{\ActionRecPrev}{\ButtonScrollBack} -%\newcommand{\ActionRecNext}{\ButtonScrollFwd} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonSelect} -\newcommand{\ActionFMMenu}{Long \ButtonSelect} -\newcommand{\ActionFMMode}{Long \ButtonUp} -\newcommand{\ActionFMStop}{Long \ButtonHome} -\newcommand{\ActionFMExit}{\ButtonDown} -\newcommand{\ActionFMPlay}{\ButtonUp} -\newcommand{\ActionFMSettingsInc}{\ButtonUp} %? -\newcommand{\ActionFMSettingsDec}{\ButtonDown} %? -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{\ButtonHome} Index: manual/platform/keymap-gigabeatf.tex =================================================================== --- manual/platform/keymap-gigabeatf.tex (revision 23734) +++ manual/platform/keymap-gigabeatf.tex (working copy) @@ -1,87 +0,0 @@ -% $Id$ - -\newcommand{\ButtonPower}{\btnfnt{Power}} -\newcommand{\ButtonMenu}{\btnfnt{Menu}} -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonUp}{\btnfnt{Up}} -\newcommand{\ButtonDown}{\btnfnt{Down}} -\newcommand{\ButtonVolUp}{\btnfnt{Volume up}} -\newcommand{\ButtonVolDown}{\btnfnt{Volume down}} -\newcommand{\ButtonSelect}{\btnfnt{Select}} -\newcommand{\ButtonA}{\btnfnt{A}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} -\newcommand{\ActionStdNext}{\ButtonDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} -\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonMenu} -\newcommand{\ActionQuickScreenExit}{\ButtonMenu} -\newcommand{\ActionStdMenu}{\ButtonMenu} -\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdUsbCharge}{\ButtonMenu} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonA} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonA{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonA{} + \ButtonLeft} -\newcommand{\ActionWpsStop}{\ButtonPower} -\newcommand{\ActionWpsVolDown}{\ButtonDown} -\newcommand{\ActionWpsVolUp}{\ButtonUp} -\newcommand{\ActionWpsPitchScreen}{\ButtonA{} + \ButtonUp/\ButtonDown} -\newcommand{\ActionWpsQuickScreen}{Long \ButtonMenu} -\newcommand{\ActionWpsMenu}{\ButtonMenu} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsAbReset}{\ButtonA{} + \ButtonSelect} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonA{} + \ButtonMenu} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonA} -\newcommand{\ActionTreeStop}{\ButtonPower} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonUp} -\newcommand{\ActionSettingDec}{\ButtonDown} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdCursorLeft}{\ButtonA{} + \ButtonLeft} -\newcommand{\ActionKbdCursorRight}{\ButtonA{} + \ButtonRight} -\newcommand{\ActionKbdPageFlip}{\ButtonA{} + \ButtonMenu} -\newcommand{\ActionKbdDone}{\ButtonA} -\newcommand{\ActionKbdAbort}{\ButtonPower} -\newcommand{\ActionKbdBackSpace}{\ButtonMenu} -\newcommand{\ActionKbdMorseInput}{\ButtonA{} + \ButtonPower} -\newcommand{\ActionKbdMorseSelect}{\ButtonSelect} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonMenu} -\newcommand{\ActionPsIncSmall}{\ButtonUp} -\newcommand{\ActionPsIncBig}{Long \ButtonUp} -\newcommand{\ActionPsDecSmall}{\ButtonDown} -\newcommand{\ActionPsDecBig}{Long \ButtonDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonA} -\newcommand{\ActionPsExit}{\ButtonPower} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{\ButtonA} \ No newline at end of file Index: manual/platform/archosrecorderv2fm.tex =================================================================== --- manual/platform/archosrecorderv2fm.tex (revision 23773) +++ manual/platform/archosrecorderv2fm.tex (working copy) @@ -1,24 +1,24 @@ % $Id$ % -\def\UseOption{recorderv2fm} +\def\UseOption{archosrecorderv2fm} \edef\UseOption{\UseOption,RECORDER_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,archos} -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Recorder V2/FM} -\newcommand{\playerlongtype}{Recorder V2 and FM} +\newcommand{\archosplayerman}{Archos} +\newcommand{\archosplayertype}{Recorder V2/FM} +\newcommand{\archosplayerlongtype}{Recorder V2 and FM} \newcommand{\genericimg}{112x64x1} -\newcommand{\specimg}{recorderv2fm} +\newcommand{\specimg}{archosrecorderv2fm} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} \newcommand{\firmwareextension}{\fname{ajz}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-recorder.tex} +\input{platform/keymap-archosrecorder.tex} Index: manual/platform/gigabeatfx.tex =================================================================== --- manual/platform/gigabeatfx.tex (revision 23773) +++ manual/platform/gigabeatfx.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{gigabeatf} +\def\UseOption{gigabeatfx} \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} \edef\UseOption{\UseOption,GIGABEAT_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} @@ -10,20 +10,20 @@ \edef\UseOption{\UseOption,GIGABEAT_RC_PAD} \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} -\newcommand{\playerman}{Toshiba} -\newcommand{\playertype}{Gigabeat F and X Series} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Toshiba} +\newcommand{\archosplayertype}{Gigabeat F and X Series} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{240x320x16} -\newcommand{\specimg}{gigabeatf} +\newcommand{\specimg}{gigabeatfx} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}} \newcommand{\firmwareextension}{\fname{gigabeat}} \newcommand{\screenshotsize}{6cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-gigabeatf.tex} +\input{platform/keymap-gigabeatfx.tex} \input{platform/remote-keymap-gigabeat.tex} Index: manual/platform/archosrecorder.tex =================================================================== --- manual/platform/archosrecorder.tex (revision 23773) +++ manual/platform/archosrecorder.tex (working copy) @@ -1,25 +1,25 @@ % $Id$ % -\def\UseOption{recorder} +\def\UseOption{archosrecorder} \edef\UseOption{\UseOption,RECORDER_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,archos} -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Recorder} -\newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20} +\newcommand{\archosplayerman}{Archos} +\newcommand{\archosplayertype}{Recorder} +\newcommand{\archosplayerlongtype}{Recorder 6, 10, 15 and 20} \newcommand{\genericimg}{112x64x1} -\newcommand{\specimg}{recorder} +\newcommand{\specimg}{archosrecorder} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} \newcommand{\firmwareextension}{\fname{ajz}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-recorder.tex} +\input{platform/keymap-archosrecorder.tex} Index: manual/platform/h100.tex =================================================================== --- manual/platform/h100.tex (revision 23734) +++ manual/platform/h100.tex (working copy) @@ -1,30 +0,0 @@ -% $Id$ % -\def\UseOption{h100} -\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} -\edef\UseOption{\UseOption,IRIVER_H100_PAD} -\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,iriver} -\edef\UseOption{\UseOption,IRIVER_RC_H100_PAD} -\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} - -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H100} -\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140} -\newcommand{\genericimg}{160x128x2} -\newcommand{\specimg}{h100} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.iriver}} -\newcommand{\firmwareextension}{\fname{iriver}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-h100_h300.tex} -\input{platform/remote-keymap-h100.tex} - Index: manual/platform/h300.tex =================================================================== --- manual/platform/h300.tex (revision 23734) +++ manual/platform/h300.tex (working copy) @@ -1,27 +0,0 @@ -% $Id$ % -\def\UseOption{h300} -\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} -\edef\UseOption{\UseOption,IRIVER_H300_PAD} -\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,iriver} - -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H3xx} -\newcommand{\playerlongtype}{H320 and H340} -\newcommand{\genericimg}{220x176x16} -\newcommand{\specimg}{h300} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.iriver}} -\newcommand{\firmwareextension}{\fname{iriver}} -\newcommand{\screenshotsize}{6cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-h100_h300.tex} - Index: manual/platform/sansaclip.tex =================================================================== --- manual/platform/sansaclip.tex (revision 23773) +++ manual/platform/sansaclip.tex (working copy) @@ -1,20 +1,20 @@ % Id: % -\def\UseOption{clip} +\def\UseOption{sansaclip} \edef\UseOption{\UseOption,SANSA_CLIP_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} \edef\UseOption{\UseOption,sansaAMS} -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{Clip} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Sansa} +\newcommand{\archosplayertype}{Clip} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{128x64x1-clip} -\newcommand{\specimg}{clip} +\newcommand{\specimg}{sansaclip} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.sansa}} \newcommand{\firmwareextension}{\fname{sansa}} \newcommand{\screenshotsize}{3cm} Index: manual/platform/m3.tex =================================================================== --- manual/platform/m3.tex (revision 23734) +++ manual/platform/m3.tex (working copy) @@ -1,26 +0,0 @@ -% $Id$ % -\def\UseOption{m3} -\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} -\edef\UseOption{\UseOption,IAUDIO_M3_PAD} -\edef\UseOption{\UseOption,IAUDIO_RC_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,iaudio} -\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} - -\newcommand{\playerman}{Iaudio} -\newcommand{\playertype}{M3} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{128x96x2} -\newcommand{\specimg}{m3} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap files -\input{platform/keymap-m3.tex} -\input{platform/remote-keymap-iaudio.tex} Index: manual/platform/m5.tex =================================================================== --- manual/platform/m5.tex (revision 23734) +++ manual/platform/m5.tex (working copy) @@ -1,26 +0,0 @@ -% $Id$ % -\def\UseOption{m5} -\edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} -\edef\UseOption{\UseOption,IAUDIO_X5_PAD} -\edef\UseOption{\UseOption,HAVE_REMOTE_LCD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,iaudio} - -\newcommand{\playerman}{Iaudio} -\newcommand{\playertype}{M5} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{160x128x2} -\newcommand{\specimg}{m5} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} -\newcommand{\firmwareextension}{\fname{iaudio}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link to external keymap file -\input{platform/keymap-mx5.tex} Index: manual/platform/keymap-c200.tex =================================================================== --- manual/platform/keymap-c200.tex (revision 23734) +++ manual/platform/keymap-c200.tex (working copy) @@ -1,109 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonRec}{\btnfnt{Rec}} -\newcommand{\ButtonUp}{\btnfnt{Play}} -\newcommand{\ButtonDown}{\btnfnt{Submenu}} -\newcommand{\ButtonSelect}{\btnfnt{Select}} -\newcommand{\ButtonPower}{\btnfnt{Power}} -\newcommand{\ButtonVolUp}{\btnfnt{Volume Up}} -\newcommand{\ButtonVolDown}{\btnfnt{Volume Down}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonDown} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonDown} -\newcommand{\ActionStdNext}{\ButtonUp} -\newcommand{\ActionStdNextRepeat}{Long \ButtonUp} -\newcommand{\ActionStdCancel}{\ButtonLeft} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonDown} -\newcommand{\ActionQuickScreenExit}{\ButtonPower} -\newcommand{\ActionStdMenu}{\ButtonPower} -\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdRec}{Long \ButtonRec} -\newcommand{\ActionStdUsbCharge}{\ButtonSelect} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonUp} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} -\newcommand{\ActionWpsStop}{Long \ButtonUp} -\newcommand{\ActionWpsVolDown}{\ButtonVolDown} -\newcommand{\ActionWpsVolUp}{\ButtonVolUp} -\newcommand{\ActionWpsQuickScreen}{\ButtonDown} -\newcommand{\ActionWpsMenu}{\ButtonPower} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsPitchScreen}{\ButtonSelect{} + \ButtonUp} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown} -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft} -\newcommand{\ActionWpsAbReset}{\ButtonPower{} + \ButtonUp} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{Long \ButtonRight} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonUp} -\newcommand{\ActionSettingDec}{\ButtonDown} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdDone}{Long \ButtonSelect} -\newcommand{\ActionKbdAbort}{\ButtonPower} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} -\newcommand{\ActionKbdCursorLeft}{\ButtonVolDown} -\newcommand{\ActionKbdCursorRight}{\ButtonVolUp} -\newcommand{\ActionKbdBackSpace}{\ButtonRec} -\newcommand{\ActionKbdPageFlip}{\ButtonSelect{} + \ButtonLeft{} / \ButtonRight} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonRec} -\newcommand{\ActionPsIncSmall}{\ButtonUp} -\newcommand{\ActionPsIncBig}{Long \ButtonUp} -\newcommand{\ActionPsDecSmall}{\ButtonDown} -\newcommand{\ActionPsDecBig}{Long \ButtonDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonSelect} -\newcommand{\ActionPsExit}{\ButtonPower} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonSelect} -\newcommand{\ActionRecExit}{Long \ButtonPower} -\newcommand{\ActionRecNewfile}{\ButtonRec} -\newcommand{\ActionRecMenu}{\ButtonPower} -\newcommand{\ActionRecSettingsInc}{\ButtonRight} -\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonDown} -\newcommand{\ActionRecNext}{\ButtonUp} - -\newcommand{\ActionQuickscreenExit}{\ButtonPower} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonSelect} -\newcommand{\ActionFMMenu}{\ButtonDown} -\newcommand{\ActionFMMode}{\ButtonRec} -\newcommand{\ActionFMStop}{Long \ButtonUp} -\newcommand{\ActionFMExit}{\ButtonPower} -\newcommand{\ActionFMPlay}{\ButtonUp} -\newcommand{\ActionFMSettingsInc}{\ButtonVolUp} -\newcommand{\ActionFMSettingsDec}{\ButtonVolDown} -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{\ButtonRec} - Index: manual/platform/keymap-recorder.tex =================================================================== --- manual/platform/keymap-recorder.tex (revision 23734) +++ manual/platform/keymap-recorder.tex (working copy) @@ -1,112 +0,0 @@ -% $Id$ - -\newcommand{\ButtonOn}{\btnfnt{On}} -\newcommand{\ButtonOff}{\btnfnt{Off}} -\newcommand{\ButtonPlay}{\btnfnt{Play}} -\newcommand{\ButtonUp}{\btnfnt{Up}} -\newcommand{\ButtonDown}{\btnfnt{Down}} -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonFOne}{\btnfnt{F1}} -\newcommand{\ButtonFTwo}{\btnfnt{F2}} -\newcommand{\ButtonFThree}{\btnfnt{F3}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} -\newcommand{\ActionStdNext}{\ButtonDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} -\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonOff} -\newcommand{\ActionStdContext}{Long \ButtonPlay} -\newcommand{\ActionStdQuickScreen}{\ButtonFTwo} -\newcommand{\ActionQuickScreenExit}{\ButtonPlay} -\newcommand{\ActionStdMenu}{\ButtonFOne} -\newcommand{\ActionStdOk}{\ButtonRight{} or \ButtonOn} -\newcommand{\ActionStdUsbCharge}{\ButtonFOne} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonPlay} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} -\newcommand{\ActionWpsStop}{\ButtonOff} -\newcommand{\ActionWpsVolDown}{\ButtonDown} -\newcommand{\ActionWpsVolUp}{\ButtonUp} -\newcommand{\ActionWpsPitchScreen}{\ButtonOn{} + \ButtonUp/\ButtonDown} -\newcommand{\ActionWpsQuickScreen}{\ButtonFTwo} -\newcommand{\ActionWpsMenu}{\ButtonFOne} -\newcommand{\ActionWpsContext}{Long \ButtonPlay} -\newcommand{\ActionWpsBrowse}{\ButtonOn} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonFOne{} + \ButtonOn} - -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonOn{} + \ButtonLeft} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonOn{} + \ButtonRight} -\newcommand{\ActionWpsAbReset}{\ButtonOn{} + \ButtonOff} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonOn} -\newcommand{\ActionTreeStop}{\ButtonOff} -\newcommand{\ActionTreeEnter}{\ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonPlay} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonUp} -\newcommand{\ActionSettingDec}{\ButtonDown} - -%Button actions, Alarm screen -\newcommand{\ActionAlarmSet}{\ButtonPlay} -\newcommand{\ActionAlarmCancel}{\ButtonOff} -\newcommand{\ActionAlarmHoursInc}{\ButtonRight} -\newcommand{\ActionAlarmHoursDec}{\ButtonLeft} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonPlay} -\newcommand{\ActionKbdCursorLeft}{\ButtonOn{} + \ButtonLeft} -\newcommand{\ActionKbdCursorRight}{\ButtonOn{} + \ButtonRight} -\newcommand{\ActionKbdPageFlip}{\ButtonFOne} -\newcommand{\ActionKbdDone}{\ButtonFTwo} -\newcommand{\ActionKbdAbort}{\ButtonOff} -\newcommand{\ActionKbdBackSpace}{\ButtonFThree} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonFOne} -\newcommand{\ActionPsIncSmall}{\ButtonUp} -\newcommand{\ActionPsIncBig}{Long \ButtonUp} -\newcommand{\ActionPsDecSmall}{\ButtonDown} -\newcommand{\ActionPsDecBig}{Long \ButtonDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonOn} -\newcommand{\ActionPsExit}{\ButtonOff} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonPlay} -\newcommand{\ActionRecFTwo}{\ButtonFTwo} -\newcommand{\ActionRecFThree}{\ButtonFThree} -\newcommand{\ActionRecSettingsInc}{\ButtonRight} -\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonUp} -\newcommand{\ActionRecNext}{\ButtonDown} -\newcommand{\ActionRecMenu}{\ButtonFOne} -\newcommand{\ActionRecExit}{\ButtonOff} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonFTwo} -\newcommand{\ActionFMMenu}{\ButtonFOne} -\newcommand{\ActionFMMode}{Long \ButtonOn} -\newcommand{\ActionFMStop}{\ButtonOff} -\newcommand{\ActionFMExit}{\ButtonOn} -\newcommand{\ActionFMSettingsInc}{\ButtonUp} -\newcommand{\ActionFMSettingsDec}{\ButtonDown} -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - -\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay} \ No newline at end of file Index: manual/platform/ondiofm.tex =================================================================== --- manual/platform/ondiofm.tex (revision 23734) +++ manual/platform/ondiofm.tex (working copy) @@ -1,24 +0,0 @@ -% $Id$ % -%platform file for the Ondio FM -\def\UseOption{ondiofm} -% To not break the current manual -\edef\UseOption{\UseOption,ondio} -\edef\UseOption{\UseOption,ONDIO_PAD} -\edef\UseOption{\UseOption,archos} - -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Ondio} -\newcommand{\playerlongtype}{Ondio 128 FM} -\newcommand{\genericimg}{112x64x1} -\newcommand{\specimg}{ondiofm} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} -\newcommand{\firmwareextension}{\fname{ajz}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{flash storage} - -% link external keymap file -\input{platform/keymap-ondio.tex} Index: manual/platform/player.tex =================================================================== --- manual/platform/player.tex (revision 23734) +++ manual/platform/player.tex (working copy) @@ -1,25 +0,0 @@ -% $Id$ % -\def\UseOption{player} -\edef\UseOption{\UseOption,PLAYER_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,archos} -\edef\UseOption{\UseOption,rombox} - -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Studio/Player} -\newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20} -\newcommand{\genericimg}{charx11x1} -\newcommand{\specimg}{player} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{archos.mod}} -\newcommand{\firmwareextension}{\fname{mod}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-player.tex} Index: manual/platform/sansafuze.tex =================================================================== --- manual/platform/sansafuze.tex (revision 23773) +++ manual/platform/sansafuze.tex (working copy) @@ -1,20 +1,20 @@ % $Id$ % -\def\UseOption{fuze} +\def\UseOption{sansafuze} \edef\UseOption{\UseOption,SANSA_FUZE_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} \edef\UseOption{\UseOption,sansaAMS} -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{Fuze} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Sansa} +\newcommand{\archosplayertype}{Fuze} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{220x176x16} -\newcommand{\specimg}{fuze} +\newcommand{\specimg}{sansafuze} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.sansa}} \newcommand{\firmwareextension}{\fname{sansa}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/e200.tex =================================================================== --- manual/platform/e200.tex (revision 23734) +++ manual/platform/e200.tex (working copy) @@ -1,25 +0,0 @@ -% $Id$ % -\def\UseOption{e200} -\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} -\edef\UseOption{\UseOption,SANSA_E200_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} -\edef\UseOption{\UseOption,sansa} - -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{e200 and e200R Series} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{176x220x16} -\newcommand{\specimg}{e200} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} -\newcommand{\firmwareextension}{\fname{mi4}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{flash storage} - -% link external keymap file -\input{platform/keymap-e200.tex} Index: manual/platform/ipodnano.tex =================================================================== --- manual/platform/ipodnano.tex (revision 23734) +++ manual/platform/ipodnano.tex (working copy) @@ -1,23 +0,0 @@ -% $Id$ % -\def\UseOption{ipodnano} -\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} -\edef\UseOption{\UseOption,IPOD_4G_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,ipod} - -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{Nano} -\newcommand{\playerlongtype}{\playertype{} 1st generation} -\newcommand{\genericimg}{176x132x16} -\newcommand{\specimg}{ipodnano} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} -\newcommand{\firmwareextension}{\fname{ipod}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{flash storage} - -% link external keymap file -\input{platform/keymap-ipod4g.tex} Index: manual/platform/remote-keymap-h100.tex =================================================================== --- manual/platform/remote-keymap-h100.tex (revision 23734) +++ manual/platform/remote-keymap-h100.tex (working copy) @@ -1,110 +0,0 @@ - -\newcommand{\ButtonRCRew}{\btnfnt{Rewind}} -\newcommand{\ButtonRCFF}{\btnfnt{Forward}} -\newcommand{\ButtonRCVolUp}{\btnfnt{Volume Up}} -\newcommand{\ButtonRCVolDown}{\btnfnt{Volume Down}} -\newcommand{\ButtonRCSource}{\btnfnt{Source}} -\newcommand{\ButtonRCBitrate}{\btnfnt{Bitrate}} -\newcommand{\ButtonRCSelect}{\btnfnt{Navi}} -\newcommand{\ButtonRCRec}{\btnfnt{Rec}} -\newcommand{\ButtonRCMode}{\btnfnt{A-B}} -\newcommand{\ButtonRCOn}{\btnfnt{Play}} -\newcommand{\ButtonRCStop}{\btnfnt{Stop}} -\newcommand{\ButtonRCHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionRCStdPrev}{\ButtonRCRew} -\newcommand{\ActionRCStdPrevRepeat}{Long \ButtonRCRew} -\newcommand{\ActionRCStdNext}{\ButtonRCFF} -\newcommand{\ActionRCStdNextRepeat}{Long \ButtonRCFF} -\newcommand{\ActionRCStdCancel}{\ButtonRCStop} -\newcommand{\ActionRCStdContext}{Long \ButtonRCSelect} -\newcommand{\ActionRCStdQuickScreen}{Long \ButtonRCMode} -\newcommand{\ActionRCQuickScreenExit}{\ButtonRCMode} -\newcommand{\ActionRCStdMenu}{\ButtonRCMode} -\newcommand{\ActionRCStdOk}{\ButtonRCSelect} - -%Button actions, wps context -\newcommand{\ActionRCWpsPlay}{\ButtonRCOn} -\newcommand{\ActionRCWpsSkipNext}{\ButtonRCFF} -\newcommand{\ActionRCWpsSkipPrev}{\ButtonRCRew} -\newcommand{\ActionRCWpsSeekBack}{Long \ButtonRCFF} -\newcommand{\ActionRCWpsSeekFwd}{Long \ButtonRCRew} -\newcommand{\ActionRCWpsAbSetBNextDir}{\ButtonRCBitrate} -\newcommand{\ActionRCWpsAbSetAPrevDir}{\ButtonRCSource} -\newcommand{\ActionRCWpsStop}{\ButtonRCStop} -\newcommand{\ActionRCWpsVolDown}{\ButtonRCVolDown} -\newcommand{\ActionRCWpsVolUp}{\ButtonRCVolUp} -\newcommand{\ActionRCWpsPitchScreen}{Long \ButtonRCOn} -\newcommand{\ActionRCWpsQuickScreen}{Long \ButtonRCMode} -\newcommand{\ActionRCWpsMenu}{\ButtonRCMode} -\newcommand{\ActionRCWpsContext}{Long \ButtonRCSelect} -\newcommand{\ActionRCWpsBrowse}{\ButtonRCSelect} -\newcommand{\ActionRCWpsAbReset}{\ButtonRCOn{} + \ButtonRCSelect} -\newcommand{\ActionRCWpsIdThreeScreen}{\ButtonRCOn{} + \ButtonRCMode} - -%Button actions, tree context -\newcommand{\ActionRCTreeWps}{\ButtonRCOn} -\newcommand{\ActionRCTreeStop}{\ButtonRCStop} -\newcommand{\ActionRCTreeEnter}{\ButtonRCSelect} -\newcommand{\ActionRCTreeParentDirectory}{\ButtonRCStop} - -%Button actions, YesNo context -\newcommand{\ActionRCYesNoAccept}{\ButtonRCSelect} - -%Button actions, Setting context -\newcommand{\ActionRCSettingInc}{\ButtonRCRew} -\newcommand{\ActionRCSettingDec}{\ButtonRCFF} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionRCKbdLeft}{\ButtonRCRew} -\newcommand{\ActionRCKbdRight}{\ButtonRCFF} -\newcommand{\ActionRCKbdSelect}{\ButtonRCSelect} -\newcommand{\ActionRCKbdCursorLeft}{\ButtonRCOn{} + \ButtonRCRew{} or \ButtonRCVolDown} -\newcommand{\ActionRCKbdCursorRight}{\ButtonRCOn{} + \ButtonRCFF{} or \ButtonRCVolUp} -\newcommand{\ActionRCKbdPageFlip}{\ButtonRCMode} -\newcommand{\ActionRCKbdDone}{\ButtonRCOn} -\newcommand{\ActionRCKbdAbort}{\ButtonRCStop} -\newcommand{\ActionRCKbdBackSpace}{\ButtonRCRec} -\newcommand{\ActionRCKbdMorseInput}{\ButtonRCOn{} + \ButtonRCMode} -\newcommand{\ActionRCKbdMorseSelect}{\ButtonRCSelect} -\newcommand{\ActionRCKbdUp}{\ButtonRCSource} -\newcommand{\ActionRCKbdDown}{\ButtonRCBitrate} - -%Button actions, Pitch Screen context -\newcommand{\ActionRCPsToggleMode}{\ButtonRCMode} -\newcommand{\ActionRCPsIncSmall}{\ButtonRCFF} -\newcommand{\ActionRCPsIncBig}{Long \ButtonRCFF} -\newcommand{\ActionRCPsDecSmall}{\ButtonRCRew} -\newcommand{\ActionRCPsDecBig}{Long \ButtonRCRew} -\newcommand{\ActionRCPsNudgeLeft}{\ButtonRCSource} -\newcommand{\ActionRCPsNudgeRight}{\ButtonRCBitratet} -\newcommand{\ActionRCPsReset}{\ButtonRCSelect} -\newcommand{\ActionRCPsExit}{\ButtonRCOn{} or \ButtonRCStop} - -%Button actions, Recording screen context -\newcommand{\ActionRCRecPause}{\ButtonRCOn} -\newcommand{\ActionRCRecNewfile}{\ButtonRCRec} -\newcommand{\ActionRCRecSettingsInc}{\ButtonRCBitrate} -\newcommand{\ActionRCRecSettingsDec}{\ButtonRCSource} -\newcommand{\ActionRCRecPrev}{\ButtonRCRew} -\newcommand{\ActionRCRecNext}{\ButtonRCFF} -\newcommand{\ActionRCRecMenu}{\ButtonRCMode} -\newcommand{\ActionRCRecExit}{\ButtonRCStop} - -%Button actions, FM radio context -\newcommand{\ActionRCFMPreset}{\ButtonRCSelect} -\newcommand{\ActionRCFMMenu}{Long \ButtonRCSelect} -\newcommand{\ActionRCFMMode}{Long \ButtonRCOn} -\newcommand{\ActionRCFMStop}{\ButtonRCStop} -\newcommand{\ActionRCFMExit}{\ButtonRCMode} -\newcommand{\ActionRCFMPlay}{\ButtonRCOn} -\newcommand{\ActionRCFMSettingsInc}{\ActionRCSettingInc} -\newcommand{\ActionRCFMSettingsDec}{\ActionRCSettingInc} -\newcommand{\ActionRCFMPrev}{\ButtonRCRew} -\newcommand{\ActionRCFMNext}{\ButtonRCFF} -\newcommand{\ActionRCFMVolUp}{\ButtonRCVolUp} -\newcommand{\ActionRCFMVolDown}{\ButtonRCVolDown} - -%Button actions, Bookmark screen context -\newcommand{\ActionRCBmDelete}{\ButtonRCRec} \ No newline at end of file Index: manual/platform/ipod3g.tex =================================================================== --- manual/platform/ipod3g.tex (revision 23773) +++ manual/platform/ipod3g.tex (working copy) @@ -6,15 +6,15 @@ \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,ipod} -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{3G} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Ipod} +\newcommand{\archosplayertype}{3G} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{160x128x2} \newcommand{\specimg}{ipod3g} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.ipod}} \newcommand{\firmwareextension}{\fname{ipod}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/clip.tex =================================================================== --- manual/platform/clip.tex (revision 23734) +++ manual/platform/clip.tex (working copy) @@ -1,24 +0,0 @@ -% Id: % -\def\UseOption{clip} -\edef\UseOption{\UseOption,SANSA_CLIP_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} -\edef\UseOption{\UseOption,sansaAMS} - -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{Clip} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{128x64x1-clip} -\newcommand{\specimg}{clip} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.sansa}} -\newcommand{\firmwareextension}{\fname{sansa}} -\newcommand{\screenshotsize}{3cm} -\newcommand{\disk}{flash storage} - -% link external keymap file -\input{platform/keymap-clip.tex} Index: manual/platform/h10.tex =================================================================== --- manual/platform/h10.tex (revision 23734) +++ manual/platform/h10.tex (working copy) @@ -1,25 +0,0 @@ -% $Id$ % -\def\UseOption{h10} -\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} -\edef\UseOption{\UseOption,IRIVER_H10_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,iriver} - -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H10} -\newcommand{\playerlongtype}{\playertype{} 20GB} -\newcommand{\genericimg}{160x128x16} -\newcommand{\specimg}{h10} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} -\newcommand{\firmwareextension}{\fname{mi4}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-h10.tex} Index: manual/platform/iriverh100.tex =================================================================== --- manual/platform/iriverh100.tex (revision 23773) +++ manual/platform/iriverh100.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{h100} +\def\UseOption{iriverh100} \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} \edef\UseOption{\UseOption,IRIVER_H100_PAD} \edef\UseOption{\UseOption,HAVE_REMOTE_LCD} @@ -10,21 +10,21 @@ \edef\UseOption{\UseOption,IRIVER_RC_H100_PAD} \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H100} -\newcommand{\playerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140} +\newcommand{\archosplayerman}{Iriver} +\newcommand{\archosplayertype}{H100} +\newcommand{\archosplayerlongtype}{iHP100, iHP115, iHP120, iHP140, H120 and H140} \newcommand{\genericimg}{160x128x2} -\newcommand{\specimg}{h100} +\newcommand{\specimg}{iriverh100} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.iriver}} \newcommand{\firmwareextension}{\fname{iriver}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-h100_h300.tex} -\input{platform/remote-keymap-h100.tex} +\input{platform/keymap-iriverh100_h300.tex} +\input{platform/remote-keymap-iriverh100.tex} Index: manual/platform/sansac200.tex =================================================================== --- manual/platform/sansac200.tex (revision 23773) +++ manual/platform/sansac200.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{c200} +\def\UseOption{sansac200} \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} \edef\UseOption{\UseOption,SANSA_C200_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} @@ -7,15 +7,15 @@ \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} \edef\UseOption{\UseOption,sansa} -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{c200 Series} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Sansa} +\newcommand{\archosplayertype}{sansac200 Series} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{132x80x16} -\newcommand{\specimg}{c200} +\newcommand{\specimg}{sansac200} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.mi4}} \newcommand{\firmwareextension}{\fname{mi4}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/archosondiofm.tex =================================================================== --- manual/platform/archosondiofm.tex (revision 23773) +++ manual/platform/archosondiofm.tex (working copy) @@ -1,24 +1,24 @@ % $Id$ % %platform file for the Ondio FM -\def\UseOption{ondiofm} +\def\UseOption{archosondiofm} % To not break the current manual \edef\UseOption{\UseOption,ondio} \edef\UseOption{\UseOption,ONDIO_PAD} \edef\UseOption{\UseOption,archos} -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Ondio} -\newcommand{\playerlongtype}{Ondio 128 FM} +\newcommand{\archosplayerman}{Archos} +\newcommand{\archosplayertype}{Ondio} +\newcommand{\archosplayerlongtype}{Ondio 128 FM} \newcommand{\genericimg}{112x64x1} -\newcommand{\specimg}{ondiofm} +\newcommand{\specimg}{archosondiofm} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} \newcommand{\firmwareextension}{\fname{ajz}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{flash storage} % link external keymap file -\input{platform/keymap-ondio.tex} +\input{platform/keymap-archosondio.tex} Index: manual/platform/iriverh300.tex =================================================================== --- manual/platform/iriverh300.tex (revision 23773) +++ manual/platform/iriverh300.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{h300} +\def\UseOption{iriverh300} \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} \edef\UseOption{\UseOption,IRIVER_H300_PAD} \edef\UseOption{\UseOption,HAVE_REMOTE_LCD} @@ -8,20 +8,20 @@ \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,iriver} -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H3xx} -\newcommand{\playerlongtype}{H320 and H340} +\newcommand{\archosplayerman}{Iriver} +\newcommand{\archosplayertype}{H3xx} +\newcommand{\archosplayerlongtype}{H320 and H340} \newcommand{\genericimg}{220x176x16} -\newcommand{\specimg}{h300} +\newcommand{\specimg}{iriverh300} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.iriver}} \newcommand{\firmwareextension}{\fname{iriver}} \newcommand{\screenshotsize}{6cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-h100_h300.tex} +\input{platform/keymap-iriverh100_h300.tex} Index: manual/platform/archosplayer.tex =================================================================== --- manual/platform/archosplayer.tex (revision 23773) +++ manual/platform/archosplayer.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{player} +\def\UseOption{archosplayer} \edef\UseOption{\UseOption,PLAYER_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} @@ -7,19 +7,19 @@ \edef\UseOption{\UseOption,archos} \edef\UseOption{\UseOption,rombox} -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Studio/Player} -\newcommand{\playerlongtype}{Jukebox 5000, 6000, Studio 10 and 20} +\newcommand{\archosplayerman}{Archos} +\newcommand{\archosplayertype}{Studio/Player} +\newcommand{\archosplayerlongtype}{Jukebox 5000, 6000, Studio 10 and 20} \newcommand{\genericimg}{charx11x1} -\newcommand{\specimg}{player} +\newcommand{\specimg}{archosplayer} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{archos.mod}} \newcommand{\firmwareextension}{\fname{mod}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-player.tex} +\input{platform/keymap-archosplayer.tex} Index: manual/platform/ipodmini1g.tex =================================================================== --- manual/platform/ipodmini1g.tex (revision 23773) +++ manual/platform/ipodmini1g.tex (working copy) @@ -1,20 +1,20 @@ % $Id$ % -\def\UseOption{ipodmini} +\def\UseOption{ipodmini1g} \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} \edef\UseOption{\UseOption,IPOD_4G_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,ipod} -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{Mini} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Ipod} +\newcommand{\archosplayertype}{Mini} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{138x110x2} -\newcommand{\specimg}{ipodmini} +\newcommand{\specimg}{ipodmini1g} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.ipod}} \newcommand{\firmwareextension}{\fname{ipod}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/keymap-m3.tex =================================================================== --- manual/platform/keymap-m3.tex (revision 23734) +++ manual/platform/keymap-m3.tex (working copy) @@ -1,93 +0,0 @@ -% $Id$ % -\newcommand{\ButtonLeft}{\btnfnt{Rewind}} -\newcommand{\ButtonRight}{\btnfnt{Forward}} -\newcommand{\ButtonUp}{\btnfnt{Volume Up}} -\newcommand{\ButtonDown}{\btnfnt{Volume Down}} -\newcommand{\ButtonRec}{\btnfnt{Rec}} -\newcommand{\ButtonPlay}{\btnfnt{Play}} -\newcommand{\ButtonMode}{\btnfnt{Mode}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} -\newcommand{\ActionStdNext}{\ButtonDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} -\newcommand{\ActionStdCancel}{\ButtonLeft} -\newcommand{\ActionStdContext}{Long \ButtonMode} -\newcommand{\ActionStdQuickScreen}{Long \ButtonRec} -\newcommand{\ActionQuickScreenExit}{\ButtonRec} -\newcommand{\ActionStdMenu}{\ButtonRec} -\newcommand{\ActionStdOk}{\ButtonPlay{} or \ButtonRight} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonPlay} -\newcommand{\ActionWpsStop}{Long \ButtonPlay} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} -\newcommand{\ActionWpsVolDown}{\ButtonDown} -\newcommand{\ActionWpsVolUp}{\ButtonUp} -\newcommand{\ActionWpsQuickScreen}{Long \ButtonRec} -\newcommand{\ActionWpsMenu}{\ButtonRec} -\newcommand{\ActionWpsContext}{Long \ButtonMode} -\newcommand{\ActionWpsBrowse}{\ButtonMode} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonPlay} -\newcommand{\ActionTreeStop}{Long \ButtonPlay} -\newcommand{\ActionTreeEnter}{\ButtonPlay{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonPlay} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonUp} -\newcommand{\ActionSettingDec}{\ButtonDown} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} -\newcommand{\ActionKbdSelect}{\ButtonPlay} -\newcommand{\ActionKbdDone}{Long \ButtonPlay} -\newcommand{\ActionKbdAbort}{\ButtonRec} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonMode} -\newcommand{\ActionPsIncSmall}{\ButtonUp} -\newcommand{\ActionPsIncBig}{Long \ButtonUp} -\newcommand{\ActionPsDecSmall}{\ButtonDown} -\newcommand{\ActionPsDecBig}{Long \ButtonDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonRec} -\newcommand{\ActionPsExit}{\ButtonPlay} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonPlay} -\newcommand{\ActionRecNewfile}{\ButtonRec} -\newcommand{\ActionRecSettingsInc}{\ButtonRight} -\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonUp} -\newcommand{\ActionRecNext}{\ButtonDown} -\newcommand{\ActionRecMenu}{Long \ButtonRec} -\newcommand{\ActionRecExit}{Long \ButtonPlay} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonMode} -\newcommand{\ActionFMMenu}{Long \ButtonMode} -\newcommand{\ActionFMMode}{Long \ButtonRec} -\newcommand{\ActionFMStop}{Long \ButtonPlay} -\newcommand{\ActionFMExit}{\ButtonRec} -\newcommand{\ActionFMPlay}{\ButtonPlay} -\newcommand{\ActionFMSettingsInc}{\ActionSettingInc} -\newcommand{\ActionFMSettingsDec}{\ActionSettingDec} -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{Long \ButtonRec} Index: manual/platform/ipodmini.tex =================================================================== --- manual/platform/ipodmini.tex (revision 23734) +++ manual/platform/ipodmini.tex (working copy) @@ -1,24 +0,0 @@ -% $Id$ % -\def\UseOption{ipodmini} -\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} -\edef\UseOption{\UseOption,IPOD_4G_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,ipod} - -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{Mini} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{138x110x2} -\newcommand{\specimg}{ipodmini} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.ipod}} -\newcommand{\firmwareextension}{\fname{ipod}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-ipod4g.tex} Index: manual/platform/iriverh10.tex =================================================================== --- manual/platform/iriverh10.tex (revision 23773) +++ manual/platform/iriverh10.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{h10} +\def\UseOption{iriverh10} \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} \edef\UseOption{\UseOption,IRIVER_H10_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} @@ -7,19 +7,19 @@ \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,iriver} -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H10} -\newcommand{\playerlongtype}{\playertype{} 20GB} +\newcommand{\archosplayerman}{Iriver} +\newcommand{\archosplayertype}{H10} +\newcommand{\archosplayerlongtype}{\archosplayertype{} 20GB} \newcommand{\genericimg}{160x128x16} -\newcommand{\specimg}{h10} +\newcommand{\specimg}{iriverh10} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.mi4}} \newcommand{\firmwareextension}{\fname{mi4}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-h10.tex} +\input{platform/keymap-iriverh10.tex} Index: manual/platform/fuze.tex =================================================================== --- manual/platform/fuze.tex (revision 23734) +++ manual/platform/fuze.tex (working copy) @@ -1,24 +0,0 @@ -% $Id$ % -\def\UseOption{fuze} -\edef\UseOption{\UseOption,SANSA_FUZE_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} -\edef\UseOption{\UseOption,sansaAMS} - -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{Fuze} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{220x176x16} -\newcommand{\specimg}{fuze} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.sansa}} -\newcommand{\firmwareextension}{\fname{sansa}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{flash storage} - -% link external keymap file -\input{platform/keymap-fuze.tex} Index: manual/platform/gigabeatf.tex =================================================================== --- manual/platform/gigabeatf.tex (revision 23734) +++ manual/platform/gigabeatf.tex (working copy) @@ -1,29 +0,0 @@ -% $Id$ % -\def\UseOption{gigabeatf} -\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} -\edef\UseOption{\UseOption,GIGABEAT_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} -\edef\UseOption{\UseOption,gigabeat} -\edef\UseOption{\UseOption,GIGABEAT_RC_PAD} -\edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} - -\newcommand{\playerman}{Toshiba} -\newcommand{\playertype}{Gigabeat F and X Series} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{240x320x16} -\newcommand{\specimg}{gigabeatf} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}} -\newcommand{\firmwareextension}{\fname{gigabeat}} -\newcommand{\screenshotsize}{6cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-gigabeatf.tex} -\input{platform/remote-keymap-gigabeat.tex} Index: manual/platform/ondiosp.tex =================================================================== --- manual/platform/ondiosp.tex (revision 23734) +++ manual/platform/ondiosp.tex (working copy) @@ -1,24 +0,0 @@ -% $Id$ % -%platform file for the Ondio SP -\def\UseOption{ondiosp} -\edef\UseOption{\UseOption,ondio} -\edef\UseOption{\UseOption,ONDIO_PAD} -\edef\UseOption{\UseOption,archos} -\edef\UseOption{\UseOption,rombox} - -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Ondio} -\newcommand{\playerlongtype}{Ondio 128 SP} -\newcommand{\genericimg}{112x64x1} -\newcommand{\specimg}{ondiosp} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} -\newcommand{\firmwareextension}{\fname{ajz}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{flash storage} - -% link external keymap file -\input{platform/keymap-ondio.tex} Index: manual/platform/ipod1g2g.tex =================================================================== --- manual/platform/ipod1g2g.tex (revision 23773) +++ manual/platform/ipod1g2g.tex (working copy) @@ -6,15 +6,15 @@ \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,ipod} -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{1G / 2G} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Ipod} +\newcommand{\archosplayertype}{1G / 2G} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{160x128x2} \newcommand{\specimg}{ipod1g2g} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.ipod}} \newcommand{\firmwareextension}{\fname{ipod}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/keymap-player.tex =================================================================== --- manual/platform/keymap-player.tex (revision 23734) +++ manual/platform/keymap-player.tex (working copy) @@ -1,49 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Minus}} -\newcommand{\ButtonRight}{\btnfnt{Plus}} -\newcommand{\ButtonOn}{\btnfnt{On}} -\newcommand{\ButtonMenu}{\btnfnt{Menu}} -\newcommand{\ButtonPlay}{\btnfnt{Play}} -\newcommand{\ButtonStop}{\btnfnt{Stop}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonLeft} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonLeft} -\newcommand{\ActionStdNext}{\ButtonRight} -\newcommand{\ActionStdNextRepeat}{Long \ButtonRight} -\newcommand{\ActionStdCancel}{\ButtonStop} -\newcommand{\ActionStdContext}{Long \ButtonPlay} -\newcommand{\ActionStdMenu}{\ButtonMenu} -\newcommand{\ActionStdOk}{\ButtonPlay} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonPlay} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} - -\newcommand{\ActionWpsStop}{\ButtonStop} -\newcommand{\ActionWpsVolDown}{\ButtonMenu{} + \ButtonLeft} -\newcommand{\ActionWpsVolUp}{\ButtonMenu{} + \ButtonRight} - -\newcommand{\ActionWpsMenu}{\ButtonMenu} -\newcommand{\ActionWpsContext}{Long \ButtonPlay} -\newcommand{\ActionWpsBrowse}{\ButtonOn} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonMenu{} + \ButtonOn} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonOn} -\newcommand{\ActionTreeEnter}{\ButtonPlay} -\newcommand{\ActionTreeParentDirectory}{\ButtonStop} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonPlay} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonRight} -\newcommand{\ActionSettingDec}{\ButtonLeft} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{\ButtonOn{} + \ButtonPlay} Index: manual/platform/ipodvideo.tex =================================================================== --- manual/platform/ipodvideo.tex (revision 23773) +++ manual/platform/ipodvideo.tex (working copy) @@ -7,15 +7,15 @@ \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,ipod} -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{Video} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Ipod} +\newcommand{\archosplayertype}{Video} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{320x240x16} \newcommand{\specimg}{ipodvideo} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.ipod}} \newcommand{\firmwareextension}{\fname{ipod}} \newcommand{\screenshotsize}{8cm} Index: manual/platform/h10_5gb.tex =================================================================== --- manual/platform/h10_5gb.tex (revision 23734) +++ manual/platform/h10_5gb.tex (working copy) @@ -1,25 +0,0 @@ -% $Id$ % -\def\UseOption{h10_5gb} -\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} -\edef\UseOption{\UseOption,IRIVER_H10_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,iriver} - -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H10} -\newcommand{\playerlongtype}{\playertype{} 5GB and 6GB} -\newcommand{\genericimg}{128x128x16} -\newcommand{\specimg}{h10_5gb} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} -\newcommand{\firmwareextension}{\fname{mi4}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-h10.tex} Index: manual/platform/mrobe100.tex =================================================================== --- manual/platform/mrobe100.tex (revision 23773) +++ manual/platform/mrobe100.tex (working copy) @@ -7,15 +7,15 @@ \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} \edef\UseOption{\UseOption,olympus} -\newcommand{\playerman}{Olympus} -\newcommand{\playertype}{m:robe 100} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Olympus} +\newcommand{\archosplayertype}{m:robe 100} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{160x128x1} \newcommand{\specimg}{mrobe100} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.mi4}} \newcommand{\firmwareextension}{\fname{mi4}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/gigabeats.tex =================================================================== --- manual/platform/gigabeats.tex (revision 23773) +++ manual/platform/gigabeats.tex (working copy) @@ -9,15 +9,15 @@ \edef\UseOption{\UseOption,GIGABEAT_RC_PAD} \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} -\newcommand{\playerman}{Toshiba} -\newcommand{\playertype}{Gigabeat S Series} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Toshiba} +\newcommand{\archosplayertype}{Gigabeat S Series} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{240x320x16} \newcommand{\specimg}{gigabeats} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.gigabeat}} \newcommand{\firmwareextension}{\fname{gigabeat}} \newcommand{\screenshotsize}{6cm} Index: manual/platform/ipod4g.tex =================================================================== --- manual/platform/ipod4g.tex (revision 23773) +++ manual/platform/ipod4g.tex (working copy) @@ -6,15 +6,15 @@ \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,ipod} -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{4G} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Ipod} +\newcommand{\archosplayertype}{4G} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{160x128x2} \newcommand{\specimg}{ipod4g} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.ipod}} \newcommand{\firmwareextension}{\fname{ipod}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/iaudiox5.tex =================================================================== --- manual/platform/iaudiox5.tex (revision 23773) +++ manual/platform/iaudiox5.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{x5} +\def\UseOption{iaudiox5} \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} \edef\UseOption{\UseOption,IAUDIO_X5_PAD} \edef\UseOption{\UseOption,HAVE_REMOTE_LCD} @@ -8,19 +8,19 @@ \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,iaudio} -\newcommand{\playerman}{Iaudio} -\newcommand{\playertype}{X5} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Iaudio} +\newcommand{\archosplayertype}{X5} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{160x128x16} -\newcommand{\specimg}{x5} +\newcommand{\specimg}{iaudiox5} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} \newcommand{\firmwareextension}{\fname{iaudio}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-mx5.tex} +\input{platform/keymap-iaudiomx5.tex} Index: manual/platform/ipodcolor.tex =================================================================== --- manual/platform/ipodcolor.tex (revision 23773) +++ manual/platform/ipodcolor.tex (working copy) @@ -6,15 +6,15 @@ \edef\UseOption{\UseOption,HAVE_DISK_STORAGE} \edef\UseOption{\UseOption,ipod} -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{Color} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Ipod} +\newcommand{\archosplayertype}{Color} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{220x176x16} \newcommand{\specimg}{ipodcolor} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.ipod}} \newcommand{\firmwareextension}{\fname{ipod}} \newcommand{\screenshotsize}{6cm} Index: manual/platform/keymap-e200.tex =================================================================== --- manual/platform/keymap-e200.tex (revision 23734) +++ manual/platform/keymap-e200.tex (working copy) @@ -1,111 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonRec}{\btnfnt{Rec}} -\newcommand{\ButtonUp}{\btnfnt{Play}} -\newcommand{\ButtonDown}{\btnfnt{Submenu}} -\newcommand{\ButtonSelect}{\btnfnt{Select}} -\newcommand{\ButtonPower}{\btnfnt{Power}} -\newcommand{\ButtonScrollBack}{\btnfnt{Scroll Backward}} -\newcommand{\ButtonScrollFwd}{\btnfnt{Scroll Forward}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonScrollBack} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonScrollBack} -\newcommand{\ActionStdNext}{\ButtonScrollFwd} -\newcommand{\ActionStdNextRepeat}{Long \ButtonScrollFwd} -\newcommand{\ActionStdCancel}{\ButtonLeft} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonDown} -\newcommand{\ActionQuickScreenExit}{\ButtonSelect} -\newcommand{\ActionStdMenu}{\ButtonDown} -\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdRec}{Long \ButtonRec} -\newcommand{\ActionStdUsbCharge}{\ButtonSelect} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonUp} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} - -\newcommand{\ActionWpsStop}{\ButtonPower} -\newcommand{\ActionWpsVolDown}{\ButtonScrollFwd} -\newcommand{\ActionWpsVolUp}{\ButtonScrollBack} - -\newcommand{\ActionWpsQuickScreen}{Long \ButtonDown} -\newcommand{\ActionWpsMenu}{\ButtonDown} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsPitchScreen}{\ButtonSelect{} + \ButtonUp} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown} - -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft} -\newcommand{\ActionWpsAbReset}{\ButtonPower{} + \ButtonUp} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonUp} -\newcommand{\ActionTreeStop}{\ButtonPower} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonScrollFwd} -\newcommand{\ActionSettingDec}{\ButtonScrollBack} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdDone}{\ButtonUp} -\newcommand{\ActionKbdAbort}{\ButtonPower} -\newcommand{\ActionKbdUp}{\ButtonScrollBack} -\newcommand{\ActionKbdDown}{\ButtonScrollFwd} -\newcommand{\ActionKbdCursorLeft}{\ButtonRec{} + \ButtonLeft} -\newcommand{\ActionKbdCursorRight}{\ButtonRec{} + \ButtonRight} -\newcommand{\ActionKbdBackSpace}{\ButtonDown} -\newcommand{\ActionKbdPageFlip}{\ButtonRec{} + \ButtonSelect} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonRec} -\newcommand{\ActionPsIncSmall}{\ButtonScrollBack} -\newcommand{\ActionPsIncBig}{Long \ButtonScrollBack} -\newcommand{\ActionPsDecSmall}{\ButtonScrollFwd} -\newcommand{\ActionPsDecBig}{Long \ButtonScrollFwd} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonSelect} -\newcommand{\ActionPsExit}{\ButtonPower{} or \ButtonUp} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonUp} -\newcommand{\ActionRecExit}{\ButtonPower} -\newcommand{\ActionRecNewfile}{\ButtonRec} -\newcommand{\ActionRecMenu}{Long \ButtonSelect} -\newcommand{\ActionRecSettingsInc}{\ButtonRight} -\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonScrollBack} -\newcommand{\ActionRecNext}{\ButtonScrollFwd} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonSelect} -\newcommand{\ActionFMMenu}{Long \ButtonSelect} -\newcommand{\ActionFMMode}{Long \ButtonUp} -\newcommand{\ActionFMStop}{\ButtonPower} -\newcommand{\ActionFMExit}{\ButtonDown} -\newcommand{\ActionFMPlay}{\ButtonUp} -\newcommand{\ActionFMSettingsInc}{\ButtonUp} -\newcommand{\ActionFMSettingsDec}{\ButtonDown} -\newcommand{\ActionFMPrev}{\ActionRecSettingsInc} -\newcommand{\ActionFMNext}{\ActionRecSettingsDec} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{\ButtonRec} - Index: manual/platform/keymap-mx5.tex =================================================================== --- manual/platform/keymap-mx5.tex (revision 23734) +++ manual/platform/keymap-mx5.tex (working copy) @@ -1,96 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonUp}{\btnfnt{Up}} -\newcommand{\ButtonDown}{\btnfnt{Down}} -\newcommand{\ButtonSelect}{\btnfnt{Select}} -\newcommand{\ButtonPower}{\btnfnt{Power}} -\newcommand{\ButtonRec}{\btnfnt{Rec}} -\newcommand{\ButtonPlay}{\btnfnt{Play}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} -\newcommand{\ActionStdNext}{\ButtonDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} -\newcommand{\ActionStdCancel}{\ButtonLeft{} or \ButtonPower} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonRec} -\newcommand{\ActionQuickScreenExit}{\ButtonRec} -\newcommand{\ActionStdMenu}{\ButtonRec} -\newcommand{\ActionStdOk}{\ButtonSelect, \ButtonRight{} or \ButtonPlay} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonPlay} -\newcommand{\ActionWpsStop}{Long \ButtonPlay} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} -\newcommand{\ActionWpsVolDown}{\ButtonDown} -\newcommand{\ActionWpsVolUp}{\ButtonUp} -\newcommand{\ActionWpsQuickScreen}{Long \ButtonRec} -\newcommand{\ActionWpsMenu}{\ButtonRec} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonPlay} -\newcommand{\ActionTreeStop}{Long \ButtonPlay} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonUp} -\newcommand{\ActionSettingDec}{\ButtonDown} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdDone}{\ButtonPlay} -\newcommand{\ActionKbdAbort}{\ButtonRec} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonSelect} -\newcommand{\ActionPsIncSmall}{\ButtonUp} -\newcommand{\ActionPsIncBig}{Long \ButtonUp} -\newcommand{\ActionPsDecSmall}{\ButtonDown} -\newcommand{\ActionPsDecBig}{Long \ButtonDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonPower} -\newcommand{\ActionPsExit}{\ButtonPlay} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonPlay} -\newcommand{\ActionRecNewfile}{\ButtonRec} -\newcommand{\ActionRecSettingsInc}{\ButtonRight} -\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -\newcommand{\ActionRecPrev}{\ButtonUp} -\newcommand{\ActionRecNext}{\ButtonDown} -\newcommand{\ActionRecMenu}{Long \ButtonRec} -\newcommand{\ActionRecExit}{Long \ButtonPlay} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonSelect} -\newcommand{\ActionFMMenu}{Long \ButtonSelect} -\newcommand{\ActionFMMode}{Long \ButtonPlay} -\newcommand{\ActionFMStop}{\ButtonPower} -\newcommand{\ActionFMExit}{\ButtonRec} -\newcommand{\ActionFMPlay}{\ButtonPlay} -\newcommand{\ActionFMSettingsInc}{\ActionSettingInc} -\newcommand{\ActionFMSettingsDec}{\ActionSettingDec} -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{Long \ButtonRec} - Index: manual/platform/ipodnano1g.tex =================================================================== --- manual/platform/ipodnano1g.tex (revision 23773) +++ manual/platform/ipodnano1g.tex (working copy) @@ -1,19 +1,19 @@ % $Id$ % -\def\UseOption{ipodnano} +\def\UseOption{ipodnano1g} \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} \edef\UseOption{\UseOption,IPOD_4G_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} \edef\UseOption{\UseOption,ipod} -\newcommand{\playerman}{Ipod} -\newcommand{\playertype}{Nano} -\newcommand{\playerlongtype}{\playertype{} 1st generation} +\newcommand{\archosplayerman}{Ipod} +\newcommand{\archosplayertype}{Nano} +\newcommand{\archosplayerlongtype}{\archosplayertype{} 1st generation} \newcommand{\genericimg}{176x132x16} -\newcommand{\specimg}{ipodnano} +\newcommand{\specimg}{ipodnano1g} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.ipod}} \newcommand{\firmwareextension}{\fname{ipod}} \newcommand{\screenshotsize}{4cm} Index: manual/platform/recorderv2fm.tex =================================================================== --- manual/platform/recorderv2fm.tex (revision 23734) +++ manual/platform/recorderv2fm.tex (working copy) @@ -1,24 +0,0 @@ -% $Id$ % -\def\UseOption{recorderv2fm} -\edef\UseOption{\UseOption,RECORDER_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,archos} - -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Recorder V2/FM} -\newcommand{\playerlongtype}{Recorder V2 and FM} -\newcommand{\genericimg}{112x64x1} -\newcommand{\specimg}{recorderv2fm} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} -\newcommand{\firmwareextension}{\fname{ajz}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-recorder.tex} Index: manual/platform/c200.tex =================================================================== --- manual/platform/c200.tex (revision 23734) +++ manual/platform/c200.tex (working copy) @@ -1,25 +0,0 @@ -% $Id$ % -\def\UseOption{c200} -\edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} -\edef\UseOption{\UseOption,SANSA_C200_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS} -\edef\UseOption{\UseOption,sansa} - -\newcommand{\playerman}{Sansa} -\newcommand{\playertype}{c200 Series} -\newcommand{\playerlongtype}{\playertype} -\newcommand{\genericimg}{132x80x16} -\newcommand{\specimg}{c200} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{rockbox.mi4}} -\newcommand{\firmwareextension}{\fname{mi4}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{flash storage} - -% link external keymap file -\input{platform/keymap-c200.tex} Index: manual/platform/recorder.tex =================================================================== --- manual/platform/recorder.tex (revision 23734) +++ manual/platform/recorder.tex (working copy) @@ -1,25 +0,0 @@ -% $Id$ % -\def\UseOption{recorder} -\edef\UseOption{\UseOption,RECORDER_PAD} -\edef\UseOption{\UseOption,HAVE_BACKLIGHT} -\edef\UseOption{\UseOption,HAVE_DISK_STORAGE} -\edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} -\edef\UseOption{\UseOption,archos} - -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Recorder} -\newcommand{\playerlongtype}{Recorder 6, 10, 15 and 20} -\newcommand{\genericimg}{112x64x1} - -\newcommand{\specimg}{recorder} -%Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} -%For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} -\newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} -\newcommand{\firmwareextension}{\fname{ajz}} -\newcommand{\screenshotsize}{4cm} -\newcommand{\disk}{hard disk} - -% link external keymap file -\input{platform/keymap-recorder.tex} Index: manual/platform/iriverh10_5gb.tex =================================================================== --- manual/platform/iriverh10_5gb.tex (revision 23773) +++ manual/platform/iriverh10_5gb.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{h10_5gb} +\def\UseOption{iriverh10_5gb} \edef\UseOption{\UseOption,HAVE_RB_BL_ON_DISK} \edef\UseOption{\UseOption,IRIVER_H10_PAD} \edef\UseOption{\UseOption,HAVE_BACKLIGHT} @@ -7,19 +7,19 @@ \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,iriver} -\newcommand{\playerman}{Iriver} -\newcommand{\playertype}{H10} -\newcommand{\playerlongtype}{\playertype{} 5GB and 6GB} +\newcommand{\archosplayerman}{Iriver} +\newcommand{\archosplayertype}{H10} +\newcommand{\archosplayerlongtype}{\archosplayertype{} 5GB and 6GB} \newcommand{\genericimg}{128x128x16} -\newcommand{\specimg}{h10_5gb} +\newcommand{\specimg}{iriverh10_5gb} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.mi4}} \newcommand{\firmwareextension}{\fname{mi4}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap file -\input{platform/keymap-h10.tex} +\input{platform/keymap-iriverh10.tex} Index: manual/platform/iaudiom3.tex =================================================================== --- manual/platform/iaudiom3.tex (revision 23773) +++ manual/platform/iaudiom3.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{m3} +\def\UseOption{iaudiom3} \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} \edef\UseOption{\UseOption,IAUDIO_M3_PAD} \edef\UseOption{\UseOption,IAUDIO_RC_PAD} @@ -8,19 +8,19 @@ \edef\UseOption{\UseOption,iaudio} \edef\UseOption{\UseOption,HAVEREMOTEKEYMAP} -\newcommand{\playerman}{Iaudio} -\newcommand{\playertype}{M3} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Iaudio} +\newcommand{\archosplayertype}{M3} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{128x96x2} -\newcommand{\specimg}{m3} +\newcommand{\specimg}{iaudiom3} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link external keymap files -\input{platform/keymap-m3.tex} +\input{platform/keymap-iaudiom3.tex} \input{platform/remote-keymap-iaudio.tex} Index: manual/platform/keymap-clip.tex =================================================================== --- manual/platform/keymap-clip.tex (revision 23734) +++ manual/platform/keymap-clip.tex (working copy) @@ -1,109 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Left}} -\newcommand{\ButtonRight}{\btnfnt{Right}} -\newcommand{\ButtonHome}{\btnfnt{Home}} -\newcommand{\ButtonUp}{\btnfnt{Play}} -\newcommand{\ButtonDown}{\btnfnt{Submenu}} -\newcommand{\ButtonSelect}{\btnfnt{Select}} -\newcommand{\ButtonPower}{\btnfnt{Power}} -\newcommand{\ButtonVolDown}{\btnfnt{Volume Down}} -\newcommand{\ButtonVolUp}{\btnfnt{Volume Up}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonUp} -\newcommand{\ActionStdNext}{\ButtonDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonDown} -\newcommand{\ActionStdCancel}{\ButtonLeft} -\newcommand{\ActionStdContext}{Long \ButtonSelect} -\newcommand{\ActionStdQuickScreen}{Long \ButtonDown} -\newcommand{\ActionQuickScreenExit}{\ButtonSelect} -\newcommand{\ActionStdMenu}{\ButtonHome} -\newcommand{\ActionStdOk}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionStdUsbCharge}{\ButtonSelect} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonUp} -\newcommand{\ActionWpsSkipNext}{\ButtonRight} -\newcommand{\ActionWpsSkipPrev}{\ButtonLeft} -\newcommand{\ActionWpsSeekBack}{Long \ButtonLeft} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonRight} - -\newcommand{\ActionWpsStop}{\ButtonPower} -\newcommand{\ActionWpsVolDown}{\ButtonVolDown} -\newcommand{\ActionWpsVolUp}{\ButtonVolUp} - -\newcommand{\ActionWpsQuickScreen}{Long \ButtonDown} -\newcommand{\ActionWpsMenu}{\ButtonDown} -\newcommand{\ActionWpsContext}{Long \ButtonSelect} -\newcommand{\ActionWpsBrowse}{\ButtonSelect} -\newcommand{\ActionWpsPitchScreen}{\ButtonSelect{} + \ButtonUp} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonSelect{} + \ButtonDown} - -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonRight} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonLeft} -\newcommand{\ActionWpsAbReset}{\ButtonPower{} + \ButtonUp} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonUp} -\newcommand{\ActionTreeStop}{\ButtonPower} -\newcommand{\ActionTreeEnter}{\ButtonSelect{} or \ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonSelect} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonRight} -\newcommand{\ActionSettingDec}{\ButtonLeft} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonSelect} -\newcommand{\ActionKbdDone}{Long \ButtonSelect} -\newcommand{\ActionKbdAbort}{\ButtonPower} -\newcommand{\ActionKbdUp}{\ButtonUp} -\newcommand{\ActionKbdDown}{\ButtonDown} -\newcommand{\ActionKbdCursorLeft}{\ButtonVolUp} -\newcommand{\ActionKbdCursorRight}{\ButtonVolDown} -\newcommand{\ActionKbdBackSpace}{\ButtonHome} -\newcommand{\ActionKbdPageFlip}{} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonHome} -\newcommand{\ActionPsIncSmall}{\ButtonRight} -\newcommand{\ActionPsIncBig}{Long \ButtonRight} -\newcommand{\ActionPsDecSmall}{\ButtonLeft} -\newcommand{\ActionPsDecBig}{Long \ButtonLeft} -\newcommand{\ActionPsNudgeLeft}{\ButtonLeft} -\newcommand{\ActionPsNudgeRight}{\ButtonRight} -\newcommand{\ActionPsReset}{\ButtonSelect} -\newcommand{\ActionPsExit}{\ButtonPower{} or \ButtonUp} - -%Button actions, Recording screen context -%\newcommand{\ActionRecPause}{\ButtonUp} -%\newcommand{\ActionRecExit}{\ButtonDown} -%\newcommand{\ActionRecNewfile}{\ButtonHome} -%\newcommand{\ActionRecMenu}{Long \ButtonSelect} -%\newcommand{\ActionRecSettingsInc}{\ButtonRight} -%\newcommand{\ActionRecSettingsDec}{\ButtonLeft} -%\newcommand{\ActionRecPrev}{\ButtonVolDown} -%\newcommand{\ActionRecNext}{\ButtonVolUp} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonSelect} -\newcommand{\ActionFMMenu}{\ButtonDown} -\newcommand{\ActionFMMode}{\ButtonHome} -\newcommand{\ActionFMStop}{Long \ButtonUp} -\newcommand{\ActionFMExit}{\ButtonPower} -\newcommand{\ActionFMPlay}{\ButtonUp} -\newcommand{\ActionFMSettingsInc}{\ButtonVolUp} %? -\newcommand{\ActionFMSettingsDec}{\ButtonVolDown} %? -\newcommand{\ActionFMPrev}{\ButtonLeft} -\newcommand{\ActionFMNext}{\ButtonRight} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{\ButtonHome} Index: manual/platform/archosondiosp.tex =================================================================== --- manual/platform/archosondiosp.tex (revision 23773) +++ manual/platform/archosondiosp.tex (working copy) @@ -1,24 +1,24 @@ % $Id$ % %platform file for the Ondio SP -\def\UseOption{ondiosp} +\def\UseOption{archosondiosp} \edef\UseOption{\UseOption,ondio} \edef\UseOption{\UseOption,ONDIO_PAD} \edef\UseOption{\UseOption,archos} \edef\UseOption{\UseOption,rombox} -\newcommand{\playerman}{Archos} -\newcommand{\playertype}{Ondio} -\newcommand{\playerlongtype}{Ondio 128 SP} +\newcommand{\archosplayerman}{Archos} +\newcommand{\archosplayertype}{Ondio} +\newcommand{\archosplayerlongtype}{Ondio 128 SP} \newcommand{\genericimg}{112x64x1} -\newcommand{\specimg}{ondiosp} +\newcommand{\specimg}{archosondiosp} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{ajbrec.ajz}} \newcommand{\firmwareextension}{\fname{ajz}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{flash storage} % link external keymap file -\input{platform/keymap-ondio.tex} +\input{platform/keymap-archosondio.tex} Index: manual/platform/keymap-h10.tex =================================================================== --- manual/platform/keymap-h10.tex (revision 23734) +++ manual/platform/keymap-h10.tex (working copy) @@ -1,113 +0,0 @@ -% $Id$ - -\newcommand{\ButtonLeft}{\btnfnt{Cancel}} -\newcommand{\ButtonRight}{\btnfnt{Select}} -\newcommand{\ButtonRew}{\btnfnt{Prev}} -\newcommand{\ButtonPlay}{\btnfnt{Play}} -\newcommand{\ButtonFF}{\btnfnt{Next}} -\newcommand{\ButtonScrollUp}{\btnfnt{Scroll Up}} -\newcommand{\ButtonScrollDown}{\btnfnt{Scroll Down}} -\newcommand{\ButtonPower}{\btnfnt{Power}} -\newcommand{\ButtonHold}{\btnfnt{Hold}} - -%Button actions, standard context -\newcommand{\ActionStdPrev}{\ButtonScrollUp} -\newcommand{\ActionStdPrevRepeat}{Long \ButtonScrollUp} -\newcommand{\ActionStdNext}{\ButtonScrollDown} -\newcommand{\ActionStdNextRepeat}{Long \ButtonScrollDown} -\newcommand{\ActionStdCancel}{\ButtonLeft} -\newcommand{\ActionStdContext}{Long \ButtonRight} -\newcommand{\ActionStdQuickScreen}{Long \ButtonLeft} -\newcommand{\ActionQuickScreenExit}{\ButtonLeft} -\newcommand{\ActionStdMenu}{\ButtonPower} -\newcommand{\ActionStdOk}{\ButtonRight} -\newcommand{\ActionStdUsbCharge}{\ButtonRight} - -%Button actions, wps context -\newcommand{\ActionWpsPlay}{\ButtonPlay} -\newcommand{\ActionWpsSkipNext}{\ButtonFF} -\newcommand{\ActionWpsSkipPrev}{\ButtonRew} -\newcommand{\ActionWpsSeekBack}{Long \ButtonRew} -\newcommand{\ActionWpsSeekFwd}{Long \ButtonFF} - -\newcommand{\ActionWpsStop}{Long \ButtonPlay} -\newcommand{\ActionWpsVolDown}{\ButtonScrollDown} -\newcommand{\ActionWpsVolUp}{\ButtonScrollUp} - -\newcommand{\ActionWpsQuickScreen}{Long \ButtonLeft} -\newcommand{\ActionWpsMenu}{\ButtonPower} -\newcommand{\ActionWpsContext}{Long \ButtonRight} -\newcommand{\ActionWpsBrowse}{\ButtonLeft} -\newcommand{\ActionWpsPitchScreen}{\ButtonPlay+\ButtonLeft} -\newcommand{\ActionWpsIdThreeScreen}{\ButtonPlay+\ButtonRight} - -\newcommand{\ActionWpsAbSetBNextDir}{\ButtonPower{} + \ButtonFF} -\newcommand{\ActionWpsAbSetAPrevDir}{\ButtonPower{} + \ButtonRew} -\newcommand{\ActionWpsAbReset}{\ButtonPower{} + \ButtonPlay} - -%Button actions, tree context -\newcommand{\ActionTreeWps}{\ButtonPlay} -\newcommand{\ActionTreeStop}{Long \ButtonPlay} -\newcommand{\ActionTreeEnter}{\ButtonRight} -\newcommand{\ActionTreeParentDirectory}{\ButtonLeft} - -%Button actions, YesNo context -\newcommand{\ActionYesNoAccept}{\ButtonRight} - -%Button actions, Setting context -\newcommand{\ActionSettingInc}{\ButtonScrollUp} -\newcommand{\ActionSettingDec}{\ButtonScrollDown} - -%Button actions, Alarm screen -\newcommand{\ActionAlarmSet}{\ActionStdOk} -\newcommand{\ActionAlarmCancel}{\ActionStdCancel} -\newcommand{\ActionAlarmHoursInc}{\ButtonRew} -\newcommand{\ActionAlarmHoursDec}{\ButtonFF} - -%Button actions, Virtual Keyboard Context -\newcommand{\ActionKbdLeft}{\ButtonLeft} -\newcommand{\ActionKbdRight}{\ButtonRight} -\newcommand{\ActionKbdSelect}{\ButtonRew} -\newcommand{\ActionKbdDone}{\ButtonPlay} -\newcommand{\ActionKbdAbort}{\ButtonFF} -\newcommand{\ActionKbdUp}{\ButtonScrollUp} -\newcommand{\ActionKbdDown}{\ButtonScrollDown} -\newcommand{\ActionKbdMorseInput}{\ButtonPlay+\ButtonRew} -\newcommand{\ActionKbdMorseSelect}{\ButtonRew} - -%Button actions, Pitch Screen context -\newcommand{\ActionPsToggleMode}{\ButtonPower} -\newcommand{\ActionPsIncSmall}{\ButtonScrollUp} -\newcommand{\ActionPsIncBig}{Long \ButtonScrollUp} -\newcommand{\ActionPsDecSmall}{\ButtonScrollDown} -\newcommand{\ActionPsDecBig}{Long \ButtonScrollDown} -\newcommand{\ActionPsNudgeLeft}{\ButtonRew} -\newcommand{\ActionPsNudgeRight}{\ButtonFF} -\newcommand{\ActionPsReset}{\ButtonPlay} -\newcommand{\ActionPsExit}{\ButtonLeft} - -%Button actions, FM radio context -\newcommand{\ActionFMPreset}{\ButtonRight} -\newcommand{\ActionFMMenu}{Long \ButtonRight} -\newcommand{\ActionFMMode}{\ButtonLeft} -\newcommand{\ActionFMStop}{Long \ButtonPlay} -\newcommand{\ActionFMExit}{\ButtonPower} -\newcommand{\ActionFMPlay}{\ButtonPlay} -\newcommand{\ActionFMSettingsInc}{\ButtonScrollUp} -\newcommand{\ActionFMSettingsDec}{\ButtonScrollDown} -\newcommand{\ActionFMPrev}{\ButtonRew} -\newcommand{\ActionFMNext}{\ButtonFF} - -%Button actions, Recording screen context -\newcommand{\ActionRecPause}{\ButtonPlay} -\newcommand{\ActionRecNewfile}{\ButtonRight} -\newcommand{\ActionRecExit}{\ButtonLeft} -\newcommand{\ActionRecMenu}{\ButtonPower} -\newcommand{\ActionRecSettingsInc}{\ActionSettingInc} -\newcommand{\ActionRecSettingsDec}{\ActionSettingDec} -\newcommand{\ActionRecPrev}{\ButtonRew} -\newcommand{\ActionRecNext}{\ButtonFF} - -%Button actions, Bookmark screen context -\newcommand{\ActionBmDelete}{Long \ButtonRew} - Index: manual/platform/iaudiom5.tex =================================================================== --- manual/platform/iaudiom5.tex (revision 23773) +++ manual/platform/iaudiom5.tex (working copy) @@ -1,5 +1,5 @@ % $Id$ % -\def\UseOption{m5} +\def\UseOption{iaudiom5} \edef\UseOption{\UseOption,HAVE_RB_BL_IN_FLASH} \edef\UseOption{\UseOption,IAUDIO_X5_PAD} \edef\UseOption{\UseOption,HAVE_REMOTE_LCD} @@ -8,19 +8,19 @@ \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE} \edef\UseOption{\UseOption,iaudio} -\newcommand{\playerman}{Iaudio} -\newcommand{\playertype}{M5} -\newcommand{\playerlongtype}{\playertype} +\newcommand{\archosplayerman}{Iaudio} +\newcommand{\archosplayertype}{M5} +\newcommand{\archosplayerlongtype}{\archosplayertype} \newcommand{\genericimg}{160x128x2} -\newcommand{\specimg}{m5} +\newcommand{\specimg}{iaudiom5} %Used to name the player, e.g. ...to the \dap -\newcommand{\dap}{player} +\newcommand{\dap}{archosplayer} %For use when referring to the player. E.g. the \daps\ capacity ... -\newcommand{\daps}{player's} +\newcommand{\daps}{archosplayer's} \newcommand{\firmwarefilename}{\fname{rockbox.iaudio}} \newcommand{\firmwareextension}{\fname{iaudio}} \newcommand{\screenshotsize}{4cm} \newcommand{\disk}{hard disk} % link to external keymap file -\input{platform/keymap-mx5.tex} +\input{platform/keymap-iaudiomx5.tex} Index: manual/frontpage/frontpage.tex =================================================================== --- manual/frontpage/frontpage.tex (revision 23773) +++ manual/frontpage/frontpage.tex (working copy) @@ -4,7 +4,7 @@ \ifpdfoutput{\includegraphics[width=10cm]{frontpage/rockboxlogo.pdf}} {\includegraphics{frontpage/rockbox-web.png}}\\ \vspace{2cm} -\huge{The Rockbox Manual\\for\\\playername}\vspace{1cm}\\ +\huge{The Rockbox Manual\\for\\\archosplayername}\vspace{1cm}\\ \vspace{\fill} Index: manual/advanced_topics/main.tex =================================================================== --- manual/advanced_topics/main.tex (revision 23773) +++ manual/advanced_topics/main.tex (working copy) @@ -213,7 +213,7 @@ the last number giving the colour depth in bits) when designing your own WPS, or if you use a WPS designed for another target. \opt{HAVE_REMOTE_LCD}{The resolution of the remote is - \opt{h100,h300}{128x64x1}\opt{x5,m5}{128x96x2} pixels.}} + \opt{iriverh100,iriverh300}{128x64x1}\opt{iaudiox5,iaudiom5}{128x96x2} pixels.}} \nopt{lcd_charcell}{ \subsubsection{\label{ref:Viewports}Viewports} @@ -554,7 +554,7 @@ \end{description} \section{\label{ref:FirmwareLoading}Firmware Loading} -\opt{player,recorder,recorderv2fm,ondio}{ +\opt{archosplayer,archosrecorder,archosrecorderv2fm,ondio}{ When your \dap{} powers on, it loads the Archos firmware in ROM, which automatically checks your \daps{} root directory for a file named \firmwarefilename. Note that Archos firmware can only read the first @@ -567,14 +567,14 @@ \subsection{\label{ref:using_rolo}Using ROLO (Rockbox Loader)} Rockbox is able to load and start another firmware file without rebooting. You just ``play'' a file with the extension % -\opt{recorder,recorderv2fm,ondio}{\fname{.ajz}.} % -\opt{player}{\fname{.mod}.} % -\opt{h100,h300}{\fname{.iriver}.} % +\opt{archosrecorder,archosrecorderv2fm,ondio}{\fname{.ajz}.} % +\opt{archosplayer}{\fname{.mod}.} % +\opt{iriverh100,iriverh300}{\fname{.iriver}.} % \opt{ipod}{\fname{.ipod}.} % \opt{iaudio}{\fname{.iaudio}.} % -\opt{sansa,h10,h10_5gb}{\fname{.mi4}.} % +\opt{sansa,iriverh10,iriverh10_5gb}{\fname{.mi4}.} % \opt{sansaAMS}{\fname{.sansa}.} % -\opt{gigabeatf,gigabeats}{\fname{.gigabeat}.} % +\opt{gigabeatfx,gigabeats}{\fname{.gigabeat}.} % This can be used to test new firmware versions without deleting your current version. Index: manual/advanced_topics/archos-flashing.tex =================================================================== --- manual/advanced_topics/archos-flashing.tex (revision 23773) +++ manual/advanced_topics/archos-flashing.tex (working copy) @@ -2,18 +2,18 @@ \subsection{Introduction} -When you bought your \playertype, it came with the \playerman\ firmware in -flash ROM. When you power on your \dap, this \playerman\ firmware starts, +When you bought your \archosplayertype, it came with the \archosplayerman\ firmware in +flash ROM. When you power on your \dap, this \archosplayerman\ firmware starts, and then loads an updated firmware from disk if present (\firmwarefilename). An ordinary Rockbox installation only replaces the on-disk firmware, leaving -the flash ROM contents intact. That means the \playerman\ firmware still +the flash ROM contents intact. That means the \archosplayerman\ firmware still controls the boot process. The main reason to change this is to improve the startup time of your player. -The \playerman\ bootloader is rather slow. With Rockbox in flash, your \dap\ +The \archosplayerman\ bootloader is rather slow. With Rockbox in flash, your \dap\ will boot much faster, typically in three to five seconds. Furthermore you might prefer a clean Rockbox environment, with as little remnants of the -\playerman\ software as possible. +\archosplayerman\ software as possible. \opt{rombox}{On your \dap\ it is also possible to execute Rockbox directly from flash ROM, increasing the amount of free RAM for buffering music. This is called \emph{Rombox}. @@ -28,11 +28,11 @@ of them fails, it will not program. } -\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \playerman\ +\opt{ondio}{\warn{After flashing Rockbox, never try to ROLO the \archosplayerman\ firmware - \opt{ondiofm}{versions 1.31f or 1.32b! These versions are flash updates + \opt{archosondiofm}{versions 1.31f or 1.32b! These versions are flash updates themselves. If they are} - \opt{ondiosp}{version 1.32b! This version is a flash update itself. + \opt{archosondiosp}{version 1.32b! This version is a flash update itself. If it is} applied when Rockbox is flashed, you'll end up with a garbled flash ROM and hence a dead box. @@ -76,14 +76,14 @@ \subsection{Initial Flashing Procedure} You only need to perform this procedure the first time you flash your -\playertype. You may also want to perform it in case the update procedure for +\archosplayertype. You may also want to perform it in case the update procedure for the second image recommends it. In the latter case do not perform the steps listed under "Preparation". \subsubsection{Preparation} \nopt{ondio}{ - First, check whether your \playertype\ is flashable at all. Select + First, check whether your \archosplayertype\ is flashable at all. Select \setting{System $\rightarrow$ Debug (Keep Out!) $\rightarrow$ View HW Info}. \opt{lcd_charcell}{Cycle through the displayed values with \ButtonRight / @@ -115,7 +115,7 @@ \nopt{ondio}{This will extract two files to the root, \fname{firmware\_{\textless}model{\textgreater}.bin} and \fname{firmware\_{\textless}model{\textgreater}\_norom.bin}. - \opt{recorder,recorderv2fm}{(The {\textless}model{\textgreater} part is + \opt{archosrecorder,archosrecorderv2fm}{(The {\textless}model{\textgreater} part is slighty different from that in the .zip file name.) } The flash plugin will select the correct one for your \dap. @@ -152,14 +152,14 @@ \note{There are no separate flash packages for {\dap}s modified to have 8MB of RAM. You need to use the corresponding package for non-modified - \playertype. You should then install a Rockbox image that makes use of all + \archosplayertype. You should then install a Rockbox image that makes use of all available RAM as described in the following section. } \subsection{Updating the Rockbox Image in Flash} When Rockbox is booted from flash, it does not check for an updated firmware -on disk. This is one of the reasons why it boots faster than the \playerman\ +on disk. This is one of the reasons why it boots faster than the \archosplayerman\ firmware. It means that whenever you update Rockbox, you also need to update the image in the flash. This is a simple and safe procedure: Index: manual/preamble.tex =================================================================== --- manual/preamble.tex (revision 23773) +++ manual/preamble.tex (working copy) @@ -41,7 +41,7 @@ \input{platform/\platform.tex} \input{features.tex} -\newcommand{\playername}{\playerman\ \playerlongtype} +\newcommand{\archosplayername}{\archosplayerman\ \archosplayerlongtype} \hypersetup{% add some values to the pdf properties colorlinks = true, @@ -51,7 +51,7 @@ urlcolor = blue, pdftitle = {Rockbox user manual}, pdfauthor = {The Rockbox Team}, - pdfsubject = {Rockbox user manual for \playername} + pdfsubject = {Rockbox user manual for \archosplayername} } \newcommand{\fname}[1]{\texttt{#1}} @@ -94,7 +94,7 @@ \fancyhead[L]{{\nouppercase{\textsc{\leftmark}}}} \fancyhead[R]{\iffloatpage{}{\thepage}} \fancyfoot[L]{\textsc{The Rockbox manual}} -\fancyfoot[R]{\textsc{\playerman{} \playertype}} +\fancyfoot[R]{\textsc{\archosplayerman{} \archosplayertype}} \fancypagestyle{plain}{} \renewcommand{\headrulewidth}{\iffloatpage{0pt}{0.4pt}} Index: manual/rockbox_interface/main.tex =================================================================== --- manual/rockbox_interface/main.tex (revision 23773) +++ manual/rockbox_interface/main.tex (working copy) @@ -9,7 +9,7 @@ % The extension is selected in the preamble, so no further \ifpdfoutput % is necessary. \includegraphics[height=8cm,width=10cm,keepaspectratio=true]{rockbox_interface/images/\specimg-front} -\opt{m3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg +\opt{iaudiom3}{% replace with HAVEREMOTEKEYMAP when the h100 file exists or change specimg \end{center} % spacing between the two pictures, could possibly be improved \begin{center} @@ -27,7 +27,7 @@ \wikilink{BlindFAQ}. % - \opt{h100}{ + \opt{iriverh100}{ Hold or lay the \dap{} so that the side with the joystick and LCD is facing towards you, and the curved side is at the top. The joystick functions as the \ButtonUp{}, \ButtonRight{}, \ButtonLeft{}, and \ButtonDown{} buttons when @@ -48,7 +48,7 @@ \dap{} hard locks, you can reset it by inserting a paper clip into the hole where the reset switch is.} % - \opt{h300}{ + \opt{iriverh300}{ Hold or lay the \dap{} so that the side with the button pad and LCD is facing towards you. The buttons on the button pad are as follows: top left corner: \ButtonOn{}, bottom left corner: \ButtonOff{}, top right corner: @@ -74,7 +74,7 @@ used in Rockbox. } % - \opt{ipod4g,ipodcolor,ipodvideo,ipodmini}{ + \opt{ipod4g,ipodcolor,ipodvideo,ipodmini1g}{ The main controls on the \dap{} are a slightly indented scroll wheel with a flat round button in the center. Hold the \dap{} with these controls facing you. @@ -84,7 +84,7 @@ \opt{ipod4g,ipodcolor}{remote connector, headphone jack, \ButtonHold{} switch.} \opt{ipodvideo}{\ButtonHold{} switch, headphone jack.} - \opt{ipodmini}{\ButtonHold{} switch, remote connector, headphone jack.} + \opt{ipodmini1g}{\ButtonHold{} switch, remote connector, headphone jack.} The dock connector that is used to connect your \dap{} to your computer is on the bottom panel of the \dap{}. @@ -156,7 +156,7 @@ \ButtonHold{} is off before trying to use your player. } % - \opt{ipodnano}{ + \opt{ipodnano1g}{ The main controls on the \dap{} are a slightly indented wheel with a flat round button in the center. Hold the \dap{} with these controls on the top surface. There is a \ButtonHold{} switch at one end, and @@ -194,7 +194,7 @@ round crosspad is labelled \ButtonMenu{}. } % - \opt{h10,h10_5gb}{ + \opt{iriverh10,iriverh10_5gb}{ Hold or lay the \dap{} so that the side with the scroll pad and LCD is facing towards you. In the centre below the lcd is the scroll pad. It is oriented vertically. Touching the top and bottom half of it acts as the @@ -207,12 +207,12 @@ hand side is the \ButtonPower{} button. On the top panel of the \dap{}, from left to right, you can find the - following: \ButtonHold{} switch, \opt{h10}{reset pin hole, }remote port and + following: \ButtonHold{} switch, \opt{iriverh10}{reset pin hole, }remote port and headphone mini jack plug. On the bottom panel of the \dap{} is the data cable port.} % - \opt{gigabeatf}{ + \opt{gigabeatfx}{ \note{The following description is for the Gigabeat F, but can also apply for the Gigabeat X. The Gigabeat F is slightly larger and more rectangular shaped, while the Gigabeat X is smaller and has a slightly tapered back.} @@ -285,7 +285,7 @@ bottom of the unit, there is a connector for the docking station or the proprietary USB connector for connecting directly to USB.} % - \opt{x5,m5}{ + \opt{iaudiox5,iaudiom5}{ The \dap{} is curved so that the end with the screen on it is thicker than the other end. Hold the \dap{} wih the thick end towards the top and the screen facing towards you. Half way up the front of the unit on the right hand side @@ -306,14 +306,14 @@ reset by inserting a paper clip. On the bottom of the unit is the connector for the - \playerman{} subpack or dock. On the top of the unit is a charge + \archosplayerman{} subpack or dock. On the top of the unit is a charge indicator light, which may feel a bit like a button, but is not. From the top of the \dap{} on the left hand side is the headphone socket, then the - remote connector. Below this is a cover which protects the \opt{x5}{USB host - connector.}\opt{m5}{USB and charging connector}.} + remote connector. Below this is a cover which protects the \opt{iaudiox5}{USB host + connector.}\opt{iaudiom5}{USB and charging connector}.} % - \opt{e200}{ + \opt{sansae200}{ Hold the \dap{} with the turning wheel at the front and bottom. On the bottom left of the front of the \dap{} is a raised round button, the \ButtonPower{} button. Above and to the left of this, on the outside of the turning wheel are four @@ -329,7 +329,7 @@ other buttons have any effect. Just to the left of the \ButtonHold{} switch is a small hole which contains the internal microphone.} % - \opt{c200}{ + \opt{sansac200}{ Hold the \dap{} with the buttons on the right and the screen on the left. On the right side of the unit, there is a series of four connected buttons that form a square. The four sides of the square are the \ButtonUp{}, @@ -351,7 +351,7 @@ Immediately above the headphone socket is a lanyard loop and the microphone. } % - \opt{clip}{ + \opt{sansaclip}{ Hold the \dap{} with the controls on the bottom and the screen on the top. The main controls are a four-way pad with a button in the centre; pressing this centre button functions as \ButtonSelect{}. Going clockwise from the top, the four-way pad contains @@ -369,7 +369,7 @@ above this button is the headphone jack. } % - \opt{player}{ + \opt{archosplayer}{ The main controls of this player are a four-way button on the right below the screen, and two round buttons to the left of it. Hold the \dap{} with these controls on the bottom and facing you. @@ -384,7 +384,7 @@ the DC-In jack on the right, and the USB connector in the centre. } % - \opt{recorder}{ + \opt{archosrecorder}{ Holding the Jukebox in front of you, there should be three rectangular buttons in a horizontal line towards the middle of the unit, and below this to the left there is a circular four button array with the circular \ButtonPlay{} button @@ -405,7 +405,7 @@ the right. On the bottom of the \dap{} is the Line-In jack on the left, the DC-In jack on the right, and the USB connector in the centre. } - \opt{recorderv2fm}{ + \opt{archosrecorderv2fm}{ Holding the Jukebox in front of you, there should be three rectangular buttons in a horizontal line towards the middle of the unit, and below this centred on the middle button there are four radial arc shaped buttons placed in a cross formation @@ -441,8 +441,8 @@ & Start Rockbox\\ \opt{IRIVER_H100_PAD,IRIVER_H300_PAD}{Long \ButtonOff}% \opt{IPOD_4G_PAD,IPOD_3G_PAD}{Long \ButtonPlay}% - \opt{ONDIO_PAD,recorderv2fm}{Long \ButtonOff}% - \opt{recorder}{Double tap \ButtonOff\ when playback is stopped}% + \opt{ONDIO_PAD,archosrecorderv2fm}{Long \ButtonOff}% + \opt{archosrecorder}{Double tap \ButtonOff\ when playback is stopped}% \opt{PLAYER_PAD}{From the Main Menu, select \textbf{Shutdown}}% \opt{IAUDIO_X5_PAD,IRIVER_H10_PAD,SANSA_E200_PAD,SANSA_C200_PAD,GIGABEAT_PAD,MROBE100_PAD,GIGABEAT_S_PAD,sansaAMS}% {Long \ButtonPower}% @@ -476,11 +476,11 @@ performed by inserting a paperclip gently into the Reset hole. }% -\nopt{gigabeatf,m3,m5,x5,archos} +\nopt{gigabeatfx,iaudiom3,iaudiom5,iaudiox5,archos} { \subsection{Starting the original firmware} \label{ref:Dualboot} - \opt{ipod4g,ipodcolor,ipodvideo,ipodnano,ipodmini} + \opt{ipod4g,ipodcolor,ipodvideo,ipodnano1g,ipodmini1g} { Rockbox has a dual-boot feature. To boot into the original firmware, shut down the device as described above. Turn on the \ButtonHold{} switch @@ -512,22 +512,22 @@ simultaneously until the player hard resets. } - \opt{h100,h300} + \opt{iriverh100,iriverh300} { Rockbox has a dual-boot feature. To boot into the original firmware, when the \dap{} is turned off, press and hold the \ButtonRec{} button, and then press the \ButtonOn{} button. } - \opt{h10,h10_5gb} + \opt{iriverh10,iriverh10_5gb} { Rockbox has a dual-boot feature. It loads the original firmware from the file \fname{/System/OF.mi4}. To boot into the original firmware, press and hold the \ButtonLeft{} button while turning on the player. \note{The iriver firmware does not shut down properly when you turn it off, it only goes to sleep. To get back into Rockbox when exiting from the - iriver firmware, you will need to reset the player by \opt{h10}{inserting a - pin in the reset hole}\opt{h10_5gb}{removing and reinserting the battery}.} + iriver firmware, you will need to reset the player by \opt{iriverh10}{inserting a + pin in the reset hole}\opt{iriverh10_5gb}{removing and reinserting the battery}.} } \opt{sansa,sansaAMS} Index: manual/rockbox_interface/wps.tex =================================================================== --- manual/rockbox_interface/wps.tex (revision 23773) +++ manual/rockbox_interface/wps.tex (working copy) @@ -30,7 +30,7 @@ \item Peak meter. \end{itemize} } -\opt{recorder,recorderv2fm,ondio}{ +\opt{archosrecorder,archosrecorderv2fm,ondio}{ \note{ \begin{itemize} \item The number of lines shown depends on the size of the font used. @@ -40,7 +40,7 @@ } } % -\opt{player}{ +\opt{archosplayer}{ \note{ \begin{itemize} \item Playlist index/Playlist size: Artist {}- Title. Index: manual/rockbox_interface/browsing_and_playing.tex =================================================================== --- manual/rockbox_interface/browsing_and_playing.tex (revision 23773) +++ manual/rockbox_interface/browsing_and_playing.tex (working copy) @@ -35,7 +35,7 @@ on the \dap{}. } -\opt{h10,h10_5gb}{\note{ +\opt{iriverh10,iriverh10_5gb}{\note{ If your \dap{} is a MTP model, the Music directory where all your music is stored may be hidden in the \setting{File Browser}. This may be fixed by either either changing its properties (on a computer) to not hidden, or by changing @@ -78,7 +78,7 @@ & If there is an audio file playing, returns to the \setting{While Playing Screen} (WPS) without stopping playback.\\ % - \nopt{player,c200}% + \nopt{archosplayer,sansac200}% {% \ActionTreeStop \opt{HAVEREMOTEKEYMAP}{& \ActionRCTreeStop} @@ -317,7 +317,7 @@ \end{table} } -\opt{player}{ +\opt{archosplayer}{ The current text line to be entered or edited is always listed on the first line of the display. The second line of the display can contain the character selection bar, as in the screenshot above. Index: manual/getting_started/iaudio_install.tex =================================================================== --- manual/getting_started/iaudio_install.tex (revision 23773) +++ manual/getting_started/iaudio_install.tex (working copy) @@ -1,8 +1,8 @@ -The \playername{} has a built-in bootloader which performs the +The \archosplayername{} has a built-in bootloader which performs the firmware update and can also access the hard drive via USB. The Rockbox bootloader can therefore be very minimalistic, as it does not require it's own USB mode. This makes it less dangerous to install the Rockbox bootloader - as you can always restore it using the \playerman{} bootloader. + as you can always restore it using the \archosplayerman{} bootloader. \note{The Rockbox bootloader overwrites the original firmware, making it impossible to dual-boot.} @@ -11,9 +11,9 @@ \begin{itemize} \item Download the Rockbox bootloader binary from \url{http://download.rockbox.org/bootloader/iaudio/}. - \opt{x5}{Use the \fname{x5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5 - or X5L, use the \fname{x5\_fw.bin} file.} - \opt{m5}{Use the \fname{m5\_fw.bin} file.} - \opt{m3}{Use the \fname{cowon\_m3.bin} file.} + \opt{iaudiox5}{Use the \fname{iaudiox5v\_fw.bin} file if your \dap{} is a X5V. If it is a X5 + or X5L, use the \fname{iaudiox5\_fw.bin} file.} + \opt{iaudiom5}{Use the \fname{iaudiom5\_fw.bin} file.} + \opt{iaudiom3}{Use the \fname{cowon\_m3.bin} file.} \item Copy it to the \fname{FIRMWARE} directory on your \dap{}. \end{itemize} Index: manual/getting_started/installation.tex =================================================================== --- manual/getting_started/installation.tex (revision 23773) +++ manual/getting_started/installation.tex (working copy) @@ -6,16 +6,16 @@ \section{Before Starting} -\opt{e200}{\fixme{NOTE: These instructions will not work on the +\opt{sansae200}{\fixme{NOTE: These instructions will not work on the ``Rhapsody'' version of the E200 series (also known as E200R). Please follow the instructions at \url{http://www.rockbox.org/twiki/bin/view/Main/SansaE200RInstallation}.}} -\opt{ipodnano,ipodvideo,e200,c200}{ +\opt{ipodnano1g,ipodvideo,sansae200,sansac200}{ \begin{description} \item[Supported hardware versions.] - \opt{ipodnano}{ - The \playertype{} is available in multiple versions, not + \opt{ipodnano1g}{ + The \archosplayertype{} is available in multiple versions, not all of which run Rockbox. Rockbox presently runs only on the original Ipod Nano. Rockbox does \emph{not} run on the second, third, or fourth generation Ipod Nano. @@ -23,13 +23,13 @@ Apple's website: \url{http://www.info.apple.com/kbnum/n61688}. } \opt{ipodvideo}{ - The \playertype{} is the 5th/5.5th generation \playerman{} only. + The \archosplayertype{} is the 5th/5.5th generation \archosplayerman{} only. Rockbox does \emph{not} run on the newer, 6th/Classic generation Ipod. For information on identifying which Ipod you own, see this page on Apple's website: \url{http://www.info.apple.com/kbnum/n61688}. } - \opt{e200,c200}{ - The \playertype{} is available in multiple versions, not + \opt{sansae200,sansac200}{ + The \archosplayertype{} is available in multiple versions, not all of which run Rockbox. Rockbox doesn't run on the newer v2 models. They can be identified by checking the Sandisk firmware version number under @@ -39,7 +39,7 @@ \end{description} } -\opt{h300}{ +\opt{iriverh300}{ \begin{description} \item[DRM capability.] If your \dap{} has a US firmware, then by installing Rockbox you will \emph{permanently} lose the ability to playback files with DRM. @@ -77,7 +77,7 @@ and hold the \ButtonSelect{} and \ButtonPlay{} buttons simultaneously. Your \dap{} should enter disk mode and you can try reconnecting to the computer. } - \opt{x5}{ + \opt{iaudiox5}{ When instructed to connect/disconnect the USB cable, always use the USB port through the subpack, not the side 'USB Host' port. The side port is intended to be used for USB OTG connections only (digital cameras, memory @@ -89,15 +89,15 @@ \warn{Never extract files to your \dap{} while it is in recovery mode.} } - \opt{h10,h10_5gb}{ + \opt{iriverh10,iriverh10_5gb}{ The installation requires you to use UMS mode and so may require use of the UMS trick, whereby it is possible to force a MTP - \playertype{} to start up in UMS mode as follows: + \archosplayertype{} to start up in UMS mode as follows: \begin{enumerate} - \item Ensure the \dap{} is fully powered off by \opt{h10}{using a pin to + \item Ensure the \dap{} is fully powered off by \opt{iriverh10}{using a pin to push the small reset button inside the hole between the Hold switch and - remote control connector.}\opt{h10_5gb}{removing the battery and putting it back in again.} - \item Connect your \playertype{} to the computer using the data cable. + remote control connector.}\opt{iriverh10_5gb}{removing the battery and putting it back in again.} + \item Connect your \archosplayertype{} to the computer using the data cable. \item Hold \ButtonRight{} and push \ButtonPower{} to turn the \dap{} on. \item Continue holding \ButtonRight{} until the USB Connected screen appears. \item The \dap{} will now appear as a regular disk on your computer. @@ -105,7 +105,7 @@ \note{Once Rockbox has been installed, when you shut down your \dap{} from Rockbox it will totally power the player off so step 1 is no longer necessary.} } - \opt{gigabeatf}{During installation, do not connect your \dap{} + \opt{gigabeatfx}{During installation, do not connect your \dap{} using the cradle but plug the USB cable directly to the \dap{}. } \end{description} @@ -141,7 +141,7 @@ still available to you.\\ \opt{gigabeats}{\note{The automated install is not yet available for the - \playertype{}. For now you can use the manual method to install Rockbox. + \archosplayertype{}. For now you can use the manual method to install Rockbox. Please still read the section on the automatic install as it explains various important aspects of Rockbox, such as the different versions available.\\}} @@ -156,31 +156,31 @@ \begin{description} \opt{HAVE_RB_BL_ON_DISK}{ -\item[The \playerman{} bootloader.] - The \playerman{} bootloader is the program that tells your \dap{} how to load +\item[The \archosplayerman{} bootloader.] + The \archosplayerman{} bootloader is the program that tells your \dap{} how to load and start the original firmware. It is also responsible for any emergency, recovery, or disk modes on your \dap{}. This bootloader is stored in special flash - memory in your \playerman{} and comes factory-installed. It is not necessary + memory in your \archosplayerman{} and comes factory-installed. It is not necessary to modify this in order to install Rockbox.} \item[The Rockbox bootloader.] \index{Bootloader} \opt{HAVE_RB_BL_ON_DISK}{The Rockbox bootloader is loaded from disk by - the \playerman{} bootloader. It is responsible for loading the Rockbox + the \archosplayerman{} bootloader. It is responsible for loading the Rockbox firmware and for providing the dual boot function. It directly replaces the - \playerman{} firmware in the \daps{} boot sequence. - \opt{gigabeatf}{\note{Dual boot does not currently work on the Gigabeat.}}} + \archosplayerman{} firmware in the \daps{} boot sequence. + \opt{gigabeatfx}{\note{Dual boot does not currently work on the Gigabeat.}}} \opt{HAVE_RB_BL_IN_FLASH}{ The bootloader is the program that tells your \dap{} how to load and start other components of Rockbox and for providing the dual boot function. This is the component of Rockbox that is installed - to the flash memory of your \playerman. - \opt{iaudio}{\note{Dual boot does not currently work on the \playertype{}.}}} + to the flash memory of your \archosplayerman. + \opt{iaudio}{\note{Dual boot does not currently work on the \archosplayertype{}.}}} \item[The Rockbox firmware.] - \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \playerman{} firmware, which runs + \opt{HAVE_RB_BL_IN_FLASH}{Unlike the \archosplayerman{} firmware, which runs entirely from flash memory,} - \opt{HAVE_RB_BL_ON_DISK}{Similar to the \playerman{} firmware,} + \opt{HAVE_RB_BL_ON_DISK}{Similar to the \archosplayerman{} firmware,} most of the Rockbox code is contained in a ``build'' that resides on your \daps{} drive. This makes it easy to update Rockbox. The build consists of a directory called @@ -190,7 +190,7 @@ \end{description} } -\nopt{player} { +\nopt{archosplayer} { Apart from the required parts there are some addons you might be interested in installing. \begin{description} @@ -214,7 +214,7 @@ (``Minimal Installation''). \item Automatically install all suggested components (``Complete Installation''). \item Selectively install optional components. -\nopt{player}{\item Install additional fonts and themes.} +\nopt{archosplayer}{\item Install additional fonts and themes.} \item Install voice files and generate talk clips. \item Uninstall all components you installed using Rockbox Utility. \end{itemize} @@ -232,35 +232,35 @@ \opt{ipodvideo} {\note{Autodetection is unable to distinguish between the - \playerman{} 30~GB and 60~GB / 80~GB models and defaults to the + \archosplayerman{} 30~GB and 60~GB / 80~GB models and defaults to the 30~GB model. This will usually work but you might want to check the detected value, especially if you experience problems with Rockbox.} } -\opt{h100,h300}{ +\opt{iriverh100,iriverh300}{ Rockbox Utility will ask you for a compatible copy of the original firmware. This is because for legal reasons we cannot distribute the bootloader directly. Instead, we have to patch the Iriver firmware with the Rockbox bootloader. Download a supported version of the Iriver firmware for your - \playername{} from the Iriver website, links can be found on + \archosplayername{} from the Iriver website, links can be found on \wikilink{IriverBoot}. Supported Iriver firmware versions currently include - \opt{h100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, + \opt{iriverh100}{1.63US, 1.63EU, 1.63K, 1.65US, 1.65EU, 1.65K, 1.66US, 1.66EU and 1.66K. Note that the H140 uses the same firmware as the H120; H120 and H140 owners should use the firmware called \fname{ihp\_120.hex}. Likewise, the iHP110 and iHP115 use the same firmware, called \fname{ihp\_100.hex}. Be sure to use the correct firmware file for your player.} - \opt{h300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU. - \note{The US \playername{} firmware is not supported and cannot be + \opt{iriverh300}{1.28K, 1.28EU, 1.28J, 1.29K, 1.29J and 1.30EU. + \note{The US \archosplayername{} firmware is not supported and cannot be patched to be used with the bootloader. If you wish to install Rockbox - on a US \playername{}, you must first install a non-US version of the + on a US \archosplayername{}, you must first install a non-US version of the original firmware and then install one of the supported versions patched with the Rockbox bootloader.} - \warn{Installing a non-US firmware on a US \playername{} will + \warn{Installing a non-US firmware on a US \archosplayername{} will \emph{permanently} remove DRM support from the player.}} If the file that you downloaded is a \fname{.zip} file, use an unzip @@ -339,7 +339,7 @@ \dap{}.}} \item Connect your \dap{} to the computer via USB - \opt{ipod3g,ipod4g,ipodmini,ipodcolor}{ or Firewire} as described in + \opt{ipod3g,ipod4g,ipodmini1g,ipodcolor}{ or Firewire} as described in the manual that came with your \dap{}. \item Take the \fname{.zip} file that you downloaded and use @@ -370,18 +370,18 @@ \opt{swcodec}{\nopt{gigabeats}{ \subsubsection{Installing the bootloader} - \opt{h100,h300}{\input{getting_started/iriver_install.tex}} + \opt{iriverh100,iriverh300}{\input{getting_started/iriver_install.tex}} \opt{ipod}{\input{getting_started/ipod_install.tex}} - \opt{m3,m5,x5}{\input{getting_started/iaudio_install.tex}} - \opt{h10,h10_5gb}{\input{getting_started/h10_install.tex}} - \opt{gigabeatf}{\input{getting_started/gigabeat_install.tex}} + \opt{iaudiom3,iaudiom5,iaudiox5}{\input{getting_started/iaudio_install.tex}} + \opt{iriverh10,iriverh10_5gb}{\input{getting_started/h10_install.tex}} + \opt{gigabeatfx}{\input{getting_started/gigabeat_install.tex}} \opt{sansa}{\input{getting_started/sansa_install.tex}} \opt{mrobe100}{\input{getting_started/mrobe100_install.tex}} }} \subsection{Finishing the install}\label{ref:finish_install} -\opt{gigabeatf}{ +\opt{gigabeatfx}{ After installing you \emph{need} to power-cycle the \dap{} by doing the following steps. Failure to do so may result in problems. \begin{itemize} @@ -394,7 +394,7 @@ \end{itemize} } -\opt{m3,m5,x5}{ +\opt{iaudiom3,iaudiom5,iaudiox5}{ After installing you \emph{need} to power-cycle the \dap{} by doing the following steps. \begin{itemize} @@ -407,7 +407,7 @@ \end{itemize} } -\opt{h10,h10_5gb,ipod,mrobe100,sansa,archos}{ +\opt{iriverh10,iriverh10_5gb,ipod,mrobe100,sansa,archos}{ Safely eject / unmount the USB drive, unplug the cable and restart. } @@ -415,7 +415,7 @@ Safely eject / unmount your \dap{}. } -\opt{h100,h300}{ +\opt{iriverh100,iriverh300}{ \begin{itemize} \item Safely eject / unmount your \dap{}. @@ -426,14 +426,14 @@ the jukebox on. Press and hold the \ButtonSelect{} button to enter the main menu, and navigate to \setting{General $\rightarrow$ Firmware Upgrade}. Select \setting{Yes} when asked to confirm if you want to upgrade the - firmware. The \playerman{} will display a message indicating that the + firmware. The \archosplayerman{} will display a message indicating that the firmware update is in progress. Do \emph{not} interrupt this process. When the firmware update is complete the player will turn itself off. (The update firmware process usually takes a minute or so.). You are now ready to go. \end{itemize} } -\opt{e200}{Your e200 will automatically reboot and Rockbox should load.} +\opt{sansae200}{Your e200 will automatically reboot and Rockbox should load.} @@ -463,10 +463,10 @@ \opt{gigabeats}{Rockbox should automatically load when you turn on your player.\\ \note{ - If you have loaded music onto your \dap{} using the \playerman{} + If you have loaded music onto your \dap{} using the \archosplayerman{} firmware, you will not be able to see your music properly in the \setting{File Browser} as MTP mode changes the location and file names. - Files placed on your \dap{} using the \playerman{} firmware can be + Files placed on your \dap{} using the \archosplayerman{} firmware can be viewed by initialising and using Rockbox's database. See \reference{ref:database} for more information.} } @@ -482,7 +482,7 @@ } } -\opt{m3}{ +\opt{iaudiom3}{ \fixme{Add a note about the charging trick and place it here?} } @@ -512,7 +512,7 @@ \section{Uninstalling Rockbox}\index{Installation!uninstall} -\nopt{gigabeatf,m5,x5,archos,mrobe100,gigabeats}{ +\nopt{gigabeatfx,iaudiom5,iaudiox5,archos,mrobe100,gigabeats}{ \note{The Rockbox bootloader allows you to choose between Rockbox and the original firmware. (See \reference{ref:Dualboot} for more information.)} } @@ -524,37 +524,37 @@ installed Rockbox manually you can still use Rockbox Utility for uninstallation but will not be able to do this selectively. -\opt{h100,h300}{\note{Rockbox Utility cannot uninstall the bootloader due to +\opt{iriverh100,iriverh300}{\note{Rockbox Utility cannot uninstall the bootloader due to the fact that it requires a flashing procedure. To uninstall the bootloader completely follow the manual uninstallation instructions below.}} \subsection{Manual Uninstallation} \opt{archos}{ - If you would like to go back to using the original \playerman{} software, + If you would like to go back to using the original \archosplayerman{} software, connect the \dap{} to your computer, and delete the \fname{\firmwarefilename} file. } -\opt{h10,h10_5gb}{ - If you would like to go back to using the original \playerman{} software, +\opt{iriverh10,iriverh10_5gb}{ + If you would like to go back to using the original \archosplayerman{} software, connect the \dap{} to your computer, and delete the - \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} file and rename - \fname{OF.mi4} to \opt{h10}{\fname{H10\_20GC.mi4}}\opt{h10_5gb}{\fname{H10.mi4}} - in the \fname{System} directory on your \playertype{}. As in the installation, + \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} file and rename + \fname{OF.mi4} to \opt{iriverh10}{\fname{H10\_20GC.mi4}}\opt{iriverh10_5gb}{\fname{H10.mi4}} + in the \fname{System} directory on your \archosplayertype{}. As in the installation, it may be necessary to first put your device into UMS mode. } \opt{mrobe100}{ - If you would like to go back to using the original \playerman{} software, + If you would like to go back to using the original \archosplayerman{} software, connect the \dap{} to your computer, and delete the \fname{pp5020.mi4} file and rename \fname{OF.mi4} to \fname{pp5020.mi4} - in the \fname{System} directory on your \playertype{}. + in the \fname{System} directory on your \archosplayertype{}. } -\opt{e200}{ - If you would like to go back to using the original \playerman{} software, +\opt{sansae200}{ + If you would like to go back to using the original \archosplayerman{} software, connect the \dap{} to your computer, and follow the instructions to install the bootloader, but when prompted by sansapatcher, enter \texttt{u} for uninstall, instead of \texttt{i} for install. As in the installation, it may be necessary to @@ -568,26 +568,26 @@ instead of \texttt{i} for install. } -\opt{m5,x5}{ - If you would like to go back to using the original \playerman{} software, - connect the \dap{} to your computer, download the original \playername{} - firmware from the \playerman{} website, and copy it to the \fname{FIRMWARE} - directory on your \playername{}. Turn off the \dap{}, remove the USB cable +\opt{iaudiom5,iaudiox5}{ + If you would like to go back to using the original \archosplayerman{} software, + connect the \dap{} to your computer, download the original \archosplayername{} + firmware from the \archosplayerman{} website, and copy it to the \fname{FIRMWARE} + directory on your \archosplayername{}. Turn off the \dap{}, remove the USB cable and insert the charger. The original firmware will automatically be flashed. } -\opt{h100,h300}{ +\opt{iriverh100,iriverh300}{ If you want to remove the Rockbox bootloader, simply flash an unpatched - \playerman{} firmware. Be aware that doing so will also remove the bootloader + \archosplayerman{} firmware. Be aware that doing so will also remove the bootloader USB mode. As that mode can come in quite handy (especially if you experience disk errors) it is recommended to keep the bootloader. It also gives you the possibility of trying Rockbox anytime later by simply installing the distribution files. - \opt{h100}{ + \opt{iriverh100}{ The Rockbox bootloader will automatically start the original firmware if the \fname{.rockbox} directory has been deleted. } - \opt{h300}{ + \opt{iriverh300}{ Although if you retain the Rockbox bootloader, you will need to hold the \ButtonRec{} button each time you want to start the original firmware. } @@ -596,8 +596,8 @@ \nopt{gigabeats}{ If you wish to clean up your disk, you may also wish to delete the \fname{.rockbox} directory and its contents. - \nopt{m5,x5}{Turn the \playerman{} off. - Turn the \dap{} back on and the original \playerman{} software will load.} + \nopt{iaudiom5,iaudiox5}{Turn the \archosplayerman{} off. + Turn the \dap{} back on and the original \archosplayerman{} software will load.} } \opt{gigabeats}{ @@ -605,7 +605,7 @@ \fname{.rockbox} directory and its contents, this must be done before uninstalling the bootloader in the next step. - Before installation you should have downloaded a copy of the \playerman{} + Before installation you should have downloaded a copy of the \archosplayerman{} firmware from \url{http://www.tacp.toshiba.com/tacpassets-images/firmware/MESV12US.zip}. \begin{itemize} @@ -633,7 +633,7 @@ please ensure that you are either logged in as an administrator (Windows), or you have root rights (Linux)} -\opt{h100,h300}{ +\opt{iriverh100,iriverh300}{ \item[Immediately loading original firmware.] If the original firmware is immediately loaded without the Rockbox bootloader appearing first, then the Rockbox bootloader @@ -641,10 +641,10 @@ the update if the filename is correct, including case. Make sure that the patched Iriver firmware is called \fname{.hex}.} -\nopt{h100,h300}{\item[``File Not Found'']} -\opt{h100,h300}{\item[``-1 error'']} +\nopt{iriverh100,iriverh300}{\item[``File Not Found'']} +\opt{iriverh100,iriverh300}{\item[``-1 error'']} If you receive a - \nopt{h100,h300}{``File Not Found''}\opt{h100,h300}{``-1 error''} from the + \nopt{iriverh100,iriverh300}{``File Not Found''}\opt{iriverh100,iriverh300}{``-1 error''} from the bootloader, then the bootloader cannot find the Rockbox firmware. This is usually a result of not extracting the contents of the \fname{.zip} file to the proper location, and should not happen when Rockbox has been Index: manual/getting_started/main.tex =================================================================== --- manual/getting_started/main.tex (revision 23773) +++ manual/getting_started/main.tex (working copy) @@ -60,7 +60,7 @@ consistent through