Only in /home/dast/src/rockbox: CVS Only in /home/dast/src/rockbox: CVSROOT Only in /home/dast/src/rockbox/apps: CVS Only in /home/dast/src/rockbox/apps: FILES diff -rubBP /home/dast/src/rockbox/apps/Makefile ./apps/Makefile --- /home/dast/src/rockbox/apps/Makefile Wed Nov 19 08:14:19 2003 +++ ./apps/Makefile Mon Nov 24 03:49:11 2003 @@ -1,12 +1,3 @@ -# __________ __ ___. -# Open \______ \ ____ ____ | | _\_ |__ _______ ___ -# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / -# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < -# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ -# \/ \/ \/ \/ \/ -# $Id: Makefile,v 1.56 2003/11/19 07:14:19 bagder Exp $ -# - # $@ is the name to the left of the colon # $> is the first name to the right of the colon @@ -25,17 +16,9 @@ CFLAGS = -O -W -Wall -m1 -nostdlib -ffreestanding -Wstrict-prototypes \ -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) \ --DAPPSVERSION=\"$(VERSION)\" $(EXTRA_DEFINES) -DMEM=${MEM} -DPLUGIN=1 +-DAPPSVERSION=\"$(VERSION)\" -DAPPSBUILD=\"$(BUILD)\" $(EXTRA_DEFINES) -DPLUGIN=1 AFLAGS += -small -relax -# Check if this is a kind of Recorder -ANYREC = $(findstring RECORDER, $(TARGET)) - -ifndef MEM - # if MEM is not set, assume 2MB - MEM=2 -endif - LDS := $(FIRMWARE)/app.lds ifdef DEBUG @@ -45,24 +28,9 @@ SRC := $(wildcard *.c) -ifeq ($(TARGET), -DARCHOS_FMRECORDER) - SCRAMBLE_OPT = -fm -endif -ifeq ($(TARGET), -DARCHOS_RECORDERV2) - SCRAMBLE_OPT = -v2 -endif - -ifeq ($(ANYREC), RECORDER) - SRC += $(wildcard recorder/*.c) - CFLAGS += -Irecorder - OUTNAME = ajbrec.ajz -else - SRC += $(wildcard player/*.c) - CFLAGS += -Iplayer - OUTNAME = archos.mod -endif +OUTNAME = OpenNeo.bin -OBJS := $(OBJDIR)/lang.o $(SRC:%.c=$(OBJDIR)/%.o) +OBJS := $(OBJDIR)/lang.o $(OBJDIR)/crt0.o $(SRC:%.c=$(OBJDIR)/%.o) LINKFILE = $(OBJDIR)/linkage.lds @@ -71,57 +39,39 @@ @echo "Don't run make here. Run the tools/configure script from your own build" @echo "directory, then run make there." @echo - @echo "More help on how to build rockbox can be found here:" - @echo "http://rockbox.haxx.se/docs/how_to_compile.html" + @echo "More help on how to build Open Neo can be found here:" + @echo "http://ssiamerica.com/open/" endif ifndef TOOLSDIR TOOLSDIR=../tools endif -all : $(OBJDIR)/$(OUTNAME) $(OBJDIR)/rockbox.ucl rocks +all : $(OBJDIR)/$(OUTNAME) $(OBJDIR)/openneo.bin -rocks: - $(MAKE) -C plugins TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" MEM=${MEM} +$(OBJDIR)/libopenneo.a: + make -C $(FIRMWARE) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) -$(OBJDIR)/librockbox.a: - make -C $(FIRMWARE) TARGET=$(TARGET) DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) - -# MEM should be passed on to this makefile with the chosen memory size given -# in number of MB $(LINKFILE): $(LDS) - cat $< | $(CC) -DMEMORYSIZE=$(MEM) $(DEFINES) -E -P - >$@ + cat $< | $(CC) $(DEFINES) -E -P - >$@ -$(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(OBJDIR)/librockbox.a - $(CC) -Os -nostdlib -o $@ $(OBJS) -L$(OBJDIR) -lrockbox -lgcc -L$(FIRMWARE) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map +$(OBJDIR)/openneo.elf : $(OBJS) $(LINKFILE) $(OBJDIR)/libopenneo.a + $(CC) -Os -nostdlib -o $@ $(OBJS) -L$(OBJDIR) -lopenneo -lgcc -L$(FIRMWARE) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/openneo.map -$(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf +$(OBJDIR)/openneo.bin : $(OBJDIR)/openneo.elf $(OC) -O binary $< $@ -$(OBJDIR)/rockbox.asm: $(OBJDIR)/rockbox.bin +$(OBJDIR)/openneo.asm: $(OBJDIR)/openneo.bin $(TOOLSDIR)/sh2d -sh1 $< > $@ -$(OBJDIR)/$(OUTNAME) : $(OBJDIR)/rockbox.bin - $(TOOLSDIR)/scramble $(SCRAMBLE_OPT) $< $@ - -$(OBJDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin - @a=`uclpack -h 2>/dev/null`; \ - if test -n "$$a"; then \ - echo uclpack --best --2e $< $@ ; \ - uclpack --best --2e $< $@ >/dev/null 2>&1; \ - else \ - echo "no uclpack command found, makes a fake UCL file"; \ - echo "fake" > $@; \ - fi +$(OBJDIR)/$(OUTNAME): $(OBJDIR)/openneo.bin + $(TOOLSDIR)/add_header $< $@ -$(OBJDIR)/credits.raw: $(DOCSDIR)/CREDITS - perl credits.pl < $< > $@ - -$(OBJDIR)/credits.o: credits.c credits.h $(OBJDIR)/credits.raw +$(OBJDIR)/%.o: %.c @mkdir -p `dirname $@` $(CC) $(CFLAGS) -c $< -o $@ -$(OBJDIR)/%.o: %.c +$(OBJDIR)/%.o: %.S @mkdir -p `dirname $@` $(CC) $(CFLAGS) -c $< -o $@ @@ -133,20 +83,15 @@ $(CC) $(CFLAGS) -c $(OBJDIR)/lang.c -o $@ clean: - -rm -f $(OBJS) $(OBJDIR)/$(OUTNAME) $(OBJDIR)/rockbox.asm \ - $(OBJDIR)/rockbox.bin $(OBJDIR)/rockbox.elf $(OBJDIR)/*.map \ + -rm -f $(OBJS) $(OBJDIR)/$(OUTNAME) $(OBJDIR)/openneo.asm \ + $(OBJDIR)/openneo.bin $(OBJDIR)/openneo.elf $(OBJDIR)/*.map \ $(OBJDIR)/lang.o $(OBJDIR)/build.lang $(OBJDIR)/lang.[ch] \ - $(OBJDIR)/credits.raw $(LINKFILE) $(OBJDIR)/rockbox.ucl + $(LINKFILE) -$(RM) -r $(OBJDIR)/$(DEPS) - $(MAKE) -C plugins clean + rm -rf *~ DEPS:=.deps DEPDIRS:=$(DEPS) -ifeq ($(ANYREC), RECORDER) - DEPDIRS += $(DEPS)/recorder -else - DEPDIRS += $(DEPS)/player -endif DIRS = $(subst $(DEPS),".",$(DEPDIRS)) Only in /home/dast/src/rockbox/apps: README Only in /home/dast/src/rockbox/apps: alarm_menu.c Only in /home/dast/src/rockbox/apps: alarm_menu.h diff -rubBP /home/dast/src/rockbox/apps/applimits.h ./apps/applimits.h --- /home/dast/src/rockbox/apps/applimits.h Fri Aug 29 13:49:54 2003 +++ ./apps/applimits.h Wed Oct 29 15:11:59 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: applimits.h,v 1.3 2003/07/01 21:03:28 hardeeps Exp $ - * - * Copyright (C) 2002 Linus Nielsen Feltzing - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #ifndef _APPLIMITS_H_ #define _APPLIMITS_H_ Only in /home/dast/src/rockbox/apps: credits.c Only in /home/dast/src/rockbox/apps: credits.h Only in /home/dast/src/rockbox/apps: credits.pl diff -rubBP /home/dast/src/rockbox/apps/crt0.S ./apps/crt0.S --- /home/dast/src/rockbox/apps/crt0.S Thu Jan 1 01:00:00 1970 +++ ./apps/crt0.S Wed Oct 29 15:11:59 2003 @@ -0,0 +1,104 @@ + .section .init.text + .global start +start: + /* copy vector table first */ + mov.l vbr_k,r1 + ldc r1,vbr + + /* Now let's get on with the normal business */ + mov.l stack_k,r15 + + /* zero out bss */ + mov.l edata_k,r0 + mov.l end_k,r1 + mov #0,r2 +start_l: + mov.l r2,@r0 + add #4,r0 + cmp/ge r1,r0 + bf start_l + nop + + /* copy the .data section */ + mov.l datacopy_k,r0 + mov.l data_k,r1 + mov.l dataend_k,r2 +copy_l: + mov.l @r0,r3 + mov.l r3,@r1 + add #4,r0 + add #4,r1 + cmp/ge r2,r1 + bf copy_l + nop + + /* copy the .iram section */ + mov.l iramcopy_k,r0 + mov.l iram_k,r1 + mov.l iramend_k,r2 +copy_l2: + mov.l @r0,r3 + mov.l r3,@r1 + add #4,r0 + add #4,r1 + cmp/ge r2,r1 + bf copy_l2 + nop + + /* Munge the main thread stack */ + mov.l stack_k,r2 + mov.l deadbeef_k,r0 + mov.l stackbegin_k,r1 +munge_loop: + mov.l r0,@r1 + add #4,r1 + cmp/ge r2,r1 + bf munge_loop + nop + + mov #0,r0 + ldc r0,gbr + + ! call the mainline + mov.l main_k,r0 + jmp @r0 + nop +.hoo: + bra .hoo + + .align 2 +stack_k: + .long _stackend +stackbegin_k: + .long _stackbegin +deadbeef_k: + .long 0xdeadbeef +edata_k: + .long _edata +end_k: + .long _end +iramcopy_k: + .long _iramcopy +iram_k: + .long _iramstart +iramend_k: + .long _iramend +datacopy_k: + .long _datacopy +data_k: + .long _datastart +dataend_k: + .long _dataend +main_k: + .long _main +vbr_k: + .long vectors +orig_vbr_k: + .long 0x00020000 + + .section .vectors +vectors: + .long start + .long _stackend + .long start + .long _stackend Only in /home/dast/src/rockbox/apps: debug_menu.c Only in /home/dast/src/rockbox/apps: debug_menu.h diff -rubBP /home/dast/src/rockbox/apps/info.c ./apps/info.c --- /home/dast/src/rockbox/apps/info.c Thu Jan 1 01:00:00 1970 +++ ./apps/info.c Fri Dec 5 01:13:20 2003 @@ -0,0 +1,141 @@ +#include "menu.h" +#include "lcd.h" +#include "button.h" +#include "remote.h" +#include "version.h" +#include "sprintf.h" +#include +#include "fat.h" +#include "buffer.h" +#include "lang.h" +#include "info.h" +#include "screens.h" +#include "mas.h" + + + +bool info_menu(void) +{ + int m; + bool result; + + struct menu_items items[] = { + { str(LANG_OPEN_NEO), neo_info }, + { str(LANG_MEMORY), memory_info }, + { str(LANG_HARD_DISK), hd_info }, + { str(LANG_MPEG_DECODER), mas_info }, + }; + + m=menu_init( items, sizeof items / sizeof(struct menu_items) ); + status_set_param(true); + result = menu_run(m); + status_set_param(false); + menu_exit(m); + return result; +} + +bool neo_info(void) +{ + char s[24]; + + lcd_clear_display(); + snprintf( s, sizeof(s), "[%s]", str(LANG_OPEN_NEO) ); + lcd_puts_fmt( 0, 0, s, FMT_CENTER ); + + display_field_value( 1, str(LANG_VERSION), appsversion ); + display_field_value( 2, "Build", appsbuild ); + display_field_value( 3, "Voice", str(LANG_SET_BOOL_NO) ); + + button_get_flt( true, BUTTON_ALL, BUTTON_ALL, BUTTON_ALL_FLAGS & ~BUTTON_REL ); + lcd_cancel_scroll(); + return false; +} + +bool memory_info(void) +{ + char s[24]; + unsigned int buflen = mp3end - mp3buf; + unsigned int integer, decimal; + + lcd_clear_display(); + snprintf( s, sizeof(s), "[%s]", str(LANG_MEMORY) ); + lcd_puts_fmt( 0, 0, s, FMT_CENTER ); + + integer = buflen >> 10; // 1024 = 0x400 + decimal = (buflen - (integer << 10 )) / 100; + snprintf(s, sizeof(s), "%d.%d KB", integer, decimal ); + + display_field_value( 2, "Used", s ); + + button_get_flt( true, BUTTON_ALL, BUTTON_ALL, BUTTON_ALL_FLAGS & ~BUTTON_REL ); + lcd_cancel_scroll(); + return false; +} +bool hd_info(void) +{ + char s[24]; + unsigned int integer, decimal, size, free; + char hdmodel[44]; + + /* Get ATA Disk Name */ + hdmodel[41] = 0; + strncpy( hdmodel, &((char*)ata_get_identify())[54], 40 ); + + //remove trailing spaces + if( strchr( hdmodel, ' ' ) ) + *(strchr( hdmodel, ' ' )) = 0; + + lcd_clear_display(); + snprintf( s, sizeof(s), "[%s]", str(LANG_HARD_DISK) ); + lcd_puts_fmt( 0, 0, s, FMT_CENTER ); + + display_field_value( 1, str(LANG_MODEL), hdmodel ); + + fat_size( &size, &free ); + + size >>= 10; + integer = size >> 10; + decimal = (size - ( integer << 10 )) / 100; + snprintf(s, sizeof s, str(LANG_GB_STAT), integer, decimal); + display_field_value( 2, "Capacity", s ); + + free >>= 10; + integer = free >> 10; + decimal = (free - ( integer << 10 )) / 100; + snprintf(s, sizeof s, str(LANG_GB_STAT), integer, decimal); + display_field_value( 3, str(LANG_FREE), s ); + + button_get_flt( true, BUTTON_ALL, BUTTON_ALL, BUTTON_ALL_FLAGS & ~BUTTON_REL ); + lcd_cancel_scroll(); + return false; +} + +bool mas_info(void) +{ + char s[24]; + char* rev; + + switch(mas_version.code ){ + case 0x0601: + rev = "F10"; + break; + case 0x701: + rev = "G10"; + break; + default: + rev=""; + } + + lcd_clear_display(); + snprintf(s, sizeof(s), "[%s]", str(LANG_MPEG_DECODER) ); + lcd_puts_fmt( 0, 0, s, FMT_CENTER ); + snprintf(s, sizeof s, "%x-%s", mas_version.name, rev ); + display_field_value( 1, str(LANG_MODEL), s ); + snprintf(s, sizeof s, "0x%x", mas_version.date ); + display_field_value( 2, "Date", s ); + display_field_value( 3, "Desc", mas_version.description ); + + button_get_flt( true, BUTTON_ALL, BUTTON_ALL, BUTTON_ALL_FLAGS & ~BUTTON_REL ); + lcd_cancel_scroll(); + return false; +} diff -rubBP /home/dast/src/rockbox/apps/info.h ./apps/info.h --- /home/dast/src/rockbox/apps/info.h Thu Jan 1 01:00:00 1970 +++ ./apps/info.h Tue Dec 2 21:59:15 2003 @@ -0,0 +1,11 @@ +#ifndef _INFO_H +#define _INFO_H + +bool info_menu(void); + +bool neo_info(void); +bool memory_info(void); +bool hd_info(void); +bool mas_info(void); + +#endif diff -rubBP /home/dast/src/rockbox/apps/keyboard.c ./apps/keyboard.c --- /home/dast/src/rockbox/apps/keyboard.c Thu Jan 1 01:00:00 1970 +++ ./apps/keyboard.c Wed Dec 3 14:09:39 2003 @@ -0,0 +1,283 @@ +#include "lcd.h" +#include "button.h" +#include "remote.h" +#include "kernel.h" +#include "version.h" +#include "sprintf.h" +#include +#include "lcd-charset.h" +#include "lang.h" +#include "debug.h" + +#define KEYBOARD_MAX_LENGTH 255 + +static unsigned char* kbd_screens[3] = { + "ABCDEFGHIJKLMNOPQRSTUVWXYZ", + "abcdefghijklmnopqrstuvwxyz", + " !\"#$%&'()*+,-./0123456789;<=>?@[]^_`{|}" +}; + +static unsigned char* kbd_screens_names[3] = { + "Capitals", + "Small", + "Others" +}; + +static void kbd_show_legend( int nb ) +{ + char buf[24]; + snprintf(buf, sizeof(buf), "[%s]", kbd_screens_names[nb] ); + lcd_puts_fmt( 0, 1, buf, FMT_RPADDED ); + lcd_puts_fmt( 0, 2, kbd_screens[nb], FMT_RPADDED ); + lcd_puts_fmt( 0, 3, &kbd_screens[nb][20], FMT_RPADDED ); +} + +/* returns text len + Max = KEYBOARD_MAX_LENGTH characters +*/ +int kbd_input( char* text, int buflen ) +{ + char* pstart; + char* pcursor; + char* pold; + int bufferlen; + char cursorpos = 0; + int ret = 0; + char buffer[KEYBOARD_MAX_LENGTH+1]; + bool done = false; + int key; + int screen = 0; + int screenidx = -1; + unsigned char * pcurscreen = kbd_screens[0]; + bool ctl; + + bufferlen = strlen(text); + + if( bufferlen > KEYBOARD_MAX_LENGTH ) + bufferlen = KEYBOARD_MAX_LENGTH; + + strncpy( buffer, text, bufferlen ); + buffer[bufferlen] = 0; + + lcd_clear_display(); + + //Initial setup + lcd_puts_nopad( 0, 0, buffer ); + kbd_show_legend( screen ); + lcd_cursor( cursorpos, 0 ); + lcd_write(true,LCD_BLINKCUR); + + pstart = pcursor = buffer; + + while(!done) { + + //We want all the keys except the releases and the repeats + key = button_get_flt( true, BUTTON_ALL, BUTTON_ALL, BUTTON_REPEAT|BUTTON_IR ); + + if( key & BUTTON_IR) + ctl = key & (IR_BUTTON_PLAY|IR_BUTTON_STOP|IR_BUTTON_BROWSE); + else + ctl = key & (BUTTON_PLAY|BUTTON_STOP|BUTTON_MENU); + + if( ctl ){ + + //These key do not change the first line + + switch( key ) { + case BUTTON_MENU: + case BUTTON_IR|IR_BUTTON_BROWSE: + + //Toggle legend screen + screen++; + if( screen == 3 ) + screen = 0; + + pcurscreen = kbd_screens[screen]; + + screenidx = -1; + kbd_show_legend( screen ); + + //Restore cursor + lcd_cursor( cursorpos, 0 ); + break; + + case BUTTON_PLAY: + case BUTTON_IR|IR_BUTTON_PLAY: + + if( bufferlen ){ + strncpy(text, buffer, bufferlen); + text[bufferlen] = 0; + ret = bufferlen; + } + + case BUTTON_STOP: + case BUTTON_IR|IR_BUTTON_STOP: + + //Remove blinking cursor + lcd_write(true,LCD_OFFCUR); + done = true; + } + } + else { + + switch( key ) { + + case BUTTON_PROGRAM: + case BUTTON_PROGRAM|BUTTON_REPEAT: + case BUTTON_IR|IR_BUTTON_PROGRAM: + + //Delete char at pcursor + + //Check if we are at the last char + if( *(pcursor+1) != 0 ) { + + //move rest of the string to the left in buffer + pold = pcursor; + while( *pcursor ){ + *pcursor = *(pcursor+1); + pcursor++; + } + + //Restore position + pcursor = pold; + } + else { + *pcursor = 0; + pcursor--; + cursorpos--; + } + + bufferlen--; + break; + + case BUTTON_IR|IR_BUTTON_EQ: + case BUTTON_SELECT|BUTTON_LEFT: + + //Insert left + + if(bufferlen >= KEYBOARD_MAX_LENGTH ) + break; + + pold = pcursor; + + //Goto end + while( *pcursor ) + pcursor++; + + //Move string content to the right + while( pcursor >= pold ){ + *(pcursor+1) = *pcursor; + pcursor--; + } + + pcursor = pold; + *pcursor = ' '; + + bufferlen++; + break; + + case BUTTON_IR|IR_BUTTON_MUTE: + case BUTTON_SELECT|BUTTON_RIGHT: + + //Insert Right + + if(bufferlen >= KEYBOARD_MAX_LENGTH ) + break; + + pold = pcursor; + + //Goto end + while( *pcursor ) + pcursor++; + + //Move string content to the right + while( pcursor > pold ){ + *(pcursor+1) = *pcursor; + pcursor--; + } + + pcursor = pold; + *(pcursor+1) = ' '; + + bufferlen++; + + button_add( BUTTON_RIGHT ); + break; + + case BUTTON_LEFT: + case BUTTON_REPEAT|BUTTON_LEFT: + case BUTTON_IR|IR_BUTTON_REWIND: + case BUTTON_IR|IR_BUTTON_REWIND|BUTTON_REPEAT: + + // Move cursor left + // Shift text right if all the way tot the left + + //Check for start of string + if( pcursor > buffer ) { + + screenidx = -1; + cursorpos--; + pcursor--; + + //Check if were going off the screen + if( cursorpos == -1 ) { + cursorpos = 0; + + //Shift text right if we are + pstart--; + } + } + break; + + case BUTTON_RIGHT: + case BUTTON_REPEAT|BUTTON_RIGHT: + case BUTTON_IR|IR_BUTTON_FFORWARD: + case BUTTON_IR|IR_BUTTON_FFORWARD|BUTTON_REPEAT: + + // Move cursor right + // Shift text left if all the way tot the right + + //Check for end of string + if( *(pcursor+1) != 0 ) { + + screenidx = -1; + cursorpos++; + pcursor++; + + //Check if were going of the screen + if( cursorpos == 20 ) { + cursorpos = 19; + + //Shift text left if we are + pstart++; + } + } + break; + + case BUTTON_UP: + case BUTTON_UP|BUTTON_REPEAT: + case BUTTON_IR|IR_BUTTON_VOLUP: + case BUTTON_IR|IR_BUTTON_VOLUP|BUTTON_REPEAT: + screenidx += 2; + case BUTTON_DOWN: + case BUTTON_DOWN|BUTTON_REPEAT: + case BUTTON_IR|IR_BUTTON_VOLDN: + case BUTTON_IR|IR_BUTTON_VOLDN|BUTTON_REPEAT: + screenidx--; + + if( screenidx < 0 ) + screenidx = strlen(pcurscreen)-1; + + if( pcurscreen[screenidx] == 0 ) + screenidx = 0; + + //Changes the character over the cursor + *pcursor = pcurscreen[screenidx]; + } + + lcd_puts_fmt( 0, 0, pstart, FMT_RPADDED ); + lcd_cursor( cursorpos, 0 ); + } + } + return ret; +} diff -rubBP /home/dast/src/rockbox/apps/keyboard.h ./apps/keyboard.h --- /home/dast/src/rockbox/apps/keyboard.h Wed Dec 4 16:04:42 2002 +++ ./apps/keyboard.h Wed Oct 29 15:12:00 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: keyboard.h,v 1.1 2002/12/04 15:04:42 zagor Exp $ - * - * Copyright (C) 2002 by Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #ifndef _KEYBOARD_H #define _KEYBOARD_H Only in /home/dast/src/rockbox/apps/lang: CVS diff -rubBP /home/dast/src/rockbox/apps/lang/czech.lang ./apps/lang/czech.lang --- /home/dast/src/rockbox/apps/lang/czech.lang Wed Nov 19 07:34:43 2003 +++ ./apps/lang/czech.lang Wed Oct 29 15:12:06 2003 @@ -1,8 +1,15 @@ -# Czech language file -# Based on english.lang version 1.91 -# Translated by Jiri Jurecek - - +# $Id: czech.lang,v 1.1.1.1 2003/10/29 14:12:06 knobby2346 Exp $ +# +# This is the czech language files. +# +# *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 'binlang' tool and the language loader code. +# id: LANG_SOUND_SETTINGS desc: in the main menu eng: "Sound Settings" @@ -11,7 +18,7 @@ id: LANG_GENERAL_SETTINGS desc: in the main menu eng: "General Settings" -new: "Obecné nastavení" +new: "Nastavení" id: LANG_GAMES desc: in the main menu @@ -108,11 +115,13 @@ eng: "Loading..." new: "Nahrávám..." +# NO LONGER USED id: LANG_PLAYLIST_SHUFFLE desc: displayed on screen while shuffling a playlist eng: "Shuffling..." new: "Promíchávání..." +# NO LONGER USED id: LANG_PLAYLIST_PLAY desc: displayed on screen when start playing a playlist eng: "Playing..." @@ -128,6 +137,7 @@ eng: "Buffer Full" new: "Zaplněný buffer" +# NO LONGER USED id: LANG_PLAYINDICES_AMOUNT desc: number of files in playlist eng: "%d Files" @@ -140,8 +150,8 @@ id: LANG_SETTINGS_BATTERY_PLAYER desc: if save settings has failed -eng: "Partition?" -new: "Disk.chyba?" +eng: "Batt. Low?" +new: "Vybitá bat?" id: LANG_SETTINGS_SAVE_RECORDER desc: displayed if save settings has failed @@ -150,8 +160,8 @@ id: LANG_SETTINGS_BATTERY_RECORDER desc: if save settings has failed -eng: "No partition?" -new: "Chyba disku?" +eng: "Is Battery Low?" +new: "Vybitá baterie?" id: LANG_TIME_SET desc: used in set_time() @@ -263,11 +273,13 @@ eng: "Follow Playlist" new: "Následování seznamu skladeb" +# depreciated id: LANG_RESET_ASK_PLAYER desc: confirm to reset settings eng: "" new: "Opravdu?" +# depreciated id: LANG_RESET_CONFIRM_PLAYER desc: confirm to reset settings eng: "" @@ -278,11 +290,13 @@ eng: "Are You Sure?" new: "Jste si jistý?" +# depreciated id: LANG_RESET_CONFIRM_RECORDER desc: confirm to reset settings eng: "" new: "Play=Vynulovat" +# depreciated id: LANG_RESET_CANCEL_RECORDER desc: confirm to reset settings eng: "OFF=Cancel" @@ -361,7 +375,7 @@ id: LANG_LOUDNESS desc: in sound_settings eng: "Loudness" -new: "Středy" +new: "Hlasitost" id: LANG_BBOOST desc: in sound settings @@ -430,12 +444,12 @@ id: LANG_RESUME_CONFIRM_RECORDER desc: possible answer to resume question -eng: "" +eng: "PLAY = Yes" new: "Play = Ano" id: LANG_RESUME_CANCEL_RECORDER desc: possible answer to resume question -eng: "" +eng: "Any Other = No" new: "Ostatní = Ne" id: LANG_KEYLOCK_ON_PLAYER @@ -451,32 +465,32 @@ id: LANG_KEYLOCK_ON_RECORDER desc: displayed when key lock is on eng: "Key Lock Is ON" -new: "Klávesy zamknuty" +new: "Klávesy aktivovány" id: LANG_KEYLOCK_OFF_RECORDER desc: displayed when key lock is turned off eng: "Key Lock Is OFF" -new: "Klávesy aktivovány" +new: "Klávesy zamknuty" id: LANG_MUTE_ON_PLAYER desc: displayed when mute is on eng: "Mute ON" -new: "Zvuk vyp." +new: "Zvuk zap." id: LANG_MUTE_OFF_PLAYER desc: displayed when mute is off -eng: "Mute OFF" -new: "Zvuk zap." +eng: "" +new: "Zvuk vyp." id: LANG_MUTE_ON_RECORDER desc: displayed when mute is on eng: "Mute Is ON" -new: "Zvuk vypnutý" +new: "Zvuk zapnutý" id: LANG_MUTE_OFF_RECORDER desc: displayed when mute is off eng: "Mute Is OFF" -new: "Zvuk zapnutý" +new: "Zvuk vypnutý" id: LANG_ID3_INFO desc: in the browse_id3() function @@ -660,117 +674,128 @@ id: LANG_SOKOBAN_LEVEL desc: must be smaller than 6 characters -eng: "" +eng: "Level" new: "Level" id: LANG_SOKOBAN_MOVE desc: must be smaller than 6 characters -eng: "" +eng: "Moves" new: "Tahů" id: LANG_SOKOBAN_WIN desc: displayed when you win -eng: "" +eng: "YOU WIN!!" new: "VYHRÁLS!!" id: LANG_SOKOBAN_QUIT desc: how to quit game -eng: "" +eng: "[OFF] To Stop" new: "[OFF] - konec" id: LANG_SOKOBAN_F1 desc: what does F1 do -eng: "" +eng: "[F1] - Level" new: "[F1] - Level" id: LANG_SOKOBAN_F2 desc: what does F2 do -eng: "" +eng: "[F2] Same Level" new: "[F2] - Stejný Level" id: LANG_SOKOBAN_F3 desc: what does F3 do -eng: "" +eng: "[F3] + Level" new: "[F3] + Level" +# Next ids are for Worlmet Game. +# Lenght restrictions for score board strings (LANG_SB_XXX): +# LCD_PROPFONTS: max 43 pixel +# fix font: max 7 characters + id: LANG_WORMLET_LENGTH desc: wormlet game -eng: "" +eng: "Len:%d" new: "Vel:%d" id: LANG_WORMLET_GROWING desc: wormlet game -eng: "" +eng: "Growing" new: "Roste" id: LANG_WORMLET_HUNGRY desc: wormlet game -eng: "" +eng: "Hungry" new: "Hladný" id: LANG_WORMLET_WORMED desc: wormlet game -eng: "" +eng: "Wormed" new: "Sežrán" id: LANG_WORMLET_ARGH desc: wormlet game -eng: "" +eng: "Argh" new: "Ups" id: LANG_WORMLET_CRASHED desc: wormlet game -eng: "" +eng: "Crashed" new: "Narazil" id: LANG_WORMLET_HIGHSCORE desc: wormlet game -eng: "" +eng: "Hs: %d" new: "Rek:%d" +# Length restrictions for wormlet config screen strings (LANG_CS_XXX) +# They must fit on the entire screen - preferably with the +# key names aligned right + id: LANG_WORMLET_PLAYERS desc: wormlet game -eng: "" +eng: "%d Players UP/DN" new: "%d hráč(ů) UP/DN" id: LANG_WORMLET_WORMS desc: wormlet game -eng: "" +eng: "%d Worms L/R" new: "%d červ(ů) L/P" id: LANG_WORMLET_REMOTE_CTRL desc: wormlet game -eng: "" +eng: "Remote Control F1" new: "Dálk. ovládání F1" id: LANG_WORMLET_NO_REM_CTRL desc: wormlet game -eng: "" +eng: "No Rem. Control F1" new: "Bez dálk. ovl. F1" id: LANG_WORMLET_2_KEY_CTRL desc: wormlet game -eng: "" +eng: "2 Key Control F1" new: "2 ovl.klávesy F1" id: LANG_WORMLET_4_KEY_CTRL desc: wormlet game -eng: "" +eng: "4 Key Control F1" new: "4 ovl.klávesy F1" id: LANG_WORMLET_NO_CONTROL desc: wormlet game -eng: "" +eng: "Out Of Control" new: "Bez ovládání" +# Wormlet game ids ended + id: LANG_TETRIS_LOSE desc: tetris game -eng: "" +eng: "You Lose!" new: "Dohráls!" id: LANG_TETRIS_LEVEL desc: tetris game -eng: "" +eng: "Rows - Level" new: "Řadků - Level" id: LANG_POWEROFF_IDLE @@ -873,6 +898,10 @@ eng: "OFF=Cancel" new: "OFF =Zachovat" +# NOTE: ignore this label. It is no longer used/was an error. +# We are aware of this and it will this instance will be removed in the future +id: LANG_TETRIS_LEVEL + id: LANG_TIMEFORMAT desc: select the time format of time in status bar eng: "Time Format" @@ -1061,7 +1090,7 @@ id: LANG_RECORDING desc: in the main menu eng: "Recording" -new: "Záznam" +new: "Nahrávání" id: LANG_RECORDING_GAIN desc: in the recording screen @@ -1116,7 +1145,7 @@ id: LANG_RECORDING_SETTINGS desc: in the main menu eng: "Recording Settings" -new: "Nastavení záznamu" +new: "Nastavení nahrávání" id: LANG_DISK_STAT desc: disk size info @@ -1507,273 +1536,3 @@ desc: (player) Delay before making a jump scroll eng: "Jump Scroll Delay" new: "Uvodní prodleva" - -id: LANG_BOOT_CHANGED -desc: File browser discovered the boot file was changed -eng: "Boot changed" -new: "Změněn firmware" - -id: LANG_CANCEL_WITH_ANY_RECORDER -desc: Generic recorder string to use to cancel -eng: "Any Other = No" -new: "Ostatní = Ne" - -id: LANG_CONFIRM_WITH_PLAY_RECORDER -desc: Generic recorder string to use to confirm -eng: "PLAY = Yes" -new: "Play = Ano" - -id: LANG_DISK_FULL -desc: in recording screen -eng: "The disk is full. Press OFF to continue." -new: "Disk je plný. Pro pokračování stiskněte OFF." - -id: LANG_FLIPIT -desc: in the games menu -eng: "Flipit" -new: "FlipIt" - -id: LANG_INSERT -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert" -new: "Vložit" - -id: LANG_INSERT_FIRST -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert next" -new: "Vložit za" - -id: LANG_INSERT_LAST -desc: in onplay menu. append a track/playlist into dynamic playlist. -eng: "Insert last" -new: "Vložit na konec" - -id: LANG_OFF_ABORT -desc: Used on recorder models -eng: "OFF to abort" -new: "OFF zrušit" - -id: LANG_OTHELO -desc: in the games menu -eng: "Othelo" -new: "Othelo" - -id: LANG_PLAYLIST_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist file" -new: "Chyba při přístupu k playlistu" - -id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist control file" -new: "Chyba přístupu k konf. souboru playlistu" - -id: LANG_PLAYLIST_CONTROL_INVALID -desc: Playlist resume error -eng: "Playlist control file is invalid" -new: "Konf. soubor playlistu je neplatný" - -id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR -desc: Playlist error -eng: "Error updating playlist control file" -new: "Chyba přístupu k konf. souboru playlistu" - -id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing directory" -new: "Chyba přístupu k adresáři" - -id: LANG_PLAYLIST_INSERT_COUNT -desc: splash number of tracks inserted -eng: "Inserted %d tracks (%s)" -new: "Vloženo %d skladeb (%s)" - -id: LANG_PLAYLIST_MENU -desc: in main menu. -eng: "Playlist Options" -new: "Nastavení playlistu" - -id: LANG_PLAYLIST_QUEUE_COUNT -desc: splash number of tracks queued -eng: "Queued %d tracks (%s)" -new: "Zařazeno %d skladeb (%s)" - -id: LANG_PLAYLIST_SAVE_COUNT -desc: splash number of tracks saved -eng: "Saved %d tracks (%s)" -new: "Uloženo %d skladeb (%s)" - -id: LANG_PLUGIN_CANT_OPEN -desc: Plugin open error message -eng: "Can't open %s" -new: "Chyba při otvírání %s" - -id: LANG_PLUGIN_ERROR -desc: The plugin return an error code -eng: "Plugin returned error" -new: "Plugin vrátil chybu" - -id: LANG_PLUGIN_WRONG_MODEL -desc: The plugin is not compatible with the archos model trying to run it -eng: "Incompatible model" -new: "Nekompatibilní model" - -id: LANG_PLUGIN_WRONG_VERSION -desc: The plugin is not compatible with the rockbox version trying to run it -eng: "Incompatible version" -new: "Nekompatibilní verze" - -id: LANG_QUEUE_FIRST -desc: in onplay menu. queue a track/playlist into dynamic playlist. -eng: "Queue next" -new: "Zařadit za" - -id: LANG_QUEUE_LAST -desc: in onplay menu. queue a track/playlist at end of playlist. -eng: "Queue last" -new: "Zařadit na konec" - -id: LANG_READ_FAILED -desc: There was an error reading a file -eng: "Failed reading %s" -new: "Chyba čtení %s" - -id: LANG_REBOOT_NOW -desc: Do you want to reboot? -eng: "Reboot now?" -new: "Restartovat nyní?" - -id: LANG_RECORD_TIMESPLIT -desc: Prompt for record timer interval setting, in the record settings menu -eng: "Time Split" -new: "Interval rozdělení" - -id: LANG_RECORD_TIMESPLIT_REC -desc: -eng: "Split time:" -new: "Interval rozdělení:" - -id: LANG_RECURSE_DIRECTORY -desc: In playlist menu -eng: "Recursively Insert Directories" -new: "Vkládat adresáře rekurzivně" - -id: LANG_SAVE_DYNAMIC_PLAYLIST -desc: in playlist menu. -eng: "Save Dynamic Playlist" -new: "Uložit dynamický playlist" - -id: LANG_SHOW_ICONS -desc: in settings_menu -eng: "Show Icons" -new: "Zobrazit ikony" - -id: LANG_SLIDING_PUZZLE -desc: in the games menu -eng: "Sliding Puzzle" -new: "Hra 15" - -id: LANG_STAR -desc: in the games menu -eng: "Star" -new: "Star" - -id: LANG_STOP_ABORT -desc: Used on player models -eng: "STOP to abort" -new: "STOP zrušit" - -id: LANG_RECURSE_DIRECTORY_QUESTION -desc: Asked from onplay screen -eng: "Recursively?" -new: "Rekurzivně?" - -id: LANG_BUTTONBAR_MENU -desc: in button bar -eng: "Menu" -new: "Menu" - -id: LANG_BUTTONBAR_OPTIONS -desc: in button bar -eng: "Option" -new: "Volby" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Mód auto adaptéru" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Konfigurace" - -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Fonty" - -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" -new: "Firmware" - -id: LANG_FM_BUTTONBAR_PRESETS -desc: in button bar -eng: "Preset" -new: "Předvolba" - -id: LANG_FM_DELETE_PRESET -desc: in radio screen -eng: "Remove preset" -new: "Vymaž předvolbu" - -id: LANG_FM_NO_FREE_PRESETS -desc: in radio screen -eng: "The preset list is full" -new: "Seznam předvoleb je plný" - -id: LANG_FM_NO_PRESETS -desc: in radio screen -eng: "The preset list is empty" -new: "Seznam přdvoleb je prázdný" - -id: LANG_FM_PRESET_SAVE_FAILED -desc: in radio screen -eng: "Preset save failed" -new: "Chyba při ukládání předvolby" - -id: LANG_FM_SAVE_PRESET -desc: in radio screen -eng: "Save preset" -new: "Uložit předvolbu" - -id: LANG_FM_STATION -desc: in radio screen -eng: "Station: %d.%dMHz" -new: "Stanice: %d.%dMHz" - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Jazyk" - -id: LANG_LINE_IN -desc: in settings_menu -eng: "Line In" -new: "Linkový vstup" - -id: LANG_NO_FILES -desc: in settings_menu -eng: "No files" -new: "Žádné soubory" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: "Pluginy" - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "Přehrávací obrazovka" diff -rubBP /home/dast/src/rockbox/apps/lang/deutsch.lang ./apps/lang/deutsch.lang --- /home/dast/src/rockbox/apps/lang/deutsch.lang Thu Dec 4 16:35:38 2003 +++ ./apps/lang/deutsch.lang Wed Oct 29 15:12:08 2003 @@ -1,4 +1,3 @@ -# $Id: deutsch.lang,v 1.30 2003/12/04 14:29:06 zagor Exp $ id: LANG_SOUND_SETTINGS desc: in the main menu @@ -137,6 +136,8 @@ id: LANG_SETTINGS_BATTERY_PLAYER desc: if save settings has failed +### English phrase was changed! Previous translation was made on: +### "Batt. Low?" eng: "Partition?" new: "Akku leer?" @@ -147,6 +148,8 @@ id: LANG_SETTINGS_BATTERY_RECORDER desc: if save settings has failed +### English phrase was changed! Previous translation was made on: +### "Is Battery Low?" eng: "No partition?" new: "Akku leer?" @@ -427,11 +430,15 @@ id: LANG_RESUME_CONFIRM_RECORDER desc: possible answer to resume question +### English phrase was changed! Previous translation was made on: +### "PLAY = Yes" eng: "" new: "PLAY = Ja" id: LANG_RESUME_CANCEL_RECORDER desc: possible answer to resume question +### English phrase was changed! Previous translation was made on: +### "Any Other = No" eng: "" new: "Sonstige = Nein" @@ -657,116 +664,162 @@ id: LANG_SOKOBAN_LEVEL desc: must be smaller than 6 characters +### English phrase was changed! Previous translation was made on: +### "Level" eng: "" new: "Level" id: LANG_SOKOBAN_MOVE desc: must be smaller than 6 characters +### English phrase was changed! Previous translation was made on: +### "Moves" eng: "" new: "Bewg." id: LANG_SOKOBAN_WIN desc: displayed when you win +### English phrase was changed! Previous translation was made on: +### "YOU WIN!!" eng: "" new: "GEWONNEN!" id: LANG_SOKOBAN_QUIT desc: how to quit game +### English phrase was changed! Previous translation was made on: +### "[OFF] To Stop" eng: "" new: "[OFF] beenden" id: LANG_SOKOBAN_F1 desc: what does F1 do +### English phrase was changed! Previous translation was made on: +### "[F1] - Level" eng: "" new: "[F1] - Level" id: LANG_SOKOBAN_F2 desc: what does F2 do +### English phrase was changed! Previous translation was made on: +### "[F2] Same Level" eng: "" new: "[F2] gl. Level" id: LANG_SOKOBAN_F3 desc: what does F3 do +### English phrase was changed! Previous translation was made on: +### "[F3] + Level" eng: "" new: "[F3] + Level" id: LANG_WORMLET_LENGTH desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Len:%d" eng: "" new: "Län:%d" id: LANG_WORMLET_GROWING desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Growing" eng: "" new: "Wachse" id: LANG_WORMLET_HUNGRY desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Hungry" eng: "" new: "Hungrig" id: LANG_WORMLET_WORMED desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Wormed" eng: "" new: "Gewurmt" id: LANG_WORMLET_ARGH desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Argh" eng: "" new: "Argh" id: LANG_WORMLET_CRASHED desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Crashed" eng: "" new: "Unfall!" id: LANG_WORMLET_HIGHSCORE desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Hs: %d" eng: "" new: "Hs: %d" id: LANG_WORMLET_PLAYERS desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "%d Players UP/DN" eng: "" new: "%d Spieler UP/DN" id: LANG_WORMLET_WORMS desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "%d Worms L/R" eng: "" new: "%d Würmer L/R" id: LANG_WORMLET_REMOTE_CTRL desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Remote Control F1" eng: "" new: "Fernsteuerung F1" id: LANG_WORMLET_NO_REM_CTRL desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "No Rem. Control F1" eng: "" new: "Keine Fernst. F1" id: LANG_WORMLET_2_KEY_CTRL desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "2 Key Control F1" eng: "" new: "2 Tastenkontr. F1" id: LANG_WORMLET_4_KEY_CTRL desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "4 Key Control F1" eng: "" new: "4 Tastenkontr. F1" id: LANG_WORMLET_NO_CONTROL desc: wormlet game +### English phrase was changed! Previous translation was made on: +### "Out Of Control" eng: "" new: "Ohne Kontrolle" id: LANG_TETRIS_LOSE desc: tetris game +### English phrase was changed! Previous translation was made on: +### "You Lose!" eng: "" new: "Verloren!" id: LANG_TETRIS_LEVEL desc: tetris game +### English phrase was changed! Previous translation was made on: +### "Rows - Level" eng: "" new: "Reihen - Level" @@ -1266,11 +1319,15 @@ new: "OK" id: LANG_PLAYER_ONPLAY_1 +### Description changed! Previous description was: +### "" desc: Line #1 of player ON+PLAY screen eng: "\x81 Queue" new: "\x81 Warteschlange" id: LANG_PLAYER_ONPLAY_2 +### Description changed! Previous description was: +### "" desc: Line #2 of player ON+PLAY screen eng: "- Ren + Del" new: "- Umb + Ent" @@ -1485,6 +1542,121 @@ eng: "Always" new: "Immer" +id: LANG_AUTO_BOOKMARK_QUERY +desc: prompt for user to decide to create an bookmark +eng: "Create a Bookmark?" +new: "Lesezeichen erstellen?" + +id: LANG_BOOKMARK_AUTOLOAD_QUERY +desc: prompt for user to decide to create a bookmark +eng: "Load Last Bookmark?" +new: "Letztes Lesezeichen laden?" + +id: LANG_BOOKMARK_CREATE_FAILURE +desc: Indicates bookmark was not created +eng: "Bookmark Failed!" +new: "Lesezeichen Fehler!" + +id: LANG_BOOKMARK_CREATE_SUCCESS +desc: Indicates bookmark was successfully created +eng: "Bookmark Created" +new: "Lesezeichen angelegt" + +id: LANG_BOOKMARK_LOAD_EMPTY +desc: Indicates bookmark was empty +eng: "Bookmark Empty" +new: "Lesezeichen leer" + +id: LANG_BOOKMARK_MENU +desc: Text on main menu to get to bookmark commands +eng: "Bookmarks" +new: "Lesezeichen" + +id: LANG_BOOKMARK_MENU_CREATE +desc: Used off of the bookmark menu to create a bookmark +eng: "Create Bookmark" +new: "Lesezeichen anlegen" + +id: LANG_BOOKMARK_MENU_LIST +desc: Used off of the bookmark menu to list available bookmarks for the currently playing directory or M3U +eng: "List Bookmarks" +new: "Lesezeichen auflisten" + +id: LANG_BOOKMARK_MENU_RECENT_BOOKMARKS +desc: Text for the menu text to access the most recent bookmarks list +eng: "Recent Bookmarks" +new: "Letzte Lesezeichen" + +id: LANG_BOOKMARK_SELECT_BOOKMARK_TEXT +desc: Used on the bookmark select window to label bookmark number +eng: "Bookmark" +new: "Lesezeichen" + +id: LANG_BOOKMARK_SELECT_DELETE +desc: Used on the bookmark select window to indicated the bookmark delete option +eng: "ON+Play to Delete" +new: "ON+PLAY = Löschen" + +id: LANG_BOOKMARK_SELECT_EXIT +desc: From the bookmark list screen, allows user to exit +eng: "LEFT = Exit" +new: "LINKS = Verlassen" + +id: LANG_BOOKMARK_SELECT_INDEX_TEXT +desc: Used on the bookmark select window to label index number +eng: "Index" +new: "Index" + +id: LANG_BOOKMARK_SELECT_LIST_BOOKMARKS +desc: From the auto-load screen, allows user to list all bookmarks +eng: "Down = List" +new: "UNTEN = Liste" + +id: LANG_BOOKMARK_SELECT_PLAY +desc: Used on the bookmark select window to indicated the play option +eng: "PLAY to Select" +new: "PLAY = Auswählen" + +id: LANG_BOOKMARK_SELECT_TIME_TEXT +desc: Used on the bookmark select window to label elapsed time +eng: "Time" +new: "Zeit" + +id: LANG_BOOKMARK_SETTINGS +desc: in general settings +eng: "Bookmarking" +new: "Lesezeichen" + +id: LANG_BOOKMARK_SETTINGS_AUTOCREATE +desc: prompt for user to decide to create an bookmark +eng: "Bookmark on Stop" +new: "Lesezeichen beim Stoppen" + +id: LANG_BOOKMARK_SETTINGS_AUTOLOAD +desc: prompt for user to decide to create a bookmark +eng: "Load Last Bookmark" +new: "Letztes Lesezeichen laden" + +id: LANG_BOOKMARK_SETTINGS_MAINTAIN_RECENT_BOOKMARKS +desc: Configuration option to maintain a list of recent bookmarks +eng: "Maintain a List of Recent Bookmarks?" +new: "Liste mit zuletzt benutzten Lesezeichen verwalten?" + +id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_ASK +desc: Save in recent bookmarks only +eng: "Recent only - Ask" +new: "Nur letzte - Fragen" + +id: LANG_BOOKMARK_SETTINGS_RECENT_ONLY_YES +desc: Save in recent bookmarks only +eng: "Recent only - Yes" +new: "Nur letzte - Ja" + +id: LANG_BOOKMARK_SETTINGS_UNIQUE_ONLY +desc: Save only on bookmark for each playlist in recent bookmarks +eng: "Unique only" +new: "Nur einmalig" + id: LANG_BOOT_CHANGED desc: File browser discovered the boot file was changed eng: "Boot changed" @@ -1684,103 +1856,3 @@ desc: Used on player models eng: "STOP to abort" new: "STOP zum Abbrechen" - -id: LANG_BUTTONBAR_MENU -desc: in button bar -eng: "Menu" -new: "Menü" - -id: LANG_BUTTONBAR_OPTIONS -desc: in button bar -eng: "Option" -new: "Option" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Kfz-Adapter Modus" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Einstellungen" - -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Zeichensätze" - -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" -new: "Firmware" - -id: LANG_FM_BUTTONBAR_PRESETS -desc: in button bar -eng: "Preset" -new: "Sender" - -id: LANG_FM_DELETE_PRESET -desc: in radio screen -eng: "Remove preset" -new: "Sender entfernen" - -id: LANG_FM_NO_FREE_PRESETS -desc: in radio screen -eng: "The preset list is full" -new: "Die Senderliste ist voll" - -id: LANG_FM_NO_PRESETS -desc: in radio screen -eng: "The preset list is empty" -new: "Die Senderliste ist leer" - -id: LANG_FM_PRESET_SAVE_FAILED -desc: in radio screen -eng: "Preset save failed" -new: "Sender speichern fehlgeschlagen" - -id: LANG_FM_SAVE_PRESET -desc: in radio screen -eng: "Save preset" -new: "Sender speichern" - -id: LANG_FM_STATION -desc: in radio screen -eng: "Station: %d.%dMHz" -new: "Sender: %d.%dMHz" - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Sprache" - -id: LANG_LINE_IN -desc: in settings_menu -eng: "Line In" -new: "Line In" - -id: LANG_NO_FILES -desc: in settings_menu -eng: "No files" -new: "Keine Dateien" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: "Plugins" - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "While Playing Screen" - -id: LANG_FM_BUTTONBAR_RECORD -desc: in main menu -eng: "Record" -new: "Aufnehmen" - -id: LANG_FM_RADIO -desc: in main menu -eng: "FM Radio" -new: "FM Radio" diff -rubBP /home/dast/src/rockbox/apps/lang/english.lang ./apps/lang/english.lang --- /home/dast/src/rockbox/apps/lang/english.lang Thu Nov 20 08:44:07 2003 +++ ./apps/lang/english.lang Tue Dec 2 21:59:16 2003 @@ -1,7 +1,7 @@ -# $Id: english.lang,v 1.92 2003/11/20 00:33:43 linusnielsen Exp $ +# $Id: english.lang,v 1.4 2003/12/02 20:59:16 mrskippy25 Exp $ # # This is the master of the language files. This is the original, the one with -# all the existing strings Rockbox features. +# all the existing strings Open Neo features. # # *WARNING* # @@ -21,16 +21,6 @@ eng: "General Settings" new: -id: LANG_GAMES -desc: in the main menu -eng: "Games" -new: - -id: LANG_DEMOS -desc: in the main menu -eng: "Demos" -new: - id: LANG_INFO desc: in the main menu eng: "Info" @@ -46,69 +36,9 @@ eng: "Debug (Keep Out!)" new: -id: LANG_USB -desc: in the main menu -eng: "USB (Sim)" -new: - -id: LANG_ROCKBOX_INFO -desc: displayed topmost on the info screen -eng: "Rockbox Info:" -new: - -id: LANG_BUFFER_STAT_PLAYER -desc: the buffer size player-screen width, %d MB %d fraction of MB -eng: "Buf: %d.%03dMB" -new: - -id: LANG_BUFFER_STAT_RECORDER -desc: the buffer size recorder-screen width, %d MB %d fraction of MB -eng: "Buffer: %d.%03dMB" -new: - -id: LANG_BATTERY_LEVEL_PLAYER -desc: the battery level in percentage -eng: "Batt: %d%%%s" -new: - -id: LANG_BATTERY_LEVEL_RECORDER -desc: the battery level in percentage -eng: "Battery: %d%%%s" -new: - -id: LANG_BATTERY_CHARGE -desc: tells that the battery is charging, instead of battery level -eng: "Battery: Charging" -new: - -id: LANG_BOUNCE -desc: in the demos menu -eng: "Bounce" -new: - -id: LANG_SNOW -desc: in the demos menu -eng: "Snow" -new: - -id: LANG_TETRIS -desc: in the games menu -eng: "Tetris" -new: - -id: LANG_SOKOBAN -desc: in the games menu -eng: "Sokoban" -new: - -id: LANG_WORMLET -desc: in the games menu -eng: "Wormlet" -new: - -id: LANG_SNAKE -desc: in the games menu -eng: "Snake" +id: LANG_BUFFER_STAT +desc: the buffer size player-screen width, %d KB %d fraction of KB +eng: "Buf: %d.%dKB" new: id: LANG_PLAYLIST_LOAD @@ -116,18 +46,11 @@ eng: "Loading..." new: -# NO LONGER USED id: LANG_PLAYLIST_SHUFFLE desc: displayed on screen while shuffling a playlist eng: "Shuffling..." new: -# NO LONGER USED -id: LANG_PLAYLIST_PLAY -desc: displayed on screen when start playing a playlist -eng: "Playing..." -new: - id: LANG_PLAYINDICES_PLAYLIST desc: in playlist.indices() when playlist is full eng: "Playlist" @@ -138,62 +61,11 @@ eng: "Buffer Full" new: -# NO LONGER USED -id: LANG_PLAYINDICES_AMOUNT -desc: number of files in playlist -eng: "%d Files" -new: - id: LANG_SETTINGS_SAVE_PLAYER desc: displayed if save settings has failed eng: "Save Failed" new: -id: LANG_SETTINGS_BATTERY_PLAYER -desc: if save settings has failed -eng: "Partition?" -new: - -id: LANG_SETTINGS_SAVE_RECORDER -desc: displayed if save settings has failed -eng: "Save Failed" -new: - -id: LANG_SETTINGS_BATTERY_RECORDER -desc: if save settings has failed -eng: "No partition?" -new: - -id: LANG_TIME_SET -desc: used in set_time() -eng: "ON To Set" -new: - -id: LANG_TIME_REVERT -desc: used in set_time() -eng: "OFF To Revert" -new: - -id: LANG_HIDDEN -desc: in settings_menu -eng: "" -new: - -id: LANG_HIDDEN_SHOW -desc: in settings_menu -eng: "" -new: - -id: LANG_HIDDEN_HIDE -desc: in settings_menu -eng: "" -new: - -id: LANG_CONTRAST -desc: in settings_menu -eng: "Contrast" -new: - id: LANG_SHUFFLE desc: in settings_menu eng: "Shuffle" @@ -204,11 +76,6 @@ eng: "Play Selected First" new: -id: LANG_MP3FILTER -desc: in settings_menu -eng: "" -new: - id: LANG_SORT_CASE desc: in settings_menu eng: "Sort Case Sensitive" @@ -234,31 +101,11 @@ eng: "On" new: -id: LANG_BACKLIGHT -desc: in settings_menu -eng: "Backlight" -new: - id: LANG_SCROLL desc: in settings_menu eng: "Scroll Speed Setting Example" new: -id: LANG_DISCHARGE -desc: in settings_menu -eng: "Deep Discharge" -new: - -id: LANG_TIME -desc: in settings_menu -eng: "Set Time/Date" -new: - -id: LANG_SPINDOWN -desc: in settings_menu -eng: "Disk Spindown" -new: - id: LANG_FFRW_STEP desc: in settings_menu eng: "FF/RW Min Step" @@ -274,35 +121,6 @@ eng: "Follow Playlist" new: -# depreciated -id: LANG_RESET_ASK_PLAYER -desc: confirm to reset settings -eng: "" -new: - -# depreciated -id: LANG_RESET_CONFIRM_PLAYER -desc: confirm to reset settings -eng: "" -new: - -id: LANG_RESET_ASK_RECORDER -desc: confirm to reset settings -eng: "Are You Sure?" -new: - -# depreciated -id: LANG_RESET_CONFIRM_RECORDER -desc: confirm to reset settings -eng: "" -new: - -# depreciated -id: LANG_RESET_CANCEL_RECORDER -desc: confirm to reset settings -eng: "OFF=Cancel" -new: - id: LANG_RESET_DONE_SETTING desc: visual confirmation after settings reset eng: "Settings" @@ -383,11 +201,6 @@ eng: "Bass Boost" new: -id: LANG_DECAY -desc: in sound_settings -eng: "AV Decay Time" -new: - id: LANG_CHANNEL_MENU desc: in sound_settings eng: "Channels" @@ -418,11 +231,6 @@ eng: "Mono Right" new: -id: LANG_AUTOVOL -desc: in sound_settings -eng: "Auto Volume" -new: - id: LANG_SHOWDIR_ERROR_BUFFER desc: in showdir(), displayed on screen when you reach buffer limit eng: "Dir Buffer" @@ -443,38 +251,6 @@ eng: "(PLAY/STOP)" new: -# depreciated -id: LANG_RESUME_CONFIRM_RECORDER -desc: possible answer to resume question -eng: "" -new: - -# depreciated -id: LANG_RESUME_CANCEL_RECORDER -desc: possible answer to resume question -eng: "" -new: - -id: LANG_KEYLOCK_ON_PLAYER -desc: displayed when key lock is on -eng: "Key Lock ON" -new: - -id: LANG_KEYLOCK_OFF_PLAYER -desc: displayed when key lock is turned off -eng: "Key Lock OFF" -new: - -id: LANG_KEYLOCK_ON_RECORDER -desc: displayed when key lock is on -eng: "Key Lock Is ON" -new: - -id: LANG_KEYLOCK_OFF_RECORDER -desc: displayed when key lock is turned off -eng: "Key Lock Is OFF" -new: - id: LANG_MUTE_ON_PLAYER desc: displayed when mute is on eng: "Mute ON" @@ -485,16 +261,6 @@ eng: "Mute OFF" new: -id: LANG_MUTE_ON_RECORDER -desc: displayed when mute is on -eng: "Mute Is ON" -new: - -id: LANG_MUTE_OFF_RECORDER -desc: displayed when mute is off -eng: "Mute Is OFF" -new: - id: LANG_ID3_INFO desc: in the browse_id3() function eng: "-ID3 Info- " @@ -585,227 +351,16 @@ eng: "Pause" new: -id: LANG_F2_MODE -desc: in wps F2 pressed -eng: "Mode:" -new: - -id: LANG_DIR_FILTER -desc: in wps F2 pressed -eng: "" -new: - -id: LANG_F3_STATUS -desc: in wps F3 pressed -eng: "Status" -new: - -id: LANG_F3_SCROLL -desc: in wps F3 pressed -eng: "Scroll" -new: - -id: LANG_F3_BAR -desc: in wps F3 pressed -eng: "Bar" -new: - id: LANG_END_PLAYLIST_PLAYER desc: when playlist has finished eng: "End Of List" new: -id: LANG_END_CONFIRM_PLAYER -desc: when playlist has finished -eng: "" -new: - id: LANG_END_PLAYLIST_RECORDER desc: when playlist has finished eng: "End Of Song List" new: -id: LANG_END_CONFIRM_RECORDER -desc: when playlist has finished -eng: "" -new: - -id: LANG_SNAKE_SCORE -desc: when you die in snake game -eng: "Your score:" -new: - -id: LANG_SNAKE_HISCORE -desc: high score in snake game -eng: "High Score: %d" -new: - -id: LANG_SNAKE_HISCORE_NEW -desc: new high score in snake game -eng: "New High Score!" -new: - -id: LANG_SNAKE_PAUSE -desc: displayed when game is paused -eng: "Game Paused" -new: - -id: LANG_SNAKE_RESUME -desc: what to do to resume game -eng: "[PLAY] To Resume" -new: - -id: LANG_SNAKE_QUIT -desc: how to quit game -eng: "[OFF] To Quit" -new: - -id: LANG_SNAKE_LEVEL -desc: level of difficulty -eng: "Level - %d" -new: - -id: LANG_SNAKE_RANGE -desc: range of levels -eng: "(1 - Slow, 9 - Fast)" -new: - -id: LANG_SNAKE_START -desc: how to start or pause the game -eng: "[PLAY] To Start/Pause" -new: - -id: LANG_SOKOBAN_LEVEL -desc: must be smaller than 6 characters -eng: "" -new: - -id: LANG_SOKOBAN_MOVE -desc: must be smaller than 6 characters -eng: "" -new: - -id: LANG_SOKOBAN_WIN -desc: displayed when you win -eng: "" -new: - -id: LANG_SOKOBAN_QUIT -desc: how to quit game -eng: "" -new: - -id: LANG_SOKOBAN_F1 -desc: what does F1 do -eng: "" -new: - -id: LANG_SOKOBAN_F2 -desc: what does F2 do -eng: "" -new: - -id: LANG_SOKOBAN_F3 -desc: what does F3 do -eng: "" -new: - -# Next ids are for Worlmet Game. -# Lenght restrictions for score board strings (LANG_SB_XXX): -# LCD_PROPFONTS: max 43 pixel -# fix font: max 7 characters - -id: LANG_WORMLET_LENGTH -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_GROWING -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_HUNGRY -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_WORMED -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_ARGH -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_CRASHED -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_HIGHSCORE -desc: wormlet game -eng: "" -new: - -# Length restrictions for wormlet config screen strings (LANG_CS_XXX) -# They must fit on the entire screen - preferably with the -# key names aligned right - -id: LANG_WORMLET_PLAYERS -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_WORMS -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_REMOTE_CTRL -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_NO_REM_CTRL -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_2_KEY_CTRL -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_4_KEY_CTRL -desc: wormlet game -eng: "" -new: - -id: LANG_WORMLET_NO_CONTROL -desc: wormlet game -eng: "" -new: - -# Wormlet game ids ended - -id: LANG_TETRIS_LOSE -desc: tetris game -eng: "" -new: - -id: LANG_TETRIS_LEVEL -desc: tetris game -eng: "" -new: - -id: LANG_POWEROFF_IDLE -desc: in settings_menu -eng: "Idle Poweroff" -new: - id: LANG_LANGUAGE_LOADED desc: shown when a language has been loaded from the dir browser eng: "New Language" @@ -871,11 +426,6 @@ eng: "Units Per Read" new: -id: LANG_BACKLIGHT_ON_WHEN_CHARGING -desc: in display_settings_menu -eng: "Backlight On When Plugged" -new: - id: LANG_REPEAT desc: in settings_menu eng: "Repeat" @@ -901,155 +451,21 @@ eng: "OFF=Cancel" new: -# NOTE: ignore this label. It is no longer used/was an error. -# We are aware of this and it will this instance will be removed in the future -id: LANG_TETRIS_LEVEL - id: LANG_TIMEFORMAT desc: select the time format of time in status bar eng: "Time Format" new: -id: LANG_12_HOUR_CLOCK -desc: option for 12 hour clock -eng: "12 Hour Clock" -new: - -id: LANG_24_HOUR_CLOCK -desc: option for 24 hour clock -eng: "24 Hour Clock" -new: - -id: LANG_WEEKDAY_SUNDAY -desc: Maximum 3-letter abbreviation for weekday -eng: "Sun" -new: - -id: LANG_WEEKDAY_MONDAY -desc: Maximum 3-letter abbreviation for weekday -eng: "Mon" -new: - -id: LANG_WEEKDAY_TUESDAY -desc: Maximum 3-letter abbreviation for weekday -eng: "Tue" -new: - -id: LANG_WEEKDAY_WEDNESDAY -desc: Maximum 3-letter abbreviation for weekday -eng: "Wed" -new: - -id: LANG_WEEKDAY_THURSDAY -desc: Maximum 3-letter abbreviation for weekday -eng: "Thu" -new: - -id: LANG_WEEKDAY_FRIDAY -desc: Maximum 3-letter abbreviation for weekday -eng: "Fri" -new: - -id: LANG_WEEKDAY_SATURDAY -desc: Maximum 3-letter abbreviation for weekday -eng: "Sat" -new: - -id: LANG_MONTH_JANUARY -desc: Maximum 3-letter abbreviation for monthname -eng: "Jan" -new: - -id: LANG_MONTH_FEBRUARY -desc: Maximum 3-letter abbreviation for monthname -eng: "Feb" -new: - -id: LANG_MONTH_MARCH -desc: Maximum 3-letter abbreviation for monthname -eng: "Mar" -new: - -id: LANG_MONTH_APRIL -desc: Maximum 3-letter abbreviation for monthname -eng: "Apr" -new: - -id: LANG_MONTH_MAY -desc: Maximum 3-letter abbreviation for monthname -eng: "May" -new: - -id: LANG_MONTH_JUNE -desc: Maximum 3-letter abbreviation for monthname -eng: "Jun" -new: - -id: LANG_MONTH_JULY -desc: Maximum 3-letter abbreviation for monthname -eng: "Jul" -new: - -id: LANG_MONTH_AUGUST -desc: Maximum 3-letter abbreviation for monthname -eng: "Aug" -new: - -id: LANG_MONTH_SEPTEMBER -desc: Maximum 3-letter abbreviation for monthname -eng: "Sep" -new: - -id: LANG_MONTH_OCTOBER -desc: Maximum 3-letter abbreviation for monthname -eng: "Oct" -new: - -id: LANG_MONTH_NOVEMBER -desc: Maximum 3-letter abbreviation for monthname -eng: "Nov" -new: - -id: LANG_MONTH_DECEMBER -desc: Maximum 3-letter abbreviation for monthname -eng: "Dec" -new: - -id: LANG_CUBE -desc: the name of the cube demo in the demo menu -eng: "Cube" -new: - -id: LANG_OSCILLOGRAPH -desc: the name of the oscillograph demo in the demo menu -eng: "Oscillograph" -new: - id: LANG_RESUME_SETTING_ASK_ONCE desc: in settings_menu eng: "Ask Once" new: -id: LANG_BATTERY_DISPLAY -desc: Battery type title -eng: "Battery Display" -new: - id: LANG_VOLUME_DISPLAY desc: Volume type title eng: "Volume Display" new: -id: LANG_DISPLAY_GRAPHIC -desc: Label for type of icon display -eng: "Graphic" -new: - -id: LANG_DISPLAY_NUMERIC -desc: Label for type of icon display -eng: "Numeric" -new: - id: LANG_PM_PERFORMANCE desc: in the peak meter menu eng: "Performance" @@ -1060,10 +476,10 @@ eng: "High performance" new: -id: LANG_PM_ENERGY_SAVER -desc: in the peak meter menu -eng: "Save Energy" -new: +#id: LANG_PM_ENERGY_SAVER +#desc: in the peak meter menu +#eng: "Save Energy" +#new: id: LANG_PM_SCALE desc: in the peak meter menu @@ -1090,79 +506,14 @@ eng: "Maximum Of Range" new: -id: LANG_RECORDING -desc: in the main menu -eng: "Recording" -new: - -id: LANG_RECORDING_GAIN -desc: in the recording screen -eng: "Gain" -new: - -id: LANG_RECORDING_LEFT -desc: in the recording screen -eng: "Left" -new: - -id: LANG_RECORDING_RIGHT -desc: in the recording screen -eng: "Right" -new: - -id: LANG_RECORDING_QUALITY -desc: in the recording settings -eng: "Quality" -new: - -id: LANG_RECORDING_FREQUENCY -desc: in the recording settings -eng: "Frequency" -new: - -id: LANG_RECORDING_SOURCE -desc: in the recording settings -eng: "Source" -new: - -id: LANG_RECORDING_CHANNELS -desc: in the recording settings -eng: "Channels" -new: - -id: LANG_RECORDING_SRC_MIC -desc: in the recording settings -eng: "Mic" -new: - -id: LANG_RECORDING_SRC_LINE -desc: in the recording settings -eng: "Line In" -new: - -id: LANG_RECORDING_SRC_DIGITAL -desc: in the recording settings -eng: "Digital" -new: - -id: LANG_RECORDING_SETTINGS -desc: in the main menu -eng: "Recording Settings" -new: - -id: LANG_DISK_STAT +id: LANG_GB_STAT desc: disk size info -eng: "Disk: %d.%dGB" +eng: "%d.%dGB" new: -id: LANG_DISK_FREE_STAT -desc: disk size info -eng: "Free: %d.%dGB" -new: - -id: LANG_POWEROFF -desc: disk poweroff flag -eng: "Disk Poweroff" +id: LANG_FREE +desc: Used in Neo Info +eng: "Free" new: id: LANG_FILTER_PLAYLIST @@ -1170,16 +521,6 @@ eng: "Playlists" new: -id: LANG_BATTERY_TIME -desc: battery level in % and estimated time remaining -eng: "%d%% %dh %dm" -new: - -id: LANG_SLEEP_TIMER -desc: sleep timer setting -eng: "Sleep Timer" -new: - id: LANG_MP3BUFFER_MARGIN desc: MP3 buffer margin time eng: "Anti-Skip Buffer" @@ -1210,26 +551,6 @@ eng: "Scroll Speed" new: -id: LANG_TRICKLE_CHARGE -desc: in settings_menu -eng: "Trickle Charge" -new: - -id: LANG_BATTERY_TOPOFF_CHARGE -desc: in info display, shows that top off charge is running -eng: "Battery: Top-Off Chg" -new: - -id: LANG_BATTERY_TRICKLE_CHARGE -desc: in info display, shows that trickle charge is running -eng: "Battery: Trickle Chg" -new: - -id: LANG_BATTERY_CAPACITY -desc: in settings_menu -eng: "Battery Capacity" -new: - id: LANG_QUEUE_QUEUED desc: queued track name %s eng: "Queued: %s" @@ -1255,16 +576,6 @@ eng: "OK" new: -id: LANG_PLAYER_ONPLAY_1 -desc: Line #1 of player ON+PLAY screen -eng: "\x81 Queue" -new: - -id: LANG_PLAYER_ONPLAY_2 -desc: Line #2 of player ON+PLAY screen -eng: "- Ren + Del" -new: - id: LANG_QUEUE desc: The verb/action Queue eng: "Queue" @@ -1295,36 +606,6 @@ eng: "Failed" new: -id: LANG_ALARM_MOD_ALARM_MENU -desc: The name of the additional entry in the main menu for the RTC alarm mod. -eng: "Wake-Up Alarm" -new: - -id: LANG_ALARM_MOD_TIME -desc: The current alarm time shown in the alarm menu for the RTC alarm mod. -eng: "Alarm Time: %02d:%02d" -new: - -id: LANG_ALARM_MOD_TIME_TO_GO -desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod. -eng: "Waking Up In %d:%02d" -new: - -id: LANG_ALARM_MOD_SHUTDOWN -desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod). -eng: "Shutting Down..." -new: - -id: LANG_ALARM_MOD_ERROR -desc: The text that tells that the time is incorrect (for the RTC alarm mod). -eng: "Alarm Time Is Too Soon!" -new: - -id: LANG_ALARM_MOD_KEYS -desc: Shown key functions in alarm menu (for the RTC alarm mod). -eng: "PLAY=Set OFF=Cancel" -new: - id: LANG_CREATE_PLAYLIST desc: Menu option for creating a playlist eng: "Create Playlist" @@ -1355,10 +636,10 @@ eng: "Abort" new: -id: LANG_MENU_SHOW_ID3_INFO -desc: Menu option to start id3 viewer -eng: "Show ID3 Info" -new: +#id: LANG_MENU_SHOW_ID3_INFO +#desc: Menu option to start id3 viewer +#eng: "Show ID3 Info" +#new: id: LANG_ID3_GENRE desc: ID3 frame 'genre' @@ -1375,21 +656,6 @@ eng: "" new: -id: LANG_RECORDING_TIME -desc: Display of recorded time -eng: "Time:" -new: - -id: LANG_RECORDING_SIZE -desc: Display of recorded file size -eng: "Size:" -new: - -id: LANG_CPU_SLEEP -desc: in system_settings_menu() (removed) -eng: "" -new: - id: LANG_SETTINGS_LOADED1 desc: Feedback shown when a .cfg file is loaded eng: "Settings" @@ -1405,16 +671,6 @@ eng: "Fade On Stop/Pause" new: -id: LANG_SOKOBAN_ON -desc: how to undo move -eng: "[ON] To Undo" -new: - -id: LANG_INVERT -desc: in settings_menu -eng: "LCD Mode" -new: - id: LANG_CHANNEL_STEREO_NARROW_PLAYER desc: in sound_settings eng: "St. Narrow" @@ -1465,51 +721,6 @@ eng: "Update VBR file" new: -id: LANG_INVERT_CURSOR -desc: in settings_menu -eng: "Line Selector" -new: - -id: LANG_RECORDING_EDITABLE -desc: Editable recordings setting -eng: "Independent frames" -new: - -id: LANG_STATUS_BAR -desc: display menu, F3 substitute -eng: "Status Bar" -new: - -id: LANG_SCROLL_BAR -desc: display menu, F3 substitute -eng: "Scroll Bar" -new: - -id: LANG_CAPTION_BACKLIGHT -desc: in settings_menu -eng: "Caption backlight" -new: - -id: LANG_INVERT_CURSOR_POINTER -desc: in settings_menu -eng: "Pointer" -new: - -id: LANG_INVERT_CURSOR_BAR -desc: in settings_menu -eng: "Bar(Inverse)" -new: - -id: LANG_INVERT_LCD_NORMAL -desc: in settings_menu -eng: "Normal" -new: - -id: LANG_INVERT_LCD_INVERSE -desc: in settings_menu -eng: "Inverse" -new: - id: LANG_MAX_FILES_IN_DIR desc: in settings_menu eng: "Max files in dir browser" @@ -1540,36 +751,11 @@ eng: "Jump Scroll Delay" new: -id: LANG_RECORD_TIMESPLIT -desc: Prompt for record timer interval setting, in the record settings menu -eng: "Time Split" -new: - -id: LANG_RECORD_TIMESPLIT_REC -decs: Display of record timer interval setting, on the record screen -eng: "Split time:" -new: - id: LANG_SHOW_ICONS desc: in settings_menu eng: "Show Icons" new: -id: LANG_DISK_FULL -desc: in recording screen -eng: "The disk is full. Press OFF to continue." -new: - -id: LANG_CONFIRM_WITH_PLAY_RECORDER -desc: Generic recorder string to use to confirm -eng: "PLAY = Yes" -new: - -id: LANG_CANCEL_WITH_ANY_RECORDER -desc: Generic recorder string to use to cancel -eng: "Any Other = No" -new: - ## ## Strings used in the plugin loader: ## @@ -1584,10 +770,10 @@ eng: "Failed reading %s" new: -id: LANG_PLUGIN_WRONG_MODEL -desc: The plugin is not compatible with the archos model trying to run it -eng: "Incompatible model" -new: +#id: LANG_PLUGIN_WRONG_MODEL +#desc: The plugin is not compatible with the archos model trying to run it +#eng: "Incompatible model" +#new: id: LANG_PLUGIN_WRONG_VERSION desc: The plugin is not compatible with the rockbox version trying to run it @@ -1599,40 +785,6 @@ eng: "Plugin returned error" new: -## -## boot change detection -## - -id: LANG_BOOT_CHANGED -desc: File browser discovered the boot file was changed -eng: "Boot changed" -new: - -id: LANG_REBOOT_NOW -desc: Do you want to reboot? -eng: "Reboot now?" -new: - -id: LANG_FLIPIT -desc: in the games menu -eng: "Flipit" -new: - -id: LANG_OTHELO -desc: in the games menu -eng: "Othelo" -new: - -id: LANG_SLIDING_PUZZLE -desc: in the games menu -eng: "Sliding Puzzle" -new: - -id: LANG_STAR -desc: in the games menu -eng: "Star" -new: - id: LANG_QUEUE_LAST desc: in onplay menu. queue a track/playlist at end of playlist. eng: "Queue last" @@ -1683,11 +835,6 @@ eng: "Saved %d tracks (%s)" new: -id: LANG_OFF_ABORT -desc: Used on recorder models -eng: "OFF to abort" -new: - id: LANG_STOP_ABORT desc: Used on player models eng: "STOP to abort" @@ -1728,102 +875,47 @@ eng: "Recursively?" new: -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" +id: LANG_SONG_INFO +desc: Replaces Show ID3 Info +eng: "Song Info" new: -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" +id: LANG_USE_VOLUME_SLIDER +desc: Asked in display menu +eng: "Use Volume Slider?" new: -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" +id: LANG_VOLUME_SLIDER +desc: In display menu +eng: "Volume Slider" new: -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: - -id: LANG_LINE_IN -desc: in settings_menu -eng: "Line In" -new: - -id: LANG_NO_FILES -desc: in settings_menu -eng: "No files" -new: - -id: LANG_BUTTONBAR_MENU -desc: in button bar -eng: "Menu" -new: - -id: LANG_BUTTONBAR_OPTIONS -desc: in button bar -eng: "Option" -new: - -id: LANG_FM_BUTTONBAR_PRESETS -desc: in button bar -eng: "Preset" -new: - -id: LANG_FM_SAVE_PRESET -desc: in radio screen -eng: "Save preset" -new: - -id: LANG_FM_DELETE_PRESET -desc: in radio screen -eng: "Remove preset" -new: - -id: LANG_FM_STATION -desc: in radio screen -eng: "Station: %d.%dMHz" +id: LANG_NEO_INFO +desc: in the main menu +eng: "Neo Info" new: -id: LANG_FM_PRESET_SAVE_FAILED -desc: in radio screen -eng: "Preset save failed" +id: LANG_MODEL +desc: Use in Info menu +eng: "Model" new: -id: LANG_FM_NO_PRESETS -desc: in radio screen -eng: "The preset list is empty" +id: LANG_OPEN_NEO +desc: Used alot +eng: "Open Neo" new: -id: LANG_FM_NO_FREE_PRESETS -desc: in radio screen -eng: "The preset list is full" +id: LANG_MPEG_DECODER +desc: Used alot +eng: "MPEG Decoder" new: -id: LANG_FM_RADIO -desc: in main menu -eng: "FM Radio" +id: LANG_MEMORY +desc: Used in Neo Info +eng: "Memory" new: -id: LANG_FM_BUTTONBAR_RECORD -desc: in main menu -eng: "Record" +id: LANG_HARD_DISK +desc: Used in Neo Info +eng: "Hard Disk" new: diff -rubBP /home/dast/src/rockbox/apps/lang/espanol.lang ./apps/lang/espanol.lang --- /home/dast/src/rockbox/apps/lang/espanol.lang Fri May 2 13:57:18 2003 +++ ./apps/lang/espanol.lang Tue Dec 2 21:59:16 2003 @@ -40,11 +39,6 @@ eng: "USB (Sim)" new: "USB (Simulado)" -id: LANG_ROCKBOX_INFO -desc: displayed topmost on the info screen -eng: "Rockbox Info:" -new: "Info. de rockbox:" - id: LANG_BUFFER_STAT_PLAYER desc: the buffer size player-screen width, %d MB %d fraction of MB eng: "Buf: %d.%03dMB" @@ -258,7 +252,7 @@ id: LANG_FOLLOW desc: in settings_menu eng: "Follow Playlist" -new: "Seguir lista de repr." +new: "Seguir lista de reproduccion" id: LANG_RESET_ASK_PLAYER desc: confirm to reset settings @@ -519,12 +513,12 @@ id: LANG_ID3_TRACKNUM desc: in wps eng: "[Tracknum]" -new: "[Nş pista]" +new: "[No pista]" id: LANG_ID3_NO_TRACKNUM desc: in wps if no track number is avaible eng: "" -new: "" +new: "" id: LANG_ID3_LENGHT desc: in wps @@ -784,7 +778,7 @@ id: LANG_FILTER desc: setting name for dir filter eng: "Show Files" -new: "mostrar archivos" +new: "Mostrar archivos" id: LANG_FILTER_MUSIC desc: show only music-related files @@ -1086,7 +1080,7 @@ id: LANG_MP3BUFFER_MARGIN desc: MP3 buffer margin time eng: "Anti-Skip Buffer" -new: "Buffer Anit-salto" +new: "Buffer Anti-salto" id: LANG_OSCILLOGRAPH desc: the name of the oscillograph demo in the demo menu @@ -1249,11 +1242,6 @@ eng: "Line In" new: "Analogica" -id: LANG_RECORDING_SRC_MIC -desc: in the recording settings -eng: "Mic" -new: "Micro" - id: LANG_RENAME desc: The verb/action Rename eng: "Rename" @@ -1364,11 +1352,6 @@ eng: "Stereo Wide" new: "Estereo Amplio" -id: LANG_CPU_SLEEP -desc: in system_settings_menu() (removed) -eng: "" -new: "" - id: LANG_FADE_ON_STOP desc: options menu to set fade on stop or pause eng: "Fade On Stop/Pause" @@ -1478,3 +1461,68 @@ desc: in settings_menu eng: "Inverse" new: "Inverso" + +id: LANG_PLAYLIST_MENU +desc: in main menu. +eng: "Playlist Options" +new: "Opciones del Playlist" + +id: LANG_SAVE_DYNAMIC_PLAYLIST +desc: in playlist menu. +eng: "Save Dynamic Playlist" +new: "Guardar Playlist Dinámico" + +id: LANG_RECURSE_DIRECTORY +desc: In playlist menu +eng: "Recursively Insert Directories" +new: "Recurrentemente Insertar Directorio" + +id: LANG_SONG_INFO +desc: Replaces Show ID3 Info +eng: "Song Info" +new: "Info de Canción" + +id: LANG_MAX_FILES_IN_PLAYLIST +desc: in settings_menu +eng: "Max playlist size" +new: "Tamańo máximo de archivos en browser del directorio" + +id: LANG_MAX_FILES_IN_PLAYLIST +desc: in settings_menu +eng: "Max playlist size" +new: "Tamańo máximo del playlist" + +id: LANG_JUMP_SCROLL +desc: (player) menu altarnative for jump scroll +eng: "Jump scroll" +new: "Saltar" + +id: LANG_ONE_TIME +desc: (player) the jump scroll shall be done "one time" +eng: "One time" +new: "Una vez" + +id: LANG_ALWAYS +desc: (player) the jump scroll shall be done "always" +eng: "Always" +new: "Siempre" + +id: LANG_JUMP_SCROLL_DELAY +desc: (player) Delay before making a jump scroll +eng: "Jump Scroll Delay" +new: "Retraso de salto" + +id: LANG_USE_VOLUME_SLIDER +desc: Asked in display menu +eng: "Use Volume Slider?" +new: "Usar barra de volumen?" + +id: LANG_VOLUME_SLIDER +desc: In display menu +eng: "Volume Slider" +new: "Barra de volumen" + +id: LANG_NEO_INFO +desc: in the main menu +eng: "Neo Info" +new: "Neo Información" \ No newline at end of file diff -rubBP /home/dast/src/rockbox/apps/lang/francais.lang ./apps/lang/francais.lang --- /home/dast/src/rockbox/apps/lang/francais.lang Thu Dec 4 16:35:38 2003 +++ ./apps/lang/francais.lang Tue Dec 2 21:59:16 2003 @@ -1,6 +1,6 @@ -# $Id: francais.lang,v 1.32 2003/12/04 14:29:06 zagor Exp $ +# francais.lang 2003/06/09 # -# Based on file english.lang,v 1.92 2003/11/20 00:33:43 linusnielsen +# Based on file english.lang,v 1.77 2003/06/05 09:38:26 zagor Exp $ # id: LANG_SOUND_SETTINGS desc: in the main menu @@ -75,7 +75,7 @@ id: LANG_BOUNCE desc: in the demos menu eng: "Bounce" -new: "Texte bondissant" +new: "Texte rebondissant" id: LANG_SNOW desc: in the demos menu @@ -148,7 +148,7 @@ id: LANG_SETTINGS_SAVE_RECORDER desc: displayed if save settings has failed eng: "Save Failed" -new: "Echec de l'enreg!" +new: "Echec de l'enregistrement" id: LANG_SETTINGS_BATTERY_RECORDER desc: if save settings has failed @@ -193,7 +193,7 @@ id: LANG_PLAY_SELECTED desc: in settings_menu eng: "Play Selected First" -new: "Lire fichier courant en 1er" +new: "Lire fichier selectionné en 1er" id: LANG_MP3FILTER desc: in settings_menu @@ -372,7 +372,7 @@ id: LANG_BBOOST desc: in sound settings eng: "Bass Boost" -new: "Ampli. des graves" +new: "Maximalisation des graves" id: LANG_DECAY desc: in sound_settings @@ -457,7 +457,7 @@ id: LANG_KEYLOCK_ON_RECORDER desc: displayed when key lock is on eng: "Key Lock Is ON" -new: "Touches désactivées" +new: "Touches protégées" id: LANG_KEYLOCK_OFF_RECORDER desc: displayed when key lock is turned off @@ -868,7 +868,7 @@ id: LANG_REPEAT desc: in settings_menu eng: "Repeat" -new: "Répéter" +new: "Répétition" id: LANG_REPEAT_ALL desc: repeat playlist once all songs have completed @@ -1138,7 +1138,7 @@ id: LANG_RECORDING_SETTINGS desc: in the main menu eng: "Recording Settings" -new: "Options d'enreg." +new: "Options d'enregistrement" id: LANG_DISK_STAT desc: disk size info @@ -1183,7 +1183,7 @@ id: LANG_SCROLL_DELAY desc: Delay before scrolling eng: "Scroll Start Delay" -new: "Délai avant défilement" +new: "Délai avant début du défilement" id: LANG_SCROLL_STEP desc: Pixels to advance per scroll @@ -1218,7 +1218,7 @@ id: LANG_BATTERY_CAPACITY desc: in settings_menu eng: "Battery Capacity" -new: "Capacité de batterie" +new: "Capacité de la batterie" id: LANG_QUEUE_QUEUED desc: queued track name %s @@ -1258,7 +1258,7 @@ id: LANG_QUEUE desc: The verb/action Queue eng: "Queue" -new: "File d'attente" +new: "Mettre en queue" id: LANG_DELETE desc: The verb/action Delete @@ -1388,7 +1388,7 @@ id: LANG_SETTINGS_LOADED2 desc: Feedback shown when a .cfg file is loaded eng: "Loaded" -new: "Chargé" +new: "Chargée" id: LANG_FADE_ON_STOP desc: options menu to set fade on stop or pause @@ -1439,7 +1439,7 @@ id: LANG_SETTINGS_SAVED2 desc: Feedback shown when a .cfg file is saved eng: "Saved" -new: "Enregistré" +new: "Enregistrée" id: LANG_VBRFIX_STOP_PLAY desc: Tells the user to stop the playback @@ -1529,292 +1529,59 @@ id: LANG_JUMP_SCROLL_DELAY desc: (player) Delay before making a jump scroll eng: "Jump Scroll Delay" -new: "Délai avant défil." +new: "Délai avant saut" id: LANG_RECORD_TIMESPLIT desc: Prompt for record timer interval setting, in the record settings menu eng: "Time Split" -new: "Temps de coupure" +new: "Temps de coupure (hh:mm)" id: LANG_RECORD_TIMESPLIT_REC decs: Display of record timer interval setting, on the record screen eng: "Split time:" -new: "Tps coupe:" +new: "Tmps coupe:" id: LANG_SHOW_ICONS desc: in settings_menu eng: "Show Icons" new: "Afficher les icônes" -id: LANG_DISK_FULL -desc: in recording screen -eng: "The disk is full. Press OFF to continue." -new: "Disque plein. Presser OFF pour continuer." - -id: LANG_CONFIRM_WITH_PLAY_RECORDER -desc: Generic recorder string to use to confirm -eng: "PLAY = Yes" -new: "PLAY = Oui" - -id: LANG_CANCEL_WITH_ANY_RECORDER -desc: Generic recorder string to use to cancel -eng: "Any Other = No" -new: "Autres = Non" - -## -## Strings used in the plugin loader: -## - -id: LANG_PLUGIN_CANT_OPEN -desc: Plugin open error message -eng: "Can't open %s" -new: "Impossible d'ouvrir %s" - -id: LANG_READ_FAILED -desc: There was an error reading a file -eng: "Failed reading %s" -new: "Erreur de Lecture %s" - -id: LANG_PLUGIN_WRONG_MODEL -desc: The plugin is not compatible with the archos model trying to run it -eng: "Incompatible model" -new: "Modčle Incompatible" - -id: LANG_PLUGIN_WRONG_VERSION -desc: The plugin is not compatible with the rockbox version trying to run it -eng: "Incompatible version" -new: "Mauvaise version" - -id: LANG_PLUGIN_ERROR -desc: The plugin return an error code -eng: "Plugin returned error" -new: "Erreur retourné par le Plugin" - -## -## boot change detection -## - -id: LANG_BOOT_CHANGED -desc: File browser discovered the boot file was changed -eng: "Boot changed" -new: "Démarrage Modifié" - -id: LANG_REBOOT_NOW -desc: Do you want to reboot? -eng: "Reboot now?" -new: "Redémarrer?" - -id: LANG_FLIPIT -desc: in the games menu -eng: "Flipit" -new: "Flipit" - -id: LANG_OTHELO -desc: in the games menu -eng: "Othelo" -new: "Othelo" - -id: LANG_SLIDING_PUZZLE -desc: in the games menu -eng: "Sliding Puzzle" -new: "Puzzle taquin" - -id: LANG_STAR -desc: in the games menu -eng: "Star" -new: "Star" - -id: LANG_QUEUE_LAST -desc: in onplay menu. queue a track/playlist at end of playlist. -eng: "Queue last" -new: "En fin de file" - -id: LANG_INSERT -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert" -new: "Insérer" - -id: LANG_INSERT_LAST -desc: in onplay menu. append a track/playlist into dynamic playlist. -eng: "Insert last" -new: "Insérer Dernier" - -id: LANG_QUEUE_FIRST -desc: in onplay menu. queue a track/playlist into dynamic playlist. -eng: "Queue next" -new: "Suivant en file" - -id: LANG_INSERT_FIRST -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert next" -new: "Insérer suivant" - -id: LANG_SAVE_DYNAMIC_PLAYLIST -desc: in playlist menu. -eng: "Save Dynamic Playlist" -new: "Enreg. list musiq. dynamique" - -id: LANG_PLAYLIST_MENU -desc: in main menu. -eng: "Playlist Options" -new: "Options Liste musicale" - -id: LANG_PLAYLIST_INSERT_COUNT -desc: splash number of tracks inserted -eng: "Inserted %d tracks (%s)" -new: "%d pistes Insérées (%s)" - -id: LANG_PLAYLIST_QUEUE_COUNT -desc: splash number of tracks queued -eng: "Queued %d tracks (%s)" -new: "%d pistes (%s) en file d'attente" - -id: LANG_PLAYLIST_SAVE_COUNT -desc: splash number of tracks saved -eng: "Saved %d tracks (%s)" -new: "%d pistes (%s) enreg." - -id: LANG_OFF_ABORT -desc: Used on recorder models -eng: "OFF to abort" -new: "OFF pour annuler" - -id: LANG_STOP_ABORT -desc: Used on player models -eng: "STOP to abort" -new: "STOP pour annuler" - -id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR -desc: Playlist error -eng: "Error updating playlist control file" -new: "Erreur de mise ŕ jour du fichier control de liste musicale" - -id: LANG_PLAYLIST_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist file" -new: "Erreur d'accés ŕ la liste musicale" - -id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist control file" -new: "Erreur d'accés au fichier control de liste musicale" - -id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing directory" -new: "Erreur d'accés au répertoire" - -id: LANG_PLAYLIST_CONTROL_INVALID -desc: Playlist resume error -eng: "Playlist control file is invalid" -new: "Fichier control de liste musicale invalide" - id: LANG_RECURSE_DIRECTORY desc: In playlist menu eng: "Recursively Insert Directories" -new: "Insertion récursive des répertoires" +new: "Inserer les repertoires recursivement?" id: LANG_RECURSE_DIRECTORY_QUESTION desc: Asked from onplay screen eng: "Recursively?" -new: "Récursivement?" +new: "Recursivement?" -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Polices" +id: LANG_SONG_INFO +desc: Replaces Show ID3 Info +eng: "Song Info" +new: "Info Chanson" + +id: LANG_USE_VOLUME_SLIDER +desc: Asked in display menu +eng: "Use Volume Slider?" +new: "Utiliser la barre de volume?" + +id: LANG_VOLUME_SLIDER +desc: In display menu +eng: "Volume Slider" +new: "Barre de volume" -id: LANG_FIRMWARE +id: LANG_NEO_INFO desc: in the main menu -eng: "Firmware" -new: "Firmware" - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Langue" - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "Durant l'écran de lecture" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Configurations" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: "Plugins" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Mode Adaptateur Voiture" - -id: LANG_LINE_IN -desc: in settings_menu -eng: "Line In" -new: "Entrée(in)" - -id: LANG_NO_FILES -desc: in settings_menu -eng: "No files" -new: "Pas de Fichiers" +eng: "Neo Info" +new: "Info Neo" -id: LANG_BUTTONBAR_MENU -desc: in button bar -eng: "Menu" -new: "Menu" - -id: LANG_BUTTONBAR_OPTIONS -desc: in button bar -eng: "Option" -new: "Option" - -id: LANG_FM_BUTTONBAR_PRESETS -desc: in button bar -eng: "Preset" -new: "Pré-selections" - -id: LANG_FM_SAVE_PRESET -desc: in radio screen -eng: "Save preset" -new: "Enreg. pré-selection" - -id: LANG_FM_DELETE_PRESET -desc: in radio screen -eng: "Remove preset" -new: "Suppr. pré-selection" - -id: LANG_FM_STATION -desc: in radio screen -eng: "Station: %d.%dMHz" -new: "Station: %d.%dMHz" - -id: LANG_FM_PRESET_SAVE_FAILED -desc: in radio screen -eng: "Preset save failed" -new: "Echec d'enreg. pré-selection" - -id: LANG_FM_NO_PRESETS -desc: in radio screen -eng: "The preset list is empty" -new: "liste de pré-selections vide" - -id: LANG_FM_NO_FREE_PRESETS -desc: in radio screen -eng: "The preset list is full" -new: "liste de pré-selections pleine" - -id: LANG_FM_RADIO -desc: in main menu -eng: "FM Radio" -new: "Radio FM" - -id: LANG_FM_BUTTONBAR_RECORD -desc: in main menu -eng: "Record" -new: "Enreg." +id: LANG_MODEL +desc: Use in Info menu +eng: "Model" +new: "Modele" + +id: LANG_MPEG_DECODER +desc: Used alot +eng: "MPEG Decoder" +new: "Decodeur MPEG" diff -rubBP /home/dast/src/rockbox/apps/lang/hebrew.lang ./apps/lang/hebrew.lang --- /home/dast/src/rockbox/apps/lang/hebrew.lang Fri Apr 25 14:52:52 2003 +++ ./apps/lang/hebrew.lang Wed Oct 29 15:12:11 2003 @@ -1,4 +1,4 @@ -# $Id: hebrew.lang,v 1.4 2003/04/21 16:15:10 hohensoh Exp $ +# $Id: hebrew.lang,v 1.1.1.1 2003/10/29 14:12:11 knobby2346 Exp $ # # This is the master of the language files. This is the original, the one with # all the existing strings Rockbox features. Only in /home/dast/src/rockbox/apps/lang: islenska.lang diff -rubBP /home/dast/src/rockbox/apps/lang/italiano.lang ./apps/lang/italiano.lang --- /home/dast/src/rockbox/apps/lang/italiano.lang Wed Nov 19 07:34:43 2003 +++ ./apps/lang/italiano.lang Wed Oct 29 15:12:12 2003 @@ -662,38 +662,38 @@ id: LANG_SOKOBAN_LEVEL desc: must be smaller than 6 characters -eng: "" -new: "" +eng: "Level" +new: "Liv." id: LANG_SOKOBAN_MOVE desc: must be smaller than 6 characters -eng: "" -new: "" +eng: "Moves" +new: "Mosse" id: LANG_SOKOBAN_WIN desc: displayed when you win -eng: "" -new: "" +eng: "YOU WIN!!" +new: "HAI VINTO!!" id: LANG_SOKOBAN_QUIT desc: how to quit game -eng: "" -new: "" +eng: "[Off] To Stop" +new: "[Off] Per Interrompere" id: LANG_SOKOBAN_F1 desc: what does F1 do -eng: "" -new: "" +eng: "[F1] - Level" +new: "[F1] - Livello" id: LANG_SOKOBAN_F2 desc: what does F2 do -eng: "" -new: "" +eng: "[F2] Same Level" +new: "[F2] Stesso Livello" id: LANG_SOKOBAN_F3 desc: what does F3 do -eng: "" -new: "" +eng: "[F3] + Level" +new: "[F3] + Livello" # Next ids are for Worlmet Game. # Lenght restrictions for score board strings (LANG_SB_XXX): @@ -702,38 +702,38 @@ id: LANG_WORMLET_LENGTH desc: wormlet game -eng: "" -new: "" +eng: "Len:%d" +new: "Lun:%d" id: LANG_WORMLET_GROWING desc: wormlet game -eng: "" -new: "" +eng: "Growing" +new: "Cresce" id: LANG_WORMLET_HUNGRY desc: wormlet game -eng: "" -new: "" +eng: "Hungry" +new: "Fame" id: LANG_WORMLET_WORMED desc: wormlet game -eng: "" -new: "" +eng: "Wormed" +new: "Vermato" id: LANG_WORMLET_ARGH desc: wormlet game -eng: "" -new: "" +eng: "Argh" +new: "Argh" id: LANG_WORMLET_CRASHED desc: wormlet game -eng: "" -new: "" +eng: "Crashed" +new: "Scontro" id: LANG_WORMLET_HIGHSCORE desc: wormlet game -eng: "" -new: "" +eng: "Hs: %d" +new: "Rec: %d" # Length restrictions for wormlet config screen strings (LANG_CS_XXX) # They must fit on the entire screen - preferably with the @@ -741,50 +741,50 @@ id: LANG_WORMLET_PLAYERS desc: wormlet game -eng: "" -new: "" +eng: "%d Players UP/DN" +new: "%d Giocatori Su/Giů" id: LANG_WORMLET_WORMS desc: wormlet game -eng: "" -new: "" +eng: "%d Worms L/R" +new: "%d Vermi D/S" id: LANG_WORMLET_REMOTE_CTRL desc: wormlet game -eng: "" -new: "" +eng: "Remote control F1" +new: "Telecomando F1" id: LANG_WORMLET_NO_REM_CTRL desc: wormlet game -eng: "" -new: "" +eng: "No Rem. Control F1" +new: "No Telecomando F1" id: LANG_WORMLET_2_KEY_CTRL desc: wormlet game -eng: "" -new: "" +eng: "2 Key Control F1" +new: "Controllo 2 Tasti F1" id: LANG_WORMLET_4_KEY_CTRL desc: wormlet game -eng: "" -new: "" +eng: "4 Key Control F1" +new: "Controllo 4 Tasti F1" id: LANG_WORMLET_NO_CONTROL desc: wormlet game -eng: "" -new: "" +eng: "Out Of Control" +new: "Fuori Controllo" # Wormlet game ids ended id: LANG_TETRIS_LOSE desc: tetris game -eng: "" -new: "" +eng: "You Lose!" +new: "Hai Perso!" id: LANG_TETRIS_LEVEL desc: tetris game -eng: "" -new: "" +eng: "Rows - Level" +new: "Linee - Livello" id: LANG_POWEROFF_IDLE desc: in settings_menu @@ -1495,258 +1495,6 @@ eng: "Inverse" new: "Invertito" -id: LANG_MAX_FILES_IN_DIR -desc: in settings_menu -eng: "Max files in dir browser" -new: "Massimo Numero Di Files Nel Dir Browser" - -id: LANG_MAX_FILES_IN_PLAYLIST -desc: in settings_menu -eng: "Max playlist size" -new: "Dimensione Massima Playlist" - -id: LANG_JUMP_SCROLL -desc: (player) menu altarnative for jump scroll -eng: "Jump scroll" -new: "Salto Scorrimento" - -id: LANG_ONE_TIME -desc: (player) the jump scroll shall be done "one time" -eng: "One time" -new: "Una Volta" - -id: LANG_ALWAYS -desc: (player) the jump scroll shall be done "always" -eng: "Always" -new: "Sempre" - -id: LANG_JUMP_SCROLL_DELAY -desc: (player) Delay before making a jump scroll -eng: "Jump Scroll Delay" -new: "Ritardo Salto Scorrimento" - -id: LANG_RECORD_TIMESPLIT -desc: Prompt for record timer interval setting, in the record settings menu -eng: "Time Split" -new: "Intervallo Di Tempo" - -id: LANG_RECORD_TIMESPLIT_REC -decs: Display of record timer interval setting, on the record screen -eng: "Split time:" -new: "Intervallo Di Tempo:" - -id: LANG_SHOW_ICONS -desc: in settings_menu -eng: "Show Icons" -new: "Mostra Icone" - -id: LANG_DISK_FULL -desc: in recording screen -eng: "The disk is full. Press OFF to continue." -new: "Disco Pieno. Premi OFF Per Continuare" - -id: LANG_CONFIRM_WITH_PLAY_RECORDER -desc: Generic recorder string to use to confirm -eng: "PLAY = Yes" -new: "PLAY = Si" - -id: LANG_CANCEL_WITH_ANY_RECORDER -desc: Generic recorder string to use to cancel -eng: "Any Other = No" -new: "Qualsiasi Altro = No" - -## -## Strings used in the plugin loader: -## - -id: LANG_PLUGIN_CANT_OPEN -desc: Plugin open error message -eng: "Can't open %s" -new: "Non Riesco Ad Aprire %s" - -id: LANG_READ_FAILED -desc: There was an error reading a file -eng: "Failed reading %s" -new: "Errore In Lettura Di %s" - -id: LANG_PLUGIN_WRONG_MODEL -desc: The plugin is not compatible with the archos model trying to run it -eng: "Incompatible model" -new: "Modello Incompatibile" - -id: LANG_PLUGIN_WRONG_VERSION -desc: The plugin is not compatible with the rockbox version trying to run it -eng: "Incompatible version" -new: "Versione Incompatibile" - -id: LANG_PLUGIN_ERROR -desc: The plugin return an error code -eng: "Plugin returned error" -new: "Errore Di Ritorno Del Plugin" - -## -## boot change detection -## - -id: LANG_BOOT_CHANGED -desc: File browser discovered the boot file was changed -eng: "Boot changed" -new: "Boot Cambiato" - -id: LANG_REBOOT_NOW -desc: Do you want to reboot? -eng: "Reboot now?" -new: "Riavviare Adesso?" - -id: LANG_FLIPIT -desc: in the games menu -eng: "Flipit" -new: "Flipit" - -id: LANG_OTHELO -desc: in the games menu -eng: "Othelo" -new: "Othelo" - -id: LANG_SLIDING_PUZZLE -desc: in the games menu -eng: "Sliding Puzzle" -new: "Sliding Puzzle" - -id: LANG_STAR -desc: in the games menu -eng: "Star" -new: "Star" - -id: LANG_QUEUE_LAST -desc: in onplay menu. queue a track/playlist at end of playlist. -eng: "Queue last" -new: "Accoda All'ultima" - -id: LANG_INSERT -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert" -new: "Inserisci" - -id: LANG_INSERT_LAST -desc: in onplay menu. append a track/playlist into dynamic playlist. -eng: "Insert last" -new: "Inserisci In Fondo" - -id: LANG_QUEUE_FIRST -desc: in onplay menu. queue a track/playlist into dynamic playlist. -eng: "Queue next" -new: "Accoda Alla Prossima" - -id: LANG_INSERT_FIRST -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert next" -new: "Inserisci Accanto" - -id: LANG_SAVE_DYNAMIC_PLAYLIST -desc: in playlist menu. -eng: "Save Dynamic Playlist" -new: "Salva Playlist Dinamica" - -id: LANG_PLAYLIST_MENU -desc: in main menu. -eng: "Playlist Options" -new: "Opzioni Playlist" - -id: LANG_PLAYLIST_INSERT_COUNT -desc: splash number of tracks inserted -eng: "Inserted %d tracks (%s)" -new: "Inserite %d Traccie (%s)" - -id: LANG_PLAYLIST_QUEUE_COUNT -desc: splash number of tracks queued -eng: "Queued %d tracks (%s)" -new: "Accodate %d Traccie (%s)" - -id: LANG_PLAYLIST_SAVE_COUNT -desc: splash number of tracks saved -eng: "Saved %d tracks (%s)" -new: "Salvate %d Traccie (%s)" - -id: LANG_OFF_ABORT -desc: Used on recorder models -eng: "OFF to abort" -new: "OFF Per Annullare" - -id: LANG_STOP_ABORT -desc: Used on player models -eng: "STOP to abort" -new: "STOP Per Annullare" - -id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR -desc: Playlist error -eng: "Error updating playlist control file" -new: "Errore Aggiornamento File Di Controllo Playlist" - -id: LANG_PLAYLIST_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist file" -new: "Errore Accesso File Playlist" - -id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist control file" -new: "Errore Accesso File Di Controllo Playlist" - -id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing directory" -new: "Errore Accesso Directory" - -id: LANG_PLAYLIST_CONTROL_INVALID -desc: Playlist resume error -eng: "Playlist control file is invalid" -new: "File Controllo Playlist Non Valido" - -id: LANG_RECURSE_DIRECTORY -desc: In playlist menu -eng: "Recursively Insert Directories" -new: "Inserimento Directories In Modo Ricorsivo" - -id: LANG_RECURSE_DIRECTORY_QUESTION -desc: Asked from onplay screen -eng: "Recursively?" -new: "In Modo Ricorsivo?" - -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Fonts" - -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" -new: "Firmware" - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Lingua" - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "Schermata Riproduzione Files" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Configurazioni" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: "Plugins" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Modalitŕ Adattatore Auto" diff -rubBP /home/dast/src/rockbox/apps/lang/nederlands.lang ./apps/lang/nederlands.lang --- /home/dast/src/rockbox/apps/lang/nederlands.lang Thu Dec 4 16:35:38 2003 +++ ./apps/lang/nederlands.lang Wed Oct 29 15:12:13 2003 @@ -1,4 +1,4 @@ -# $Id: nederlands.lang,v 1.25 2003/12/04 14:29:06 zagor Exp $ +# $Id: nederlands.lang,v 1.1.1.1 2003/10/29 14:12:13 knobby2346 Exp $ id: LANG_SOUND_SETTINGS desc: in the main menu @@ -137,8 +137,8 @@ id: LANG_SETTINGS_BATTERY_PLAYER desc: if save settings has failed -eng: "Partition?" -new: "Partitie?" +eng: "Batt. Low?" +new: "Batt. Leeg?" id: LANG_SETTINGS_SAVE_RECORDER desc: displayed if save settings has failed @@ -147,8 +147,8 @@ id: LANG_SETTINGS_BATTERY_RECORDER desc: if save settings has failed -eng: "No partition?" -new: "Geen Partitie?" +eng: "Is Battery Low?" +new: "Is de batterij leeg ?" id: LANG_TIME_SET desc: used in set_time() @@ -1678,99 +1678,9 @@ id: LANG_STOP_ABORT desc: Used on player models eng: "STOP to abort" -new: 'STOP om af te breken" +new: "STOP om af te breken" id: LANG_RECURSE_DIRECTORY_QUESTION desc: Asked from onplay screen eng: "Recursively?" new: "Ook sub-directories?" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Configuraties" - -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Lettertypes" - -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" -new: - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Taal" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "Afspeelscherm" - -id: LANG_BUTTONBAR_MENU -desc: in button bar -eng: "Menu" -new: - -id: LANG_BUTTONBAR_OPTIONS -desc: in button bar -eng: "Option" -new: "Optie" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Auto Adaptor Mode" - -id: LANG_FM_BUTTONBAR_PRESETS -desc: in button bar -eng: "Preset" -new: "Voorkeuze" - -id: LANG_FM_DELETE_PRESET -desc: in radio screen -eng: "Remove preset" -new: "Verwijder voorkeuze" - -id: LANG_FM_NO_FREE_PRESETS -desc: in radio screen -eng: "The preset list is full" -new: "De voorkeuze lijst is vol" - -id: LANG_FM_NO_PRESETS -desc: in radio screen -eng: "The preset list is empty" -new: "De Voorkeuze lijst is leeg" - -id: LANG_FM_PRESET_SAVE_FAILED -desc: in radio screen -eng: "Preset save failed" -new: "Opslaan voorkeuze mislukt" - -id: LANG_FM_SAVE_PRESET -desc: in radio screen -eng: "Save preset" -new: "Sla voorkeuze op" - -id: LANG_FM_STATION -desc: in radio screen -eng: "Station: %d.%dMHz" -new: "Zender: %d.%dMHz" - -id: LANG_LINE_IN -desc: in settings_menu -eng: "Line In" -new: "Lijn in" - -id: LANG_NO_FILES -desc: in settings_menu -eng: "No files" -new: "Geen bestanden" Only in /home/dast/src/rockbox/apps/lang: polski-ascii.lang diff -rubBP /home/dast/src/rockbox/apps/lang/polski.lang ./apps/lang/polski.lang --- /home/dast/src/rockbox/apps/lang/polski.lang Thu Dec 4 16:35:39 2003 +++ ./apps/lang/polski.lang Wed Oct 29 15:12:14 2003 @@ -1,16 +1,14 @@ -# $Id: polski.lang,v 1.9 2003/12/04 14:29:06 zagor Exp $ -# Polish translation: monter.FM (2003/10/29 15:50:00) -# Use clR6x8-8859-2 font to display properly (only in AJB Recorder). -# +# $Id: polski.lang,v 1.1.1.1 2003/10/29 14:12:14 knobby2346 Exp $ + id: LANG_SOUND_SETTINGS desc: in the main menu eng: "Sound Settings" -new: "Ustawienia dźwięku" +new: "Ustawienia dzwieku" id: LANG_GENERAL_SETTINGS desc: in the main menu eng: "General Settings" -new: "Ustawienia główne" +new: "Ustawienia" id: LANG_GAMES desc: in the main menu @@ -35,17 +33,17 @@ id: LANG_DEBUG desc: in the main menu eng: "Debug (Keep Out!)" -new: "Podgląd procesów" +new: "Sledz bledy (ostroznie!)" id: LANG_USB desc: in the main menu eng: "USB (Sim)" -new: "USB (Sim)" +new: "USB (sim)" id: LANG_ROCKBOX_INFO desc: displayed topmost on the info screen eng: "Rockbox Info:" -new: "Rockbox info:" +new: "Rockbox Info:" id: LANG_BUFFER_STAT_PLAYER desc: the buffer size player-screen width, %d MB %d fraction of MB @@ -55,7 +53,7 @@ id: LANG_BUFFER_STAT_RECORDER desc: the buffer size recorder-screen width, %d MB %d fraction of MB eng: "Buffer: %d.%03dMB" -new: "Bufor: %d.%03d MB" +new: "Bufor: %d.%03dMB" id: LANG_BATTERY_LEVEL_PLAYER desc: the battery level in percentage @@ -70,17 +68,17 @@ id: LANG_BATTERY_CHARGE desc: tells that the battery is charging, instead of battery level eng: "Battery: Charging" -new: "Bateria: Ładowanie" +new: "Bateria: ladowanie" id: LANG_BOUNCE desc: in the demos menu eng: "Bounce" -new: "Skaczący napis" +new: "Skaczacy napis" id: LANG_SNOW desc: in the demos menu eng: "Snow" -new: "Śnieg" +new: "Snieg" id: LANG_TETRIS desc: in the games menu @@ -100,20 +98,18 @@ id: LANG_SNAKE desc: in the games menu eng: "Snake" -new: "Wąż" +new: "Waz" id: LANG_PLAYLIST_LOAD desc: displayed on screen while loading a playlist eng: "Loading..." -new: "Ładuję..." +new: "Ladowanie..." -# NO LONGER USED id: LANG_PLAYLIST_SHUFFLE desc: displayed on screen while shuffling a playlist eng: "Shuffling..." -new: "Losuję..." +new: "Losowanie..." -# NO LONGER USED id: LANG_PLAYLIST_PLAY desc: displayed on screen when start playing a playlist eng: "Playing..." @@ -127,33 +123,32 @@ id: LANG_PLAYINDICES_BUFFER desc: in playlist.indices() when playlist is full eng: "Buffer Full" -new: "Pełny bufor" +new: "Pelny bufor" -# NO LONGER USED id: LANG_PLAYINDICES_AMOUNT desc: number of files in playlist eng: "%d Files" -new: "%d plików" +new: "%d plikow" id: LANG_SETTINGS_SAVE_PLAYER desc: displayed if save settings has failed eng: "Save Failed" -new: "Błąd zapisu" +new: "Blad zapisu" id: LANG_SETTINGS_BATTERY_PLAYER desc: if save settings has failed -eng: "Partition?" -new: "Partycja?" +eng: "Batt. Low?" +new: "Slabe bat.?" id: LANG_SETTINGS_SAVE_RECORDER desc: displayed if save settings has failed eng: "Save Failed" -new: "Błąd zapisu" +new: "Blad zapisu" id: LANG_SETTINGS_BATTERY_RECORDER desc: if save settings has failed -eng: "No partition?" -new: "Brak partycji?" +eng: "Is Battery Low?" +new: "Slabe baterie?" id: LANG_TIME_SET desc: used in set_time() @@ -163,22 +158,22 @@ id: LANG_TIME_REVERT desc: used in set_time() eng: "OFF To Revert" -new: "OFF - przywróć" +new: "OFF - przywroc" id: LANG_HIDDEN desc: in settings_menu eng: "" -new: +new: "Ukryte pliki" id: LANG_HIDDEN_SHOW desc: in settings_menu eng: "" -new: +new: "Pokaz" id: LANG_HIDDEN_HIDE desc: in settings_menu eng: "" -new: +new: "Ukryj" id: LANG_CONTRAST desc: in settings_menu @@ -198,22 +193,22 @@ id: LANG_MP3FILTER desc: in settings_menu eng: "" -new: +new: "Filtr muzyczny" id: LANG_SORT_CASE desc: in settings_menu eng: "Sort Case Sensitive" -new: "Sortuj uwzgl. wielkość liter" +new: "Sortuj uwzgl. wielkosc liter" id: LANG_RESUME desc: in settings_menu eng: "Resume" -new: "Dokończ" +new: "Dokoncz" id: LANG_OFF desc: Used in a lot of places eng: "Off" -new: "wył." +new: "wyl." id: LANG_RESUME_SETTING_ASK desc: in settings_menu @@ -223,27 +218,27 @@ id: LANG_ON desc: Used in a lot of places eng: "On" -new: "włącz" +new: "wlacz" id: LANG_BACKLIGHT desc: in settings_menu eng: "Backlight" -new: "Podświetlenie" +new: "Podswietlenie" id: LANG_SCROLL desc: in settings_menu eng: "Scroll Speed Setting Example" -new: "Przykładowa prędkość przesuwu" +new: "Przykladowa predkosc przesuwu" id: LANG_DISCHARGE desc: in settings_menu eng: "Deep Discharge" -new: "Rozładowanie" +new: "Rozladowanie" id: LANG_TIME desc: in settings_menu eng: "Set Time/Date" -new: "Ustaw datę/czas" +new: "Ustaw Date/Czas" id: LANG_SPINDOWN desc: in settings_menu @@ -253,40 +248,40 @@ id: LANG_FFRW_STEP desc: in settings_menu eng: "FF/RW Min Step" -new: "Minim. skok przewijania" +new: "Skok przewijania (minim.)" id: LANG_FFRW_ACCEL desc: in settings_menu eng: "FF/RW Accel" -new: "Przyśpieszenie przewijania" +new: "Przyspieszenie przewijania" id: LANG_FOLLOW desc: in settings_menu eng: "Follow Playlist" -new: "Idź do playlisty" +new: "Idz do playlisty" # depreciated id: LANG_RESET_ASK_PLAYER desc: confirm to reset settings eng: "" -new: +new: "Na pewno?" # depreciated id: LANG_RESET_CONFIRM_PLAYER desc: confirm to reset settings eng: "" -new: +new: "GRAJ/STOP" id: LANG_RESET_ASK_RECORDER desc: confirm to reset settings eng: "Are You Sure?" -new: "Jesteś pewny?" +new: "Jestes pewny?" # depreciated id: LANG_RESET_CONFIRM_RECORDER desc: confirm to reset settings eng: "" -new: +new: "GRAJ = Tak" # depreciated id: LANG_RESET_CANCEL_RECORDER @@ -302,12 +297,12 @@ id: LANG_RESET_DONE_CLEAR desc: visual confirmation after settings reset eng: "Cleared" -new: "wyczyszczone" +new: "Oczyszczono" id: LANG_RESET_DONE_CANCEL desc: Visual confirmation of cancelation eng: "Canceled" -new: "anulowane" +new: "Anulowano" id: LANG_CASE_MENU desc: in fileview_settings_menu() @@ -317,12 +312,12 @@ id: LANG_SCROLL_MENU desc: in display_settings_menu() eng: "Scroll" -new: "Przesuwanie napisów" +new: "Przesuwanie napisow" id: LANG_RESET desc: in system_settings_menu() eng: "Reset Settings" -new: "Ustawienia domyślne" +new: "Ustawienia domyslne" id: LANG_PLAYBACK desc: in settings_menu() @@ -332,12 +327,12 @@ id: LANG_FILE desc: in settings_menu() eng: "File View" -new: "Widok plików" +new: "Widok plikow" id: LANG_DISPLAY desc: in settings_menu() eng: "Display" -new: "Wyświetlanie" +new: "Wyswietlanie" id: LANG_SYSTEM desc: in settings_menu() @@ -367,7 +362,7 @@ id: LANG_LOUDNESS desc: in sound_settings eng: "Loudness" -new: "Głośność" +new: "Glosnosc" id: LANG_BBOOST desc: in sound settings @@ -377,17 +372,17 @@ id: LANG_DECAY desc: in sound_settings eng: "AV Decay Time" -new: "Czas wyciszenia" +new: "Czas zejscia" id: LANG_CHANNEL_MENU desc: in sound_settings eng: "Channels" -new: "Kanały" +new: "Kanaly" id: LANG_CHANNEL desc: in sound_settings eng: "Channel Configuration" -new: "Konfiguracja kanałów" +new: "Konfiguracja kanalow" id: LANG_CHANNEL_STEREO desc: in sound_settings @@ -417,34 +412,32 @@ id: LANG_SHOWDIR_ERROR_BUFFER desc: in showdir(), displayed on screen when you reach buffer limit eng: "Dir Buffer" -new: "Bufor katalogów" +new: "Bufor katalogow" id: LANG_SHOWDIR_ERROR_FULL desc: in showdir(), displayed on screen when you reach buffer limit eng: "Is Full!" -new: "jest pełny!" +new: "jest pelny!" id: LANG_RESUME_ASK desc: question asked at the begining when resume is on eng: "Resume?" -new: "Dokończyć?" +new: "Dokonczyc?" id: LANG_RESUME_CONFIRM_PLAYER desc: possible answers to resume question eng: "(PLAY/STOP)" new: "(GRAJ/STOP)" -# depreciated id: LANG_RESUME_CONFIRM_RECORDER desc: possible answer to resume question -eng: "" -new: +eng: "PLAY = Yes" +new: "GRAJ = Tak" -# depreciated id: LANG_RESUME_CANCEL_RECORDER desc: possible answer to resume question -eng: "" -new: +eng: "Any Other = No" +new: "Kazdy inny = Nie" id: LANG_KEYLOCK_ON_PLAYER desc: displayed when key lock is on @@ -459,12 +452,12 @@ id: LANG_KEYLOCK_ON_RECORDER desc: displayed when key lock is on eng: "Key Lock Is ON" -new: "Klawisze są zablokowane" +new: "Klawisze sa zablokowane" id: LANG_KEYLOCK_OFF_RECORDER desc: displayed when key lock is turned off eng: "Key Lock Is OFF" -new: "Klawisze są odblokowane" +new: "Klawisze sa odblokowane" id: LANG_MUTE_ON_PLAYER desc: displayed when mute is on @@ -499,12 +492,12 @@ id: LANG_ID3_TITLE desc: in wps eng: "[Title]" -new: "[Tytuł]" +new: "[Tytul]" id: LANG_ID3_NO_TITLE desc: in wps when no title is avaible eng: "" -new: "" +new: "" id: LANG_ID3_ARTIST desc: in wps @@ -529,17 +522,17 @@ id: LANG_ID3_TRACKNUM desc: in wps eng: "[Tracknum]" -new: "[Ścieżka nr]" +new: "[Sciezka nr]" id: LANG_ID3_NO_TRACKNUM desc: in wps if no track number is avaible eng: "" -new: "" +new: "" id: LANG_ID3_LENGHT desc: in wps eng: "[Length]" -new: "[Długość]" +new: "[Dlugosc]" id: LANG_ID3_PLAYLIST desc: in wps @@ -554,22 +547,22 @@ id: LANG_ID3_FRECUENCY desc: in wps eng: "[Frequency]" -new: "[Częstotl.]" +new: "[Czestotl.]" id: LANG_ID3_PATH desc: in wps eng: "[Path]" -new: "[Ścieżka]" +new: "[Sciezka]" id: LANG_PITCH_UP desc: in wps eng: "Pitch Up" -new: "Podnieś" +new: "Podnies" id: LANG_PITCH_DOWN desc: in wps eng: "Pitch Down" -new: "Obniż" +new: "Obniz" id: LANG_PAUSE desc: in wps @@ -579,17 +572,17 @@ id: LANG_F2_MODE desc: in wps F2 pressed eng: "Mode:" -new: "Tryb:" +new: "tryb:" id: LANG_DIR_FILTER desc: in wps F2 pressed eng: "" -new: +new: "Filtr katalogow: %s" id: LANG_F3_STATUS desc: in wps F3 pressed eng: "Status" -new: "Górny" +new: "Gorny" id: LANG_F3_SCROLL desc: in wps F3 pressed @@ -609,7 +602,7 @@ id: LANG_END_CONFIRM_PLAYER desc: when playlist has finished eng: "" -new: +new: "Wcisnij ON" id: LANG_END_PLAYLIST_RECORDER desc: when playlist has finished @@ -619,12 +612,12 @@ id: LANG_END_CONFIRM_RECORDER desc: when playlist has finished eng: "" -new: +new: "Wcisnij ON" id: LANG_SNAKE_SCORE desc: when you die in snake game eng: "Your score:" -new: "Twój wynik:" +new: "Twoj wynik:" id: LANG_SNAKE_HISCORE desc: high score in snake game @@ -649,7 +642,7 @@ id: LANG_SNAKE_QUIT desc: how to quit game eng: "[OFF] To Quit" -new: "[OFF] zakończ" +new: "[OFF] zakoncz" id: LANG_SNAKE_LEVEL desc: level of difficulty @@ -668,38 +661,38 @@ id: LANG_SOKOBAN_LEVEL desc: must be smaller than 6 characters -eng: "" -new: +eng: "Level" +new: "Trudn" id: LANG_SOKOBAN_MOVE desc: must be smaller than 6 characters -eng: "" -new: +eng: "Moves" +new: "Ruchy" id: LANG_SOKOBAN_WIN desc: displayed when you win -eng: "" -new: +eng: "YOU WIN!!" +new: "WYGRALES!" id: LANG_SOKOBAN_QUIT desc: how to quit game -eng: "" -new: +eng: "[OFF] To Stop" +new: "[OFF] zatrzymaj" id: LANG_SOKOBAN_F1 desc: what does F1 do -eng: "" -new: +eng: "[F1] - Level" +new: "[F1] - poziom" id: LANG_SOKOBAN_F2 desc: what does F2 do -eng: "" -new: +eng: "[F2] Same Level" +new: "[F2] ten sam poz." id: LANG_SOKOBAN_F3 desc: what does F3 do -eng: "" -new: +eng: "[F3] + Level" +new: "[F3] + poziom" # Next ids are for Worlmet Game. # Lenght restrictions for score board strings (LANG_SB_XXX): @@ -708,38 +701,38 @@ id: LANG_WORMLET_LENGTH desc: wormlet game -eng: "" -new: +eng: "Len:%d" +new: "Dl.:%d" id: LANG_WORMLET_GROWING desc: wormlet game -eng: "" -new: +eng: "Growing" +new: "Rosnie" id: LANG_WORMLET_HUNGRY desc: wormlet game -eng: "" -new: +eng: "Hungry" +new: "Glodny" id: LANG_WORMLET_WORMED desc: wormlet game -eng: "" -new: +eng: "Wormed" +new: "robacz." id: LANG_WORMLET_ARGH desc: wormlet game -eng: "" -new: +eng: "Argh" +new: "Auc" id: LANG_WORMLET_CRASHED desc: wormlet game -eng: "" -new: +eng: "Crashed" +new: "Rozbity" id: LANG_WORMLET_HIGHSCORE desc: wormlet game -eng: "" -new: +eng: "Hs: %d" +new: "Rek.%d" # Length restrictions for wormlet config screen strings (LANG_CS_XXX) # They must fit on the entire screen - preferably with the @@ -747,65 +740,65 @@ id: LANG_WORMLET_PLAYERS desc: wormlet game -eng: "" -new: +eng: "%d Players UP/DN" +new: "%d Graczy G/D" id: LANG_WORMLET_WORMS desc: wormlet game -eng: "" -new: +eng: "%d Worms L/R" +new: "%d Robakow L/P" id: LANG_WORMLET_REMOTE_CTRL desc: wormlet game -eng: "" -new: +eng: "Remote Control F1" +new: "Zdalne ster. F1" id: LANG_WORMLET_NO_REM_CTRL desc: wormlet game -eng: "" -new: +eng: "No Rem. Control F1" +new: "Brak zdal.ster. F1" id: LANG_WORMLET_2_KEY_CTRL desc: wormlet game -eng: "" -new: +eng: "2 Key Control F1" +new: "2 klaw. steruj. F1" id: LANG_WORMLET_4_KEY_CTRL desc: wormlet game -eng: "" -new: +eng: "4 Key Control F1" +new: "4 klaw. steruj. F1" id: LANG_WORMLET_NO_CONTROL desc: wormlet game -eng: "" -new: +eng: "Out Of Control" +new: " Brak sterow. " # Wormlet game ids ended id: LANG_TETRIS_LOSE desc: tetris game -eng: "" -new: +eng: "You Lose!" +new: "Przegrales!" id: LANG_TETRIS_LEVEL desc: tetris game -eng: "" -new: +eng: "Rows - Level" +new: "rzedow - poziom" id: LANG_POWEROFF_IDLE desc: in settings_menu eng: "Idle Poweroff" -new: "Aut. wylączanie" +new: "Aut. wylaczanie" id: LANG_LANGUAGE_LOADED desc: shown when a language has been loaded from the dir browser eng: "New Language" -new: "Nowy język" +new: "Nowy jezyk" id: LANG_FILTER desc: setting name for dir filter eng: "Show Files" -new: "Pokaż pliki" +new: "Pokaz pliki" id: LANG_FILTER_MUSIC desc: show only music-related files @@ -835,7 +828,7 @@ id: LANG_PM_MENU desc: in the display menu eng: "Peak Meter" -new: "Wskaźnik szczyt." +new: "Wskaznik szczyt." id: LANG_PM_RELEASE desc: in the peak meter menu @@ -865,12 +858,12 @@ id: LANG_BACKLIGHT_ON_WHEN_CHARGING desc: in display_settings_menu eng: "Backlight On When Plugged" -new: "Podświetl kiedy podłączony" +new: "Podswietl kiedy podlaczony" id: LANG_REPEAT desc: in settings_menu eng: "Repeat" -new: "Powtórz" +new: "Powtorz" id: LANG_REPEAT_ALL desc: repeat playlist once all songs have completed @@ -929,7 +922,7 @@ id: LANG_WEEKDAY_WEDNESDAY desc: Maximum 3-letter abbreviation for weekday eng: "Wed" -new: "Śro" +new: "Sro" id: LANG_WEEKDAY_THURSDAY desc: Maximum 3-letter abbreviation for weekday @@ -939,7 +932,7 @@ id: LANG_WEEKDAY_FRIDAY desc: Maximum 3-letter abbreviation for weekday eng: "Fri" -new: "Pią" +new: "Pia" id: LANG_WEEKDAY_SATURDAY desc: Maximum 3-letter abbreviation for weekday @@ -994,7 +987,7 @@ id: LANG_MONTH_OCTOBER desc: Maximum 3-letter abbreviation for monthname eng: "Oct" -new: "Paź" +new: "Paz" id: LANG_MONTH_NOVEMBER desc: Maximum 3-letter abbreviation for monthname @@ -1009,7 +1002,7 @@ id: LANG_CUBE desc: the name of the cube demo in the demo menu eng: "Cube" -new: "Bryła" +new: "Bryla" id: LANG_OSCILLOGRAPH desc: the name of the oscillograph demo in the demo menu @@ -1024,52 +1017,52 @@ id: LANG_BATTERY_DISPLAY desc: Battery type title eng: "Battery Display" -new: "Wyświetlanie baterii" +new: "Wyswietlanie baterii" id: LANG_VOLUME_DISPLAY desc: Volume type title eng: "Volume Display" -new: "Wyświetlanie wzmocnienia" +new: "Wyswietlanie wzmocnienia" id: LANG_DISPLAY_GRAPHIC desc: Label for type of icon display eng: "Graphic" -new: "graficznie" +new: "Graficznie" id: LANG_DISPLAY_NUMERIC desc: Label for type of icon display eng: "Numeric" -new: "numerycznie" +new: "Numerycznie" id: LANG_PM_PERFORMANCE desc: in the peak meter menu eng: "Performance" -new: "Wydajność" +new: "Wydajnosc" id: LANG_PM_HIGH_PERFORMANCE desc: in the peak meter menu eng: "High performance" -new: "Wysoka wydajność" +new: "Wysoka wydajnosc" id: LANG_PM_ENERGY_SAVER desc: in the peak meter menu eng: "Save Energy" -new: "Oszczędz. energii" +new: "Oszczedz. energii" id: LANG_PM_SCALE desc: in the peak meter menu -eng: "Scale" -new: "Wskaźnik" +eng: "dBfs <-> Linear" +new: "dBfs <-> linearny" id: LANG_PM_DBFS desc: in the peak meter menu -eng: "Logarithmic(dB)" -new: "logarytmiczny (dB)" +eng: "dBfs" +new: "dBfs" id: LANG_PM_LINEAR desc: in the peak meter menu -eng: "Linear(%)" -new: "linearny (%)" +eng: "Linear" +new: "linearny" id: LANG_PM_MIN desc: in the peak meter menu @@ -1104,22 +1097,22 @@ id: LANG_RECORDING_QUALITY desc: in the recording settings eng: "Quality" -new: "Jakość" +new: "Jakosc" id: LANG_RECORDING_FREQUENCY desc: in the recording settings eng: "Frequency" -new: "Częstotliwość" +new: "Czestotliwosc" id: LANG_RECORDING_SOURCE desc: in the recording settings eng: "Source" -new: "Źródło" +new: "Zrodlo" id: LANG_RECORDING_CHANNELS desc: in the recording settings eng: "Channels" -new: "Kanały" +new: "Kanaly" id: LANG_RECORDING_SRC_MIC desc: in the recording settings @@ -1144,7 +1137,7 @@ id: LANG_DISK_STAT desc: disk size info eng: "Disk: %d.%dGB" -new: "Dysk: %d.%dGB" +new: "Dysk %d.%dGB" id: LANG_DISK_FREE_STAT desc: disk size info @@ -1154,7 +1147,7 @@ id: LANG_POWEROFF desc: disk poweroff flag eng: "Disk Poweroff" -new: "Wyłączanie dysku" +new: "Wylaczanie dysku" id: LANG_FILTER_PLAYLIST desc: show only playlist @@ -1174,7 +1167,7 @@ id: LANG_MP3BUFFER_MARGIN desc: MP3 buffer margin time eng: "Anti-Skip Buffer" -new: "Bufor antywstrząsowy" +new: "Bufor antywstrzasowy" id: LANG_BIDIR_SCROLL desc: Bidirectional scroll limit @@ -1184,7 +1177,7 @@ id: LANG_SCROLL_DELAY desc: Delay before scrolling eng: "Scroll Start Delay" -new: "Opóźnienie rozpoczęcia przesuwania" +new: "Opoznienie rozpoczecia przesuwania" id: LANG_SCROLL_STEP desc: Pixels to advance per scroll @@ -1194,32 +1187,32 @@ id: LANG_SCROLL_STEP_EXAMPLE desc: Pixels to advance per scroll eng: "Scroll Step Size Setting Example Text" -new: "Przykładowy rozmiar skoku przesuwania" +new: "Przykladowy rozmiar skoku przesuwania" id: LANG_SCROLL_SPEED desc: in display_settings_menu() eng: "Scroll Speed" -new: "Prędkość przesuwania" +new: "Predkosc przesuwania" id: LANG_TRICKLE_CHARGE desc: in settings_menu eng: "Trickle Charge" -new: "Wolne ładowanie" +new: "Wolne ladowanie" id: LANG_BATTERY_TOPOFF_CHARGE desc: in info display, shows that top off charge is running eng: "Battery: Top-Off Chg" -new: "Bateria: Doładowanie" +new: "Bateria: Doladowanie" id: LANG_BATTERY_TRICKLE_CHARGE desc: in info display, shows that trickle charge is running eng: "Battery: Trickle Chg" -new: "Bateria: Wolne ładowanie" +new: "Bateria: Wolne ladowanie" id: LANG_BATTERY_CAPACITY desc: in settings_menu eng: "Battery Capacity" -new: "Pojemność baterii" +new: "Pojemnosc baterii" id: LANG_QUEUE_QUEUED desc: queued track name %s @@ -1269,7 +1262,7 @@ id: LANG_REALLY_DELETE desc: Really Delete? eng: "Delete?" -new: "Skasować?" +new: "Skasowac?" id: LANG_DELETED desc: A file has beed deleted @@ -1284,7 +1277,7 @@ id: LANG_FAILED desc: Something failed. To be appended after above actions eng: "Failed" -new: "nie udało się" +new: "nie udalo sie" id: LANG_ALARM_MOD_ALARM_MENU desc: The name of the additional entry in the main menu for the RTC alarm mod. @@ -1304,7 +1297,7 @@ id: LANG_ALARM_MOD_SHUTDOWN desc: The text that tells the user that the alarm time is ok and the device shuts off (for the RTC alarm mod). eng: "Shutting Down..." -new: "Wyłączanie..." +new: "Wylaczanie..." id: LANG_ALARM_MOD_ERROR desc: The text that tells that the time is incorrect (for the RTC alarm mod). @@ -1319,12 +1312,12 @@ id: LANG_CREATE_PLAYLIST desc: Menu option for creating a playlist eng: "Create Playlist" -new: "Stwórz playlistę" +new: "Stworz playliste" id: LANG_CREATING desc: Screen feedback during playlist creation eng: "Creating" -new: "Tworzę" +new: "Tworzenie" id: LANG_PLAYER_KEYBOARD_BACKSPACE desc: Backspace alternative in player keyboard interaction @@ -1344,12 +1337,12 @@ id: LANG_PLAYER_KEYBOARD_ABORT desc: Abort alternative in player keyboard interaction eng: "Abort" -new: "Opuść" +new: "Opusc" id: LANG_MENU_SHOW_ID3_INFO desc: Menu option to start id3 viewer eng: "Show ID3 Info" -new: "Pokaż info ID3" +new: "Pokaz info ID3" id: LANG_ID3_GENRE desc: ID3 frame 'genre' @@ -1377,9 +1370,9 @@ new: "Rozmiar:" id: LANG_CPU_SLEEP -desc: in system_settings_menu() (removed) -eng: "" -new: +desc: in system_settings_menu() +eng: "Power Saving" +new: "Oszczedzanie" id: LANG_SETTINGS_LOADED1 desc: Feedback shown when a .cfg file is loaded @@ -1389,32 +1382,32 @@ id: LANG_SETTINGS_LOADED2 desc: Feedback shown when a .cfg file is loaded eng: "Loaded" -new: "załadowane" +new: "zaladowane" id: LANG_FADE_ON_STOP desc: options menu to set fade on stop or pause eng: "Fade On Stop/Pause" -new: "Wycisz przy zatrzymaniu" +new: "Fade przy zatrzymaniu" id: LANG_SOKOBAN_ON desc: how to undo move eng: "[ON] To Undo" -new: "[ON] przywróć" +new: "[ON] przywroc" id: LANG_INVERT desc: in settings_menu -eng: "LCD Mode" -new: "Tryb LCD" +eng: "Invert" +new: "Negatyw" id: LANG_CHANNEL_STEREO_NARROW_PLAYER desc: in sound_settings eng: "St. Narrow" -new: "wąskie st." +new: "waskie st." id: LANG_CHANNEL_STEREO_NARROW_RECORDER desc: in sound_settings eng: "Stereo Narrow" -new: "wąskie stereo" +new: "waskie stereo" id: LANG_CHANNEL_STEREO_WIDE desc: in sound_settings @@ -1456,300 +1449,12 @@ eng: "Update VBR file" new: "Aktualizuj plik VBR" -id: LANG_INVERT_CURSOR -desc: in settings_menu -eng: "Line Selector" -new: "Zaznaczanie linii" - -id: LANG_RECORDING_EDITABLE -desc: Editable recordings setting -eng: "Independent frames" -new: "Niezależne ramki" - id: LANG_STATUS_BAR desc: display menu, F3 substitute eng: "Status Bar" -new: "Pasek stanu" +new: "Gorny pasek" id: LANG_SCROLL_BAR desc: display menu, F3 substitute eng: "Scroll Bar" -new: "Pasek przewijania" - -id: LANG_CAPTION_BACKLIGHT -desc: in settings_menu -eng: "Caption backlight" -new: "Podświetlanie napisów" - -id: LANG_INVERT_CURSOR_POINTER -desc: in settings_menu -eng: "Pointer" -new: "wskaźnik" - -id: LANG_INVERT_CURSOR_BAR -desc: in settings_menu -eng: "Bar(Inverse)" -new: "pasek (w negatywie)" - -id: LANG_INVERT_LCD_NORMAL -desc: in settings_menu -eng: "Normal" -new: "normalny" - -id: LANG_INVERT_LCD_INVERSE -desc: in settings_menu -eng: "Inverse" -new: "w negatywie" - -id: LANG_MAX_FILES_IN_DIR -desc: in settings_menu -eng: "Max files in dir browser" -new: "Maksym. plików w przeglądarce katalogów" - -id: LANG_MAX_FILES_IN_PLAYLIST -desc: in settings_menu -eng: "Max playlist size" -new: "Maksym. rozmiar playlisty" - -id: LANG_JUMP_SCROLL -desc: (player) menu altarnative for jump scroll -eng: "Jump scroll" -new: "Skok przewijania" - -id: LANG_ONE_TIME -desc: (player) the jump scroll shall be done "one time" -eng: "One time" -new: "jednorazowo" - -id: LANG_ALWAYS -desc: (player) the jump scroll shall be done "always" -eng: "Always" -new: "zawsze" - -id: LANG_JUMP_SCROLL_DELAY -desc: (player) Delay before making a jump scroll -eng: "Jump Scroll Delay" -new: "opóźnienie skoku przewijania" - -id: LANG_RECORD_TIMESPLIT -desc: Prompt for record timer interval setting, in the record settings menu -eng: "Time Split" -new: "Dziel plik co" - -id: LANG_RECORD_TIMESPLIT_REC -decs: Display of record timer interval setting, on the record screen -eng: "Split time:" -new: "Dziel co:" - -id: LANG_SHOW_ICONS -desc: in settings_menu -eng: "Show Icons" -new: "Pokaż ikony" - -id: LANG_DISK_FULL -desc: in recording screen -eng: "The disk is full. Press OFF to continue." -new: "Dysk jest pełny. Wciśnij OFF żeby kontynuować." - -id: LANG_CONFIRM_WITH_PLAY_RECORDER -desc: Generic recorder string to use to confirm -eng: "PLAY = Yes" -new: "GRAJ = Tak" - -id: LANG_CANCEL_WITH_ANY_RECORDER -desc: Generic recorder string to use to cancel -eng: "Any Other = No" -new: "Każdy inny = Nie" - -## -## Strings used in the plugin loader: -## - -id: LANG_PLUGIN_CANT_OPEN -desc: Plugin open error message -eng: "Can't open %s" -new: "Nie mogę otworzyć %s" - -id: LANG_READ_FAILED -desc: There was an error reading a file -eng: "Failed reading %s" -new: "Błąd odczytu %s" - -id: LANG_PLUGIN_WRONG_MODEL -desc: The plugin is not compatible with the archos model trying to run it -eng: "Incompatible model" -new: "Model niekompatybilny" - -id: LANG_PLUGIN_WRONG_VERSION -desc: The plugin is not compatible with the rockbox version trying to run it -eng: "Incompatible version" -new: "Wersja niekompatybilna" - -id: LANG_PLUGIN_ERROR -desc: The plugin return an error code -eng: "Plugin returned error" -new: "Wtyczka zwróciła błąd" - -## -## boot change detection -## - -id: LANG_BOOT_CHANGED -desc: File browser discovered the boot file was changed -eng: "Boot changed" -new: "Zmienił się plik startowy" - -id: LANG_REBOOT_NOW -desc: Do you want to reboot? -eng: "Reboot now?" -new: "Zresetować teraz?" - -id: LANG_FLIPIT -desc: in the games menu -eng: "Flipit" -new: "Odwróć" - -id: LANG_OTHELO -desc: in the games menu -eng: "Othelo" -new: "Othelo" - -id: LANG_SLIDING_PUZZLE -desc: in the games menu -eng: "Sliding Puzzle" -new: "Przesuwne puzzle" - -id: LANG_STAR -desc: in the games menu -eng: "Star" -new: "Gwiazda" - -id: LANG_QUEUE_LAST -desc: in onplay menu. queue a track/playlist at end of playlist. -eng: "Queue last" -new: "Kolejkuj ostatni/ą" - -id: LANG_INSERT -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert" -new: "Wstaw" - -id: LANG_INSERT_LAST -desc: in onplay menu. append a track/playlist into dynamic playlist. -eng: "Insert last" -new: "Wstaw ostatni/ą" - -id: LANG_QUEUE_FIRST -desc: in onplay menu. queue a track/playlist into dynamic playlist. -eng: "Queue next" -new: "Kolejkuj następny/ą" - -id: LANG_INSERT_FIRST -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert next" -new: "Wstaw następny/ą" - -id: LANG_SAVE_DYNAMIC_PLAYLIST -desc: in playlist menu. -eng: "Save Dynamic Playlist" -new: "Zachowaj dynamiczną playlistę" - -id: LANG_PLAYLIST_MENU -desc: in main menu. -eng: "Playlist Options" -new: "Opcje playlisty" - -id: LANG_PLAYLIST_INSERT_COUNT -desc: splash number of tracks inserted -eng: "Inserted %d tracks (%s)" -new: "Wstawione %d plików (%s)" - -id: LANG_PLAYLIST_QUEUE_COUNT -desc: splash number of tracks queued -eng: "Queued %d tracks (%s)" -new: "W kolejce %d plików (%s)" - -id: LANG_PLAYLIST_SAVE_COUNT -desc: splash number of tracks saved -eng: "Saved %d tracks (%s)" -new: "Zachowane %d plików (%s)" - -id: LANG_OFF_ABORT -desc: Used on recorder models -eng: "OFF to abort" -new: "OFF - anuluj" - -id: LANG_STOP_ABORT -desc: Used on player models -eng: "STOP to abort" -new: "STOP - anuluj" - -id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR -desc: Playlist error -eng: "Error updating playlist control file" -new: "Błąd przy odświeżaniu pliku kontroli playlisty" - -id: LANG_PLAYLIST_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist file" -new: "Brak dostępu do pliku playlisty" - -id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist control file" -new: "Brak dostępu do pliku kontroli playlisty" - -id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing directory" -new: "Brak dostępu do katalogu" - -id: LANG_PLAYLIST_CONTROL_INVALID -desc: Playlist resume error -eng: "Playlist control file is invalid" -new: "Plik kontroli playlisty jest uszkodzony" - -id: LANG_RECURSE_DIRECTORY -desc: In playlist menu -eng: "Recursively Insert Directories" -new: "Rekursywnie wstawiaj katalogi" - -id: LANG_RECURSE_DIRECTORY_QUESTION -desc: Asked from onplay screen -eng: "Recursively?" -new: "Rekursywnie?" - -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Czcionki" - -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" -new: "Firmware" - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Język" - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "Ekran podczas odtwarzania" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Pliki konfiguracji" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: "Wtyczki" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Tryb adaptera samochodowego" +new: "Lewy pasek" diff -rubBP /home/dast/src/rockbox/apps/lang/portugues.lang ./apps/lang/portugues.lang --- /home/dast/src/rockbox/apps/lang/portugues.lang Fri Apr 25 14:52:53 2003 +++ ./apps/lang/portugues.lang Wed Oct 29 15:12:14 2003 @@ -1,4 +1,4 @@ -# $Id: portugues.lang,v 1.6 2003/04/21 16:15:15 hohensoh Exp $ +# $Id: portugues.lang,v 1.1.1.1 2003/10/29 14:12:14 knobby2346 Exp $ id: LANG_SOUND_SETTINGS desc: in the main menu diff -rubBP /home/dast/src/rockbox/apps/lang/slovenscina.lang ./apps/lang/slovenscina.lang --- /home/dast/src/rockbox/apps/lang/slovenscina.lang Tue Aug 19 08:43:50 2003 +++ ./apps/lang/slovenscina.lang Wed Oct 29 15:12:16 2003 @@ -1,4 +1,4 @@ -# $Id: slovenscina.lang,v 1.1 2003/08/19 06:43:50 bagder Exp $ +# $Id: slovenscina.lang,v 1.1.1.1 2003/10/29 14:12:16 knobby2346 Exp $ # # This is the slovenian language files (Slovenski jezik). # diff -rubBP /home/dast/src/rockbox/apps/lang/svenska.lang ./apps/lang/svenska.lang --- /home/dast/src/rockbox/apps/lang/svenska.lang Wed Nov 26 15:06:56 2003 +++ ./apps/lang/svenska.lang Wed Oct 29 15:12:17 2003 @@ -136,8 +136,8 @@ id: LANG_SETTINGS_BATTERY_PLAYER desc: if save settings has failed -eng: "Partition?" -new: "Partition?" +eng: "Batt. Low?" +new: "Batt. tomt?" id: LANG_SETTINGS_SAVE_RECORDER desc: displayed if save settings has failed @@ -146,8 +146,8 @@ id: LANG_SETTINGS_BATTERY_RECORDER desc: if save settings has failed -eng: "No partition?" -new: "Ingen partition?" +eng: "Is Battery Low?" +new: "Är batteriet urladdat?" id: LANG_TIME_SET desc: used in set_time() @@ -426,13 +426,13 @@ id: LANG_RESUME_CONFIRM_RECORDER desc: possible answer to resume question -eng: "" -new: "" +eng: "PLAY = Yes" +new: "Spela = Ja" id: LANG_RESUME_CANCEL_RECORDER desc: possible answer to resume question -eng: "" -new: "" +eng: "Any Other = No" +new: "Övriga = Nej" id: LANG_KEYLOCK_ON_PLAYER desc: displayed when key lock is on @@ -656,118 +656,118 @@ id: LANG_SOKOBAN_LEVEL desc: must be smaller than 6 characters -eng: "" -new: "" +eng: "Level" +new: "Nivĺ" id: LANG_SOKOBAN_MOVE desc: must be smaller than 6 characters -eng: "" -new: "" +eng: "Moves" +new: "Drag" id: LANG_SOKOBAN_WIN desc: displayed when you win -eng: "" -new: "" +eng: "YOU WIN!!" +new: "DU VINNER!!" id: LANG_SOKOBAN_QUIT desc: how to quit game -eng: "" -new: "" +eng: "[OFF] To Stop" +new: "[Av] för att stanna" id: LANG_SOKOBAN_F1 desc: what does F1 do -eng: "" -new: "" +eng: "[F1] - Level" +new: "[F1] - Nivĺ" id: LANG_SOKOBAN_F2 desc: what does F2 do -eng: "" -new: "" +eng: "[F2] Same Level" +new: "[F2] Samma nivĺ" id: LANG_SOKOBAN_F3 desc: what does F3 do -eng: "" -new: "" +eng: "[F3] + Level" +new: "[F3] + Nivĺ" id: LANG_WORMLET_LENGTH desc: wormlet game -eng: "" -new: "" +eng: "Len:%d" +new: "Längd:%d" id: LANG_WORMLET_GROWING desc: wormlet game -eng: "" -new: "" +eng: "Growing" +new: "Växer" id: LANG_WORMLET_HUNGRY desc: wormlet game -eng: "" -new: "" +eng: "Hungry" +new: "Hungrig" id: LANG_WORMLET_WORMED desc: wormlet game -eng: "" -new: "" +eng: "Wormed" +new: "Wormed" id: LANG_WORMLET_ARGH desc: wormlet game -eng: "" -new: "" +eng: "Argh" +new: "Argh" id: LANG_WORMLET_CRASHED desc: wormlet game -eng: "" -new: "" +eng: "Crashed" +new: "Krasch" id: LANG_WORMLET_HIGHSCORE desc: wormlet game -eng: "" -new: "" +eng: "Hs: %d" +new: "Hs: %d" id: LANG_WORMLET_PLAYERS desc: wormlet game -eng: "" -new: "" +eng: "%d Players UP/DN" +new: "%d Spelare upp/ner" id: LANG_WORMLET_WORMS desc: wormlet game -eng: "" -new: "" +eng: "%d Worms L/R" +new: "%d Worms h/v" id: LANG_WORMLET_REMOTE_CTRL desc: wormlet game -eng: "" -new: "" +eng: "Remote Control F1" +new: "Fjärrkontroll F1" id: LANG_WORMLET_NO_REM_CTRL desc: wormlet game -eng: "" -new: "" +eng: "No Rem. Control F1" +new: "Ingen fjärrkontroll F1" id: LANG_WORMLET_2_KEY_CTRL desc: wormlet game -eng: "" -new: "" +eng: "2 Key Control F1" +new: "2-tangentskontroll F1" id: LANG_WORMLET_4_KEY_CTRL desc: wormlet game -eng: "" -new: "" +eng: "4 Key Control F1" +new: "4-tangentskontroll F1" id: LANG_WORMLET_NO_CONTROL desc: wormlet game -eng: "" -new: "" +eng: "Out Of Control" +new: "Ingen kontroll" id: LANG_TETRIS_LOSE desc: tetris game -eng: "" -new: "" +eng: "You Lose!" +new: "Du förlorar!" id: LANG_TETRIS_LEVEL desc: tetris game -eng: "" -new: "" +eng: "Rows - Level" +new: "Rader - Nivĺ" id: LANG_POWEROFF_IDLE desc: in settings_menu @@ -1498,289 +1498,3 @@ desc: (player) the jump scroll shall be done "always" eng: "Always" new: "Alltid" - -id: LANG_BOOT_CHANGED -desc: File browser discovered the boot file was changed -eng: "Boot changed" -new: "Ändrad start" - -id: LANG_CANCEL_WITH_ANY_RECORDER -desc: Generic recorder string to use to cancel -eng: "Any Other = No" -new: "Nĺgon annan = Nej" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Biltillsatsläge" - -id: LANG_CONFIRM_WITH_PLAY_RECORDER -desc: Generic recorder string to use to confirm -eng: "PLAY = Yes" -new: "Spela = Ja" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Konfigureringar" - -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Fonter" - -id: LANG_DISK_FULL -desc: in recording screen -eng: "The disk is full. Press OFF to continue." -new: "Disken är full. Tryck AV för att fortsätta." - -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" -new: "Maskinvara" - -id: LANG_FLIPIT -desc: in the games menu -eng: "Flipit" -new: "Flipit" - -id: LANG_INSERT -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert" -new: "Sätt in" - -id: LANG_INSERT_FIRST -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert next" -new: "Sätt in nästa" - -id: LANG_INSERT_LAST -desc: in onplay menu. append a track/playlist into dynamic playlist. -eng: "Insert last" -new: "Sätt in sist" - -id: LANG_JUMP_SCROLL_DELAY -desc: (player) Delay before making a jump scroll -eng: "Jump Scroll Delay" -new: "Hopprullningsfördröjning" - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Sprĺk" - -id: LANG_OFF_ABORT -desc: Used on recorder models -eng: "OFF to abort" -new: "AV för avbryt" - -id: LANG_OTHELO -desc: in the games menu -eng: "Othelo" -new: "Othello" - -id: LANG_PLAYLIST_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist file" -new: "Kan ej nĺ filen med spellistan" - -id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist control file" -new: "Kan ej nĺ filen för spellistekontroll" - -id: LANG_PLAYLIST_CONTROL_INVALID -desc: Playlist resume error -eng: "Playlist control file is invalid" -new: "Filen för spellistekontroll är inte korrekt" - -id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR -desc: Playlist error -eng: "Error updating playlist control file" -new: "Fel vid uppdatering av file för spellistekontroll" - -id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing directory" -new: "Kan inte nĺ katalogen" - -id: LANG_PLAYLIST_INSERT_COUNT -desc: splash number of tracks inserted -eng: "Inserted %d tracks (%s)" -new: "Insatta %d spĺr (%s)" - -id: LANG_PLAYLIST_MENU -desc: in main menu. -eng: "Playlist Options" -new: "Val för spellista" - -id: LANG_PLAYLIST_QUEUE_COUNT -desc: splash number of tracks queued -eng: "Queued %d tracks (%s)" -new: "Köat %d spĺr (%s)" - -id: LANG_PLAYLIST_SAVE_COUNT -desc: splash number of tracks saved -eng: "Saved %d tracks (%s)" -new: "Sparat %d spĺr (%s)" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: "Insticksmoduler" - -id: LANG_PLUGIN_CANT_OPEN -desc: Plugin open error message -eng: "Can't open %s" -new: "Kan inte öppna %s" - -id: LANG_PLUGIN_ERROR -desc: The plugin return an error code -eng: "Plugin returned error" -new: "Insticksmodulen gav fel" - -id: LANG_PLUGIN_WRONG_MODEL -desc: The plugin is not compatible with the archos model trying to run it -eng: "Incompatible model" -new: "Icke kompatibel model" - -id: LANG_PLUGIN_WRONG_VERSION -desc: The plugin is not compatible with the rockbox version trying to run it -eng: "Incompatible version" -new: "Icke kompatibel version" - -id: LANG_QUEUE_FIRST -desc: in onplay menu. queue a track/playlist into dynamic playlist. -eng: "Queue next" -new: "Köa nästa" - -id: LANG_QUEUE_LAST -desc: in onplay menu. queue a track/playlist at end of playlist. -eng: "Queue last" -new: "Köa sist" - -id: LANG_READ_FAILED -desc: There was an error reading a file -eng: "Failed reading %s" -new: "Misslyckad läsning %s" - -id: LANG_REBOOT_NOW -desc: Do you want to reboot? -eng: "Reboot now?" -new: "Starta om nu?" - -id: LANG_RECORD_TIMESPLIT -desc: Prompt for record timer interval setting, in the record settings menu -eng: "Time Split" -new: "Tidsdelning" - -id: LANG_RECORD_TIMESPLIT_REC -desc: -eng: "Split time:" -new: "Tidsdelning:" - -id: LANG_RECURSE_DIRECTORY -desc: In playlist menu -eng: "Recursively Insert Directories" -new: "Sätt in kataloger rekursivt" - -id: LANG_RECURSE_DIRECTORY_QUESTION -desc: Asked from onplay screen -eng: "Recursively?" -new: "Rekursivt?" - -id: LANG_SAVE_DYNAMIC_PLAYLIST -desc: in playlist menu. -eng: "Save Dynamic Playlist" -new: "Spara dynamisk spellista" - -id: LANG_SHOW_ICONS -desc: in settings_menu -eng: "Show Icons" -new: "Visa ikoner" - -id: LANG_SLIDING_PUZZLE -desc: in the games menu -eng: "Sliding Puzzle" -new: "Glidande pussel" - -id: LANG_STAR -desc: in the games menu -eng: "Star" -new: "Stjärna" - -id: LANG_STOP_ABORT -desc: Used on player models -eng: "STOP to abort" -new: "STANNA för avbryt" - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "Skärm vid spel" - -id: LANG_BUTTONBAR_MENU -desc: in button bar -eng: "Menu" -new: "Meny" - -id: LANG_BUTTONBAR_OPTIONS -desc: in button bar -eng: "Option" -new: "Val" - -id: LANG_FM_BUTTONBAR_PRESETS -desc: in button bar -eng: "Preset" -new: "Förinställning" - -id: LANG_FM_DELETE_PRESET -desc: in radio screen -eng: "Remove preset" -new: "Ta bort förinställning" - -id: LANG_FM_NO_FREE_PRESETS -desc: in radio screen -eng: "The preset list is full" -new: "Listan med förinställningar är full" - -id: LANG_FM_NO_PRESETS -desc: in radio screen -eng: "The preset list is empty" -new: "Listan med förinställningar är tom" - -id: LANG_FM_PRESET_SAVE_FAILED -desc: in radio screen -eng: "Preset save failed" -new: "Fel vid spara förinställningar" - -id: LANG_FM_SAVE_PRESET -desc: in radio screen -eng: "Save preset" -new: "Spara förinställningar" - -id: LANG_FM_STATION -desc: in radio screen -eng: "Station: %d.%dMHz" -new: "Kanal: %d.%dMHz" - -id: LANG_LINE_IN -desc: in settings_menu -eng: "Line In" -new: "Linjeingĺng" - -id: LANG_NO_FILES -desc: in settings_menu -eng: "No files" -new: "Inga filer" - -id: LANG_FM_BUTTONBAR_RECORD -desc: in main menu -eng: "Record" -new: "Spela in" - -id: LANG_FM_RADIO -desc: in main menu -eng: "FM Radio" -new: "FM Radio" - diff -rubBP /home/dast/src/rockbox/apps/lang/wallisertitsch.lang ./apps/lang/wallisertitsch.lang --- /home/dast/src/rockbox/apps/lang/wallisertitsch.lang Wed Nov 19 07:34:43 2003 +++ ./apps/lang/wallisertitsch.lang Wed Oct 29 15:12:18 2003 @@ -1,4 +1,4 @@ -# $Id: wallisertitsch.lang,v 1.88 2003/10/24 14:14:08 vicentinimartin +# $Id: wallisertitsch.lang,v 1.77 2003/06/08 12:43:52 vicentinimartin id: LANG_SOUND_SETTINGS desc: in the main menu @@ -385,7 +385,7 @@ id: LANG_CHANNEL desc: in sound_settings eng: "Channel configuration" -new: "Kanalischtellig" +new: "Kanalkonfiguration" id: LANG_CHANNEL_STEREO desc: in sound_settings @@ -432,13 +432,11 @@ eng: "(PLAY/STOP)" new: "(PLAY/STOP)" -# depreciated id: LANG_RESUME_CONFIRM_RECORDER desc: posible answer to resume question eng: "Play = Yes" new: "Play = Ja" -# depreciated id: LANG_RESUME_CANCEL_RECORDER desc: posible answer to resume question eng: "Any Other = No" @@ -1543,211 +1541,3 @@ desc: in settings_menu eng: "Show Icons" new: "Icons azeigu" - -id: LANG_DISK_FULL -desc: in recording screen -eng: "The disk is full. Press OFF to continue." -new: "Feschtplatta isch voll. Drick OFF." - -id: LANG_CONFIRM_WITH_PLAY_RECORDER -desc: Generic recorder string to use to confirm -eng: "PLAY = Yes" -new: "PLAY = Ja" - -id: LANG_CANCEL_WITH_ANY_RECORDER -desc: Generic recorder string to use to cancel -eng: "Any Other = No" -new: "Andri = Nei" - -## -## Strings used in the plugin loader: -## - -id: LANG_PLUGIN_CANT_OPEN -desc: Plugin open error message -eng: "Can't open %s" -new: "Cha %s nit üftüe" - -id: LANG_READ_FAILED -desc: There was an error reading a file -eng: "Failed reading %s" -new: "Fähler bim läsu fa %s" - -id: LANG_PLUGIN_WRONG_MODEL -desc: The plugin is not compatible with the archos model trying to run it -eng: "Incompatible model" -new: "nit kompatibels Modell" - -id: LANG_PLUGIN_WRONG_VERSION -desc: The plugin is not compatible with the rockbox version trying to run it -eng: "Incompatible version" -new: "nit kompatibli Version" - -id: LANG_PLUGIN_ERROR -desc: The plugin return an error code -eng: "Plugin returned error" -new: "Plugin mäldut Fähler" - -## -## boot change detection -## - -id: LANG_BOOT_CHANGED -desc: File browser discovered the boot file was changed -eng: "Boot changed" -new: "Boot gändrut" - -id: LANG_REBOOT_NOW -desc: Do you want to reboot? -eng: "Reboot now?" -new: "jetz nöü bootu?" - -id: LANG_FLIPIT -desc: in the games menu -eng: "Flipit" -new: "zDräjiga" - -id: LANG_OTHELO -desc: in the games menu -eng: "Othelo" -new: "Othelo" - -id: LANG_SLIDING_PUZZLE -desc: in the games menu -eng: "Sliding Puzzle" -new: "Schiebepuzzle" - -id: LANG_STAR -desc: in the games menu -eng: "Star" -new: "Schtäru" - -id: LANG_QUEUE_LAST -desc: in onplay menu. queue a track/playlist at end of playlist. -eng: "Queue last" -new: "Warteschlanga als letschts" - -id: LANG_INSERT -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert" -new: "Ifiegu" - -id: LANG_INSERT_LAST -desc: in onplay menu. append a track/playlist into dynamic playlist. -eng: "Insert last" -new: "Ifiegu als letschts" - -id: LANG_QUEUE_FIRST -desc: in onplay menu. queue a track/playlist into dynamic playlist. -eng: "Queue next" -new: "Warteschlanga als negschts" - -id: LANG_INSERT_FIRST -desc: in onplay menu. insert a track/playlist into dynamic playlist. -eng: "Insert next" -new: "Ifiegu als negschts" - -id: LANG_SAVE_DYNAMIC_PLAYLIST -desc: in playlist menu. -eng: "Save Dynamic Playlist" -new: "dynamischi Abschpillischta schpichru" - -id: LANG_PLAYLIST_MENU -desc: in main menu. -eng: "Playlist Options" -new: "Abschpillischta Optione" - -id: LANG_PLAYLIST_INSERT_COUNT -desc: splash number of tracks inserted -eng: "Inserted %d tracks (%s)" -new: "%d Lieder igfiegt (%s)" - -id: LANG_PLAYLIST_QUEUE_COUNT -desc: splash number of tracks queued -eng: "Queued %d tracks (%s)" -new: "%d Lieder agheicht (%s)" - -id: LANG_PLAYLIST_SAVE_COUNT -desc: splash number of tracks saved -eng: "Saved %d tracks (%s)" -new: "%d Lieder abgspiichrut (%s)" - -id: LANG_OFF_ABORT -desc: Used on recorder models -eng: "OFF to abort" -new: "Off fer abzbrächu" - -id: LANG_STOP_ABORT -desc: Used on player models -eng: "STOP to abort" -new: "STOP fer abzbrächu" - -id: LANG_PLAYLIST_CONTROL_UPDATE_ERROR -desc: Playlist error -eng: "Error updating playlist control file" -new: "Fähler: Aktualisierig Abschpillischta-Kontrolldatii" - -id: LANG_PLAYLIST_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist file" -new: "Fähler: Züegriff Abschpillischta" - -id: LANG_PLAYLIST_CONTROL_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing playlist control file" -new: "Fähler: Züegriff Abschpillischta-Kontrolldatii" - -id: LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR -desc: Playlist error -eng: "Error accessing directory" -new: "Fähler: Verzeichniszüegriff" - -id: LANG_PLAYLIST_CONTROL_INVALID -desc: Playlist resume error -eng: "Playlist control file is invalid" -new: "Abschpillischta-Kontrolldatii isch ungültig" - -id: LANG_RECURSE_DIRECTORY -desc: In playlist menu -eng: "Recursively Insert Directories" -new: "Verzeichnis rekursiv ifiegu" - -id: LANG_RECURSE_DIRECTORY_QUESTION -desc: Asked from onplay screen -eng: "Recursively?" -new: "Rekursiv?" - -id: LANG_CUSTOM_FONT -desc: in setting_menu() -eng: "Fonts" -new: "Schrifte" - -id: LANG_FIRMWARE -desc: in the main menu -eng: "Firmware" -new: "Firmware" - -id: LANG_LANGUAGE -desc: in settings_menu -eng: "Language" -new: "Spraach" - -id: LANG_WHILE_PLAYING -desc: in settings_menu() -eng: "While Playing Screen" -new: "Azeig währund dum Abschpilu (WPS)" - -id: LANG_CUSTOM_CFG -desc: in setting_menu() -eng: "Configurations" -new: "Ischtellige" - -id: LANG_PLUGINS -desc: in main_menu() -eng: "Plugins" -new: "Plugins" - -id: LANG_CAR_ADAPTER_MODE -desc: Displayed for setting car adapter mode to on/off -eng: "Car Adapter Mode" -new: "Autoadapter Modus" diff -rubBP /home/dast/src/rockbox/apps/language.c ./apps/language.c --- /home/dast/src/rockbox/apps/language.c Mon Jan 27 16:33:32 2003 +++ ./apps/language.c Wed Oct 29 15:12:00 2003 @@ -1,22 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: language.c,v 1.8 2003/01/24 10:54:07 matsl Exp $ - * - * Copyright (C) 2002 Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #include #if defined(SIMULATOR) && defined(__MINGW32__) extern int printf(const char *format, ...); @@ -26,11 +7,11 @@ #include "lang.h" #include "debug.h" -static unsigned char language_buffer[MAX_LANGUAGE_SIZE]; +//static unsigned char language_buffer[MAX_LANGUAGE_SIZE]; int lang_load(char *filename) { - int filesize; +/* int filesize; int fd = open(filename, O_RDONLY); int retcode=0; if(fd == -1) @@ -44,21 +25,21 @@ filesize-=2; while(filesize>3) { - id = (ptr[0]<<8) | ptr[1]; /* get two-byte id */ - ptr+=2; /* pass the id */ + id = (ptr[0]<<8) | ptr[1]; // get two-byte id + ptr+=2; // pass the id if(id < LANG_LAST_INDEX_IN_ARRAY) { #ifdef SIMULATOR printf("%2x New: %30s ", id, ptr); printf("Replaces: %s\n", language_strings[id]); #endif - language_strings[id] = ptr; /* point to this string */ + language_strings[id] = ptr; // point to this string } - while(*ptr) { /* pass the string */ + while(*ptr) { // pass the string filesize--; ptr++; } - filesize-=3; /* the id and the terminating zero */ - ptr++; /* pass the terminating zero-byte */ + filesize-=3; // the id and the terminating zero + ptr++; // pass the terminating zero-byte } } else { @@ -72,6 +53,7 @@ } close(fd); return retcode; +*/ } /* ----------------------------------------------------------------- diff -rubBP /home/dast/src/rockbox/apps/language.h ./apps/language.h --- /home/dast/src/rockbox/apps/language.h Fri Aug 29 13:49:54 2003 +++ ./apps/language.h Wed Oct 29 15:12:00 2003 @@ -1,22 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: language.h,v 1.5 2003/08/21 13:49:45 bagder Exp $ - * - * Copyright (C) 2002 Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - /* size of the buffer used for loadable, translated strings */ #define MAX_LANGUAGE_SIZE 6000 @@ -26,7 +7,3 @@ /* load a given language file */ int lang_load(char *filename); - -/* ----------------------------------------------------------------- - * vim: et sw=4 ts=8 sts=4 tw=78 - */ diff -rubBP /home/dast/src/rockbox/apps/main.c ./apps/main.c --- /home/dast/src/rockbox/apps/main.c Thu Dec 4 16:35:38 2003 +++ ./apps/main.c Tue Dec 2 21:59:15 2003 @@ -1,66 +1,37 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: main.c,v 1.80 2003/12/03 01:03:21 hohensoh Exp $ - * - * Copyright (C) 2002 by Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #include "ata.h" #include "disk.h" #include "fat.h" #include "lcd.h" -#include "rtc.h" #include "debug.h" -#include "led.h" #include "kernel.h" #include "button.h" +#include "remote.h" #include "tree.h" #include "panic.h" #include "menu.h" #include "system.h" -#include "usb.h" -#include "powermgmt.h" -#include "adc.h" #include "i2c.h" -#ifndef DEBUG -#include "serial.h" -#endif #include "mpeg.h" #include "main_menu.h" #include "thread.h" #include "settings.h" -#include "backlight.h" #include "status.h" -#include "debug_menu.h" #include "version.h" #include "sprintf.h" -#include "font.h" -#include "language.h" #include "wps-display.h" #include "playlist.h" #include "buffer.h" -#include "rolo.h" #include "screens.h" -#include "power.h" char appsversion[]=APPSVERSION; +char appsbuild[]=APPSBUILD; void init(void); void app_main(void) { init(); + //startup_sound(); browse_root(); } @@ -71,7 +42,6 @@ init_threads(); buffer_init(); lcd_init(); - font_init(); show_logo(); settings_reset(); settings_load(); @@ -82,9 +52,6 @@ global_settings.bass, global_settings.treble, global_settings.balance, - global_settings.loudness, - global_settings.bass_boost, - global_settings.avc, global_settings.channel_config ); while (button_get(false) != 0) ; /* Empty the keyboard buffer */ @@ -101,9 +68,10 @@ int rc, i; struct partinfo* pinfo; /* if nobody initialized ATA before, I consider this a cold start */ - bool coldstart = (PACR2 & 0x4000) != 0; /* starting from Flash */ +// bool coldstart = (PACR2 & 0x4000) != 0; /* starting from Flash */ system_init(); + kernel_init(); buffer_init(); @@ -112,7 +80,6 @@ lcd_init(); - font_init(); show_logo(); set_irq_level(0); @@ -116,60 +83,76 @@ show_logo(); set_irq_level(0); + #ifdef DEBUG debug_init(); -#else - serial_setup(); #endif i2c_init(); -#ifdef HAVE_RTC - rtc_init(); -#endif - - adc_init(); - - usb_init(); - - backlight_init(); - button_init(); - powermgmt_init(); + if (!(PADR&0x4000)) { //OLD mStation detected... + DEBUGF("Detected mStation, disabling stop button.\n"); + button_found_mStation(); + } + + if ((PCDR&0x0040) && (PBDR&0x8000)) { + //select button released and usb detection + lcd_puts(0,0," Open Neo! "); + lcd_puts(0,1," "); + lcd_puts(0,2," USB connection "); + lcd_puts(0,3," detected. "); + DEBUGF("USB connection detected, hanging...\n"); + while (1) { + } /* Must hang here, line can + change state after initial + signal which gets mis-read + as cable disconnection. */ + } + + remote_init(); + +// CDC_HWInit(); +// int aux=CDC_Setup(); +// DEBUGF("CDC says can %scontrol aux power\n",aux?"":"not "); - if (coldstart && charger_inserted()) - { - rc = charging_screen(); /* display a "charging" screen */ - if (rc == 1 || rc == 2) /* charger removed or "Off/Stop" pressed */ - power_off(); - /* "On" pressed or USB connected: proceed */ - } + for (i=0,rc=1;rc && i<5;++i) { + //5 attempts to detect hard drive settings rc = ata_init(); + if (rc) + splash(HZ/2,0,true,"Waiting for Hard Drive..."); + } if(rc) - { -#ifdef HAVE_LCD_BITMAP - char str[32]; - lcd_clear_display(); - snprintf(str, 31, "ATA error: %d", rc); - lcd_puts(0, 1, str); - lcd_puts(0, 3, "Press ON to debug"); - lcd_update(); - while(button_get(true) != BUTTON_ON); - dbg_ports(); -#endif panicf("ata: %d", rc); - } pinfo = disk_init(); if (!pinfo) panicf("disk: NULL"); for ( i=0; i<4; i++ ) { - if (!fat_mount(pinfo[i].start)) + if (fat_mount(pinfo[i].start)) { + if (pinfo[i].type==0x0C) { //supposed to be a FAT32 partition + //try and restore + lcd_clear_display(); + lcd_puts(0,0,"Attempting to"); + lcd_puts(0,1,"restore first"); + lcd_puts(0,2,"FAT table..."); + if (fat_mount_backup(pinfo[i].start)) { + lcd_puts(0,3,"FAILED!"); + sleep(HZ*3); + } else { + lcd_puts(0,3,"done."); + sleep(HZ); break; } + } + } else { + //found FAT table + break; + } + } if ( i==4 ) { DEBUGF("No partition found, trying to mount sector 0.\n"); rc = fat_mount(0); @@ -179,15 +162,14 @@ lcd_puts(0,1,"partition!"); lcd_update(); sleep(HZ); - while(1) - dbg_partitions(); + while(1) {} +// dbg_partitions(); } } settings_load(); status_init(); - usb_start_monitoring(); playlist_init(); tree_init(); @@ -197,29 +179,7 @@ global_settings.bass, global_settings.treble, global_settings.balance, - global_settings.loudness, - global_settings.bass_boost, - global_settings.avc, global_settings.channel_config ); - - /* no auto-rolo on startup any more, but I leave it here for reference */ -#if 0 - if (coldstart && !usb_detect()) - { /* when starting from flash, this time _we_ have to yield */ - int fd; -#ifdef ARCHOS_PLAYER - static const char filename[] = "/archos.mod"; -#else - static const char filename[] = "/ajbrec.ajz"; -#endif - fd = open(filename, O_RDONLY); - if(fd >= 0) /* no complaint if it doesn't exit */ - { - close(fd); - rolo_load((char*)filename); /* start if it does */ - } - } -#endif // #if 0 } int main(void) @@ -227,8 +187,6 @@ app_main(); while(1) { - led(true); sleep(HZ/10); - led(false); sleep(HZ/10); } return 0; } diff -rubBP /home/dast/src/rockbox/apps/main_menu.c ./apps/main_menu.c --- /home/dast/src/rockbox/apps/main_menu.c Mon Nov 24 10:56:56 2003 +++ ./apps/main_menu.c Tue Dec 2 21:59:15 2003 @@ -1,267 +1,39 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: main_menu.c,v 1.88 2003/11/21 13:32:53 zagor Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #include "config.h" #include "options.h" #include "menu.h" #include "tree.h" -#include "credits.h" #include "lcd.h" -#include "font.h" #include "button.h" +#include "remote.h" #include "kernel.h" #include "main_menu.h" #include "version.h" -#include "debug_menu.h" #include "sprintf.h" #include #include "playlist.h" #include "settings.h" #include "settings_menu.h" -#include "power.h" -#include "powermgmt.h" #include "sound_menu.h" -#include "status.h" #include "fat.h" -#include "sleeptimer.h" #include "wps.h" #include "buffer.h" #include "screens.h" #include "playlist_menu.h" -#ifdef HAVE_FMRADIO -#include "radio.h" -#endif - #include "lang.h" - -#ifdef HAVE_MAS3587F -#include "recording.h" -#endif - -#ifdef HAVE_ALARM_MOD -#include "alarm_menu.h" -#endif - -#ifdef HAVE_LCD_BITMAP -#include "bmp.h" -#include "icons.h" -#endif /* End HAVE_LCD_BITMAP */ +#include "status.h" +#include "info.h" int show_logo( void ) { -#ifdef HAVE_LCD_BITMAP - char version[32]; - unsigned char *ptr=rockbox112x37; - int height, i, font_h, font_w; - - lcd_clear_display(); - - for(i=0; i < 37; i+=8) { - /* the bitmap function doesn't work with full-height bitmaps - so we "stripe" the logo output */ - lcd_bitmap(ptr, 0, 10+i, 112, (37-i)>8?8:37-i, false); - ptr += 112; - } - height = 37; - -#if 0 - /* - * This code is not used anymore, but I kept it here since it shows - * one way of using the BMP reader function to display an externally - * providing logo. - */ - unsigned char buffer[112 * 8]; - int width; - - int i; - int eline; - - int failure; - failure = read_bmp_file("/rockbox112.bmp", &width, &height, buffer); - - debugf("read_bmp_file() returned %d, width %d height %d\n", - failure, width, height); - - for(i=0, eline=0; i < height; i+=8, eline++) { - /* the bitmap function doesn't work with full-height bitmaps - so we "stripe" the logo output */ - lcd_bitmap(&buffer[eline*width], 0, 10+i, width, - (height-i)>8?8:height-i, false); - } -#endif - - snprintf(version, sizeof(version), "Ver. %s", appsversion); - lcd_setfont(FONT_SYSFIXED); - lcd_getstringsize("A", &font_w, &font_h); - lcd_putsxy((LCD_WIDTH/2) - ((strlen(version)*font_w)/2), - LCD_HEIGHT-font_h, version); - lcd_update(); - -#else - char *rockbox = " ROCKbox!"; lcd_clear_display(); - lcd_double_height(true); - lcd_puts(0, 0, rockbox); - lcd_puts(0, 1, appsversion); -#endif - + lcd_puts(0, 0, " Neo Car Jukebox "); + lcd_puts_fmt( 0, 1, str(LANG_OPEN_NEO), FMT_CENTER ); + lcd_puts_fmt( 0, 2, appsversion, FMT_CENTER ); + lcd_puts(0, 3, "ssiamerica.com/open "); return 0; } -bool show_credits(void) -{ - int j = 0; - int btn; - - show_logo(); -#ifdef HAVE_LCD_CHARCELLS - lcd_double_height(false); -#endif - - for (j = 0; j < 10; j++) { - sleep((HZ*2)/10); - - btn = button_get(false); - if (btn != BUTTON_NONE && !(btn & BUTTON_REL)) - return false; - } - roll_credits(); - return false; -} - -#ifdef SIMULATOR -extern bool simulate_usb(void); -#endif -bool show_info(void) -{ - char s[32]; - /* avoid overflow for 8MB mod :) was: ((mp3end - mp3buf) * 1000) / 0x100000; */ - int buflen = ((mp3end - mp3buf) * 100) / 0x19999; - int integer, decimal; - bool done = false; - int key; - int state = 1; - - while(!done) - { - int y=0; - lcd_clear_display(); -#ifdef HAVE_LCD_BITMAP - lcd_puts(0, y++, str(LANG_ROCKBOX_INFO)); - y++; - state = 3; -#endif - - if (state & 1) { - integer = buflen / 1000; - decimal = buflen % 1000; -#ifdef HAVE_LCD_CHARCELLS - snprintf(s, sizeof(s), str(LANG_BUFFER_STAT_PLAYER), - integer, decimal); -#else - snprintf(s, sizeof(s), str(LANG_BUFFER_STAT_RECORDER), - integer, decimal); -#endif - lcd_puts(0, y++, s); - -#ifdef HAVE_CHARGE_CTRL - if (charge_state == 1) - snprintf(s, sizeof(s), str(LANG_BATTERY_CHARGE)); - else if (charge_state == 2) - snprintf(s, sizeof(s), str(LANG_BATTERY_TOPOFF_CHARGE)); - else if (charge_state == 3) - snprintf(s, sizeof(s), str(LANG_BATTERY_TRICKLE_CHARGE)); - else -#endif - if (battery_level() >= 0) - snprintf(s, sizeof(s), str(LANG_BATTERY_TIME), battery_level(), - battery_time() / 60, battery_time() % 60); - else - strncpy(s, "(n/a)", sizeof(s)); - lcd_puts(0, y++, s); - } - - if (state & 2) { - unsigned int size, free; - fat_size( &size, &free ); - - size /= 1024; - integer = size / 1024; - decimal = size % 1024 / 100; - snprintf(s, sizeof s, str(LANG_DISK_STAT), integer, decimal); - lcd_puts(0, y++, s); - - free /= 1024; - integer = free / 1024; - decimal = free % 1024 / 100; - snprintf(s, sizeof s, str(LANG_DISK_FREE_STAT), integer, decimal); - lcd_puts(0, y++, s); - } - lcd_update(); - - /* Wait for a key to be pushed */ - key = button_get_w_tmo(HZ*5); - switch(key) { -#ifdef HAVE_PLAYER_KEYPAD - case BUTTON_STOP | BUTTON_REL: -#else - case BUTTON_LEFT | BUTTON_REL: - case BUTTON_OFF | BUTTON_REL: -#endif - done = true; - break; - -#ifdef HAVE_PLAYER_KEYPAD - case BUTTON_LEFT: - case BUTTON_RIGHT: - if (state == 1) - state = 2; - else - state = 1; - break; -#endif - case SYS_USB_CONNECTED: - usb_screen(); - return true; - } - } - - return false; -} - -static bool firmware_browse(void) -{ - return rockbox_browse(ROCKBOX_DIR, SHOW_MOD); -} - -static bool plugin_browse(void) -{ - return rockbox_browse(PLUGIN_DIR, SHOW_PLUGINS); -} - -#ifdef HAVE_MAS3587F -static bool recording_settings(void) -{ - return recording_menu(false); -} -#endif - bool main_menu(void) { int m; @@ -271,38 +43,15 @@ struct menu_items items[] = { { str(LANG_SOUND_SETTINGS), sound_menu }, { str(LANG_GENERAL_SETTINGS), settings_menu }, -#ifdef HAVE_FMRADIO - { str(LANG_FM_RADIO), radio_screen }, -#endif -#ifdef HAVE_MAS3587F - { str(LANG_RECORDING), recording_screen }, - { str(LANG_RECORDING_SETTINGS), recording_settings}, -#endif { str(LANG_PLAYLIST_MENU), playlist_menu }, - { str(LANG_MENU_SHOW_ID3_INFO), browse_id3 }, - { str(LANG_SLEEP_TIMER), sleeptimer_screen }, -#ifdef HAVE_ALARM_MOD - { str(LANG_ALARM_MOD_ALARM_MENU), alarm_screen }, -#endif - { str(LANG_PLUGINS), plugin_browse }, - { str(LANG_FIRMWARE), firmware_browse }, - { str(LANG_INFO), show_info }, - { str(LANG_VERSION), show_credits }, -#ifndef SIMULATOR - { str(LANG_DEBUG), debug_menu }, -#else - { str(LANG_USB), simulate_usb }, -#endif + { str(LANG_SONG_INFO), show_song_info }, + { str(LANG_NEO_INFO), info_menu } }; m=menu_init( items, sizeof items / sizeof(struct menu_items) ); -#ifdef HAVE_LCD_CHARCELLS status_set_param(true); -#endif result = menu_run(m); -#ifdef HAVE_LCD_CHARCELLS status_set_param(false); -#endif menu_exit(m); settings_save(); diff -rubBP /home/dast/src/rockbox/apps/main_menu.h ./apps/main_menu.h --- /home/dast/src/rockbox/apps/main_menu.h Thu Oct 31 08:57:52 2002 +++ ./apps/main_menu.h Wed Oct 29 15:12:00 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: main_menu.h,v 1.4 2002/09/24 17:22:11 zagor Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #ifndef _MAIN_MENU_H #define _MAIN_MENU_H diff -rubBP /home/dast/src/rockbox/apps/menu.c ./apps/menu.c --- /home/dast/src/rockbox/apps/menu.c Thu Dec 4 16:35:38 2003 +++ ./apps/menu.c Tue Dec 2 21:59:15 2003 @@ -1,41 +1,15 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: menu.c,v 1.62 2003/12/04 00:08:25 zagor Exp $ - * - * Copyright (C) 2002 Robert E. Hak - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #include -#include "hwcompat.h" #include "lcd.h" -#include "font.h" -#include "backlight.h" #include "menu.h" #include "button.h" +#include "remote.h" #include "kernel.h" #include "debug.h" -#include "usb.h" #include "panic.h" #include "settings.h" -#include "status.h" #include "screens.h" - -#ifdef HAVE_LCD_BITMAP -#include "icons.h" -#include "widgets.h" -#endif +#include "status.h" struct menu { int top; @@ -46,42 +20,14 @@ #define MAX_MENUS 4 -#ifdef HAVE_LCD_BITMAP - -/* pixel margins */ -#define MARGIN_X (global_settings.scrollbar && \ - menu_lines < menus[m].itemcount ? SCROLLBAR_WIDTH : 0) +\ - CURSOR_WIDTH -#define MARGIN_Y (global_settings.statusbar ? STATUSBAR_HEIGHT : 0) - -/* position the entry-list starts at */ -#define LINE_X 0 -#define LINE_Y (global_settings.statusbar ? 1 : 0) - -#define CURSOR_X (global_settings.scrollbar && \ - menu_lines < menus[m].itemcount ? 1 : 0) -#define CURSOR_Y 0 /* the cursor is not positioned in regard to - the margins, so this is the amount of lines - we add to the cursor Y position to position - it on a line */ -#define CURSOR_WIDTH (global_settings.invert_cursor ? 0 : 4) - -#define SCROLLBAR_X 0 -#define SCROLLBAR_Y lcd_getymargin() -#define SCROLLBAR_WIDTH 6 - -#else /* HAVE_LCD_BITMAP */ - #define LINE_X 1 /* X position the entry-list starts at */ -#define MENU_LINES 2 +#define MENU_LINES 4 #define CURSOR_X 0 #define CURSOR_Y 0 /* not really used for players */ -#endif /* HAVE_LCD_BITMAP */ - -#define CURSOR_CHAR 0x92 +#define CURSOR_CHAR '>' static struct menu menus[MAX_MENUS]; static bool inuse[MAX_MENUS] = { false }; @@ -89,89 +35,31 @@ /* count in letter positions, NOT pixels */ void put_cursorxy(int x, int y, bool on) { -#ifdef HAVE_LCD_BITMAP - int fh, fw; - int xpos, ypos; - - /* check here instead of at every call (ugly, but cheap) */ - if (global_settings.invert_cursor) - return; - - lcd_getstringsize("A", &fw, &fh); - xpos = x*6; - ypos = y*fh + lcd_getymargin(); - if ( fh > 8 ) - ypos += (fh - 8) / 2; -#endif - /* place the cursor */ if(on) { -#ifdef HAVE_LCD_BITMAP - lcd_bitmap ( bitmap_icons_6x8[Cursor], - xpos, ypos, 4, 8, true); -#else lcd_putc(x, y, CURSOR_CHAR); -#endif } else { -#if defined(HAVE_LCD_BITMAP) - /* I use xy here since it needs to disregard the margins */ - lcd_clearrect (xpos, ypos, 4, 8); -#else lcd_putc(x, y, ' '); -#endif } } static void menu_draw(int m) { int i = 0; -#ifdef HAVE_LCD_BITMAP - int fw, fh; - int menu_lines; - lcd_setfont(FONT_UI); - lcd_getstringsize("A", &fw, &fh); - if (global_settings.statusbar) - menu_lines = (LCD_HEIGHT - STATUSBAR_HEIGHT) / fh; - else - menu_lines = LCD_HEIGHT/fh; -#else int menu_lines = MENU_LINES; -#endif lcd_clear_display(); /* ...then clean the screen */ -#ifdef HAVE_LCD_BITMAP - lcd_setmargins(MARGIN_X,MARGIN_Y); /* leave room for cursor and icon */ -#endif - /* correct cursor pos if out of screen */ - if (menus[m].cursor - menus[m].top >= menu_lines) - menus[m].top++; for (i = menus[m].top; (i < menus[m].itemcount) && (i menu_lines) - scrollbar(SCROLLBAR_X, SCROLLBAR_Y, SCROLLBAR_WIDTH - 1, - LCD_HEIGHT - SCROLLBAR_Y, menus[m].itemcount, menus[m].top, - menus[m].top + menu_lines, VERTICAL); -#endif - status_draw(true); - lcd_update(); + } } /* @@ -180,40 +68,30 @@ */ static void put_cursor(int m, int target) { - bool do_update = true; -#ifdef HAVE_LCD_BITMAP - int fw, fh; - int menu_lines; - lcd_setfont(FONT_UI); - lcd_getstringsize("A", &fw, &fh); - if (global_settings.statusbar) - menu_lines = (LCD_HEIGHT - STATUSBAR_HEIGHT) / fh; - else - menu_lines = LCD_HEIGHT/fh; -#else int menu_lines = MENU_LINES; -#endif + if (menus[m].cursor-menus[m].top>=0 && menus[m].cursor-menus[m].top menu_lines-1 ) { - menus[m].top++; + menus[m].top+=menu_lines; + if (menus[m].top>menus[m].itemcount-1) + menus[m].top=menus[m].itemcount-1; menu_draw(m); - do_update = false; } - if (do_update && !global_settings.invert_cursor) { put_cursorxy(CURSOR_X, menus[m].cursor - menus[m].top, true); + lcd_puts_scroll(LINE_X, menus[m].cursor-menus[m].top, menus[m].items[menus[m].cursor].desc); lcd_update(); - } - } int menu_init(struct menu_items* mitems, int count) @@ -246,53 +124,35 @@ int menu_show(int m) { bool exit = false; -#ifdef HAVE_LCD_BITMAP - int fw, fh; - int menu_lines; - lcd_setfont(FONT_UI); - lcd_getstringsize("A", &fw, &fh); - if (global_settings.statusbar) - menu_lines = (LCD_HEIGHT - STATUSBAR_HEIGHT) / fh; - else - menu_lines = LCD_HEIGHT/fh; -#endif menu_draw(m); + put_cursor(m,menus[m].cursor); + lcd_update(); while (!exit) { - switch( button_get_w_tmo(HZ/2) ) { -#ifdef HAVE_RECORDER_KEYPAD + switch(button_get_flt(true, BUTTON_ALL, BUTTON_ALL, BUTTON_ALL_FLAGS & ~BUTTON_REL)) { case BUTTON_UP: case BUTTON_UP | BUTTON_REPEAT: -#else - case BUTTON_LEFT: - case BUTTON_LEFT | BUTTON_REPEAT: -#endif - if (menus[m].cursor) { + case BUTTON_IR | IR_BUTTON_VOLUP: + case BUTTON_IR | IR_BUTTON_VOLUP | IR_BUTTON_REPEAT: + if (menus[m].cursor>0) { /* move up */ put_cursor(m, menus[m].cursor-1); } else { /* move to bottom */ -#ifdef HAVE_RECORDER_KEYPAD - menus[m].top = menus[m].itemcount-(menu_lines+1); -#else - menus[m].top = menus[m].itemcount-3; -#endif + menus[m].top = menus[m].itemcount-4; if (menus[m].top < 0) menus[m].top = 0; - menus[m].cursor = menus[m].itemcount-1; + menu_draw(m); put_cursor(m, menus[m].itemcount-1); } break; -#ifdef HAVE_RECORDER_KEYPAD case BUTTON_DOWN: case BUTTON_DOWN | BUTTON_REPEAT: -#else - case BUTTON_RIGHT: - case BUTTON_RIGHT | BUTTON_REPEAT: -#endif + case BUTTON_IR | IR_BUTTON_VOLDN: + case BUTTON_IR | IR_BUTTON_VOLDN | IR_BUTTON_REPEAT: if (menus[m].cursor < menus[m].itemcount-1) { /* move down */ put_cursor(m, menus[m].cursor+1); @@ -300,55 +160,30 @@ else { /* move to top */ menus[m].top = 0; - menus[m].cursor = 0; + menu_draw(m); put_cursor(m, 0); } break; -#ifdef HAVE_RECORDER_KEYPAD - case BUTTON_RIGHT: -#endif case BUTTON_PLAY: + case BUTTON_RIGHT: + case BUTTON_IR | IR_BUTTON_PLAY: + case BUTTON_IR | IR_BUTTON_FFORWARD: /* Erase current display state */ lcd_clear_display(); return menus[m].cursor; -#ifdef HAVE_RECORDER_KEYPAD - case BUTTON_LEFT: - case BUTTON_F1: - case BUTTON_OFF | BUTTON_REPEAT: -#else case BUTTON_STOP: case BUTTON_MENU: - case BUTTON_STOP | BUTTON_REPEAT: -#endif - lcd_stop_scroll(); + case BUTTON_LEFT: + case BUTTON_IR | IR_BUTTON_STOP: + case BUTTON_IR | IR_BUTTON_EQ: + case BUTTON_IR | IR_BUTTON_REWIND: + lcd_cancel_scroll(); exit = true; break; -#ifdef HAVE_RECORDER_KEYPAD - case BUTTON_F2: - if (f2_screen()) - return MENU_ATTACHED_USB; - menu_draw(m); - break; - - case BUTTON_F3: - if (f3_screen()) - return MENU_ATTACHED_USB; - menu_draw(m); - break; -#endif - - case SYS_USB_CONNECTED: - usb_screen(); -#ifdef HAVE_LCD_CHARCELLS - status_set_param(false); -#endif - return MENU_ATTACHED_USB; } - - status_draw(false); } return MENU_SELECTED_EXIT; } @@ -361,8 +196,6 @@ int result=menu_show(m); if (result == MENU_SELECTED_EXIT) return false; - else if (result == MENU_ATTACHED_USB) - return true; if (menus[m].items[menus[m].cursor].function()) { return true; } diff -rubBP /home/dast/src/rockbox/apps/menu.h ./apps/menu.h --- /home/dast/src/rockbox/apps/menu.h Fri Feb 7 10:43:19 2003 +++ ./apps/menu.h Wed Oct 29 15:12:00 2003 @@ -1,22 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: menu.h,v 1.12 2003/01/29 08:26:10 kjer Exp $ - * - * Copyright (C) 2002 Robert E. Hak - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #ifndef __MENU_H__ #define __MENU_H__ @@ -24,7 +5,7 @@ struct menu_items { unsigned char *desc; - bool (*function) (void); /* return true if USB was connected */ + bool (*function) (void); }; int menu_init(struct menu_items* items, int count); @@ -34,8 +15,7 @@ /* Returns below define, or number of selected menu item*/ int menu_show(int m); -#define MENU_ATTACHED_USB -1 -#define MENU_SELECTED_EXIT -2 +#define MENU_SELECTED_EXIT -1 bool menu_run(int menu); diff -rubBP /home/dast/src/rockbox/apps/misc.c ./apps/misc.c --- /home/dast/src/rockbox/apps/misc.c Tue May 13 11:28:55 2003 +++ ./apps/misc.c Wed Oct 29 15:12:00 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: misc.c,v 1.3 2003/05/04 02:04:31 linusnielsen Exp $ - * - * Copyright (C) 2002 by Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #include "string.h" #include "config.h" #include "file.h" diff -rubBP /home/dast/src/rockbox/apps/misc.h ./apps/misc.h --- /home/dast/src/rockbox/apps/misc.h Tue May 13 11:28:55 2003 +++ ./apps/misc.h Wed Oct 29 15:12:00 2003 @@ -1,22 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: misc.h,v 1.2 2003/05/04 02:04:31 linusnielsen Exp $ - * - * Copyright (C) 2002 by Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - /* The point of this function would be to return a string of the input data, but never longer than 5 columns. Add suffix k and M when suitable... Make sure to have space for 6 bytes in the buffer. 5 letters plus the diff -rubBP /home/dast/src/rockbox/apps/onplay.c ./apps/onplay.c --- /home/dast/src/rockbox/apps/onplay.c Mon Dec 8 17:02:34 2003 +++ ./apps/onplay.c Wed Oct 29 15:12:00 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: onplay.c,v 1.20 2003/12/07 16:57:43 hohensoh Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #include #include #include @@ -31,6 +13,7 @@ #include "lang.h" #include "playlist.h" #include "button.h" +#include "remote.h" #include "kernel.h" #include "keyboard.h" #include "mp3data.h" @@ -59,7 +42,7 @@ if (new_playlist) playlist_create(NULL, NULL); - if ((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_MPA) + if (selected_file_attr & TREE_ATTR_MPA) playlist_insert_track(selected_file, position, queue); else if (selected_file_attr & ATTR_DIRECTORY) { @@ -73,20 +56,16 @@ bool exit = false; lcd_clear_display(); - lcd_puts_scroll(0,0,str(LANG_RECURSE_DIRECTORY_QUESTION)); + lcd_puts_scroll(0,0,"Recurse Directory?"); lcd_puts_scroll(0,1,selected_file); -#ifdef HAVE_LCD_BITMAP - lcd_puts(0,3,str(LANG_CONFIRM_WITH_PLAY_RECORDER)); - lcd_puts(0,4,str(LANG_CANCEL_WITH_ANY_RECORDER)); -#endif - lcd_update(); while (!exit) { int btn = button_get(true); switch (btn) { case BUTTON_PLAY: + case BUTTON_IR | IR_BUTTON_PLAY: recurse = true; exit = true; break; @@ -101,7 +80,7 @@ playlist_insert_directory(selected_file, position, queue, recurse); } - else if ((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_M3U) + else if (selected_file_attr & TREE_ATTR_M3U) playlist_insert_playlist(selected_file, position, queue); if (new_playlist && (playlist_amount() > 0)) @@ -158,7 +137,7 @@ args[i].queue = true; i++; } - else if (((selected_file_attr & TREE_ATTR_MASK) == TREE_ATTR_MPA) || + else if ((selected_file_attr & TREE_ATTR_MPA) || (selected_file_attr & ATTR_DIRECTORY)) { menu[i].desc = str(LANG_INSERT); @@ -181,24 +160,20 @@ bool exit = false; lcd_clear_display(); - lcd_puts(0,0,str(LANG_REALLY_DELETE)); + lcd_puts(0,0,"Really Delete?"); lcd_puts_scroll(0,1,selected_file); -#ifdef HAVE_LCD_BITMAP - lcd_puts(0,3,str(LANG_CONFIRM_WITH_PLAY_RECORDER)); - lcd_puts(0,4,str(LANG_CANCEL_WITH_ANY_RECORDER)); -#endif - lcd_update(); while (!exit) { int btn = button_get(true); switch (btn) { case BUTTON_PLAY: + case BUTTON_IR | IR_BUTTON_PLAY: if (!remove(selected_file)) { onplay_result = ONPLAY_RELOAD_DIR; lcd_clear_display(); - lcd_puts(0,0,str(LANG_DELETED)); + lcd_puts(0,0,"Deleted."); lcd_puts_scroll(0,1,selected_file); lcd_update(); sleep(HZ); @@ -489,8 +464,8 @@ selected_file = file; selected_file_attr = attr; - if (((attr & TREE_ATTR_MASK) == TREE_ATTR_MPA) || (attr & ATTR_DIRECTORY) || - (((attr & TREE_ATTR_MASK) == TREE_ATTR_M3U) && (mpeg_status() & MPEG_STATUS_PLAY))) + if ((attr & TREE_ATTR_MPA) || (attr & ATTR_DIRECTORY) || + ((attr & TREE_ATTR_M3U) && (mpeg_status() & MPEG_STATUS_PLAY))) { menu[i].desc = str(LANG_PLAYINDICES_PLAYLIST); menu[i].function = playlist_options; @@ -508,7 +483,7 @@ i++; } - if ((attr & TREE_ATTR_MASK) == TREE_ATTR_MPA) + if (attr & TREE_ATTR_MPA) { menu[i].desc = str(LANG_VBRFIX); menu[i].function = vbr_fix; diff -rubBP /home/dast/src/rockbox/apps/onplay.h ./apps/onplay.h --- /home/dast/src/rockbox/apps/onplay.h Fri Aug 29 13:49:54 2003 +++ ./apps/onplay.h Wed Oct 29 15:12:00 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: onplay.h,v 1.2 2003/07/01 21:03:28 hardeeps Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #ifndef _ONPLAY_H_ #define _ONPLAY_H_ diff -rubBP /home/dast/src/rockbox/apps/options.h ./apps/options.h --- /home/dast/src/rockbox/apps/options.h Fri Aug 29 13:49:54 2003 +++ ./apps/options.h Wed Oct 29 15:12:00 2003 @@ -1,33 +1,4 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: options.h,v 1.5 2003/06/10 23:12:19 bagder Exp $ - * - * Copyright (C) 2002 Daniel Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #ifndef __OPTIONS_H__ #define __OPTIONS_H__ -#ifndef DISABLE_DEMOS -#undef USE_DEMOS /* since older Makefiles set the define */ -#define USE_DEMOS -#endif - -#ifndef DISABLE_GAMES -#undef USE_GAMES /* since older Makefiles set the define */ -#define USE_GAMES -#endif - #endif /* End __OPTIONS_H__ */ Only in /home/dast/src/rockbox/apps: player diff -rubBP /home/dast/src/rockbox/apps/playlist.c ./apps/playlist.c --- /home/dast/src/rockbox/apps/playlist.c Tue Dec 9 13:28:39 2003 +++ ./apps/playlist.c Fri Nov 7 07:55:00 2003 @@ -1,22 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: playlist.c,v 1.84 2003/12/09 08:18:02 hardeeps Exp $ - * - * Copyright (C) 2002 by wavey@wavey.org - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - /* Dynamic playlist design (based on design originally proposed by ricII) @@ -82,25 +63,22 @@ #include "atoi.h" #include "misc.h" #include "button.h" +#include "remote.h" #include "tree.h" -#ifdef HAVE_LCD_BITMAP -#include "icons.h" -#include "widgets.h" -#endif #include "lang.h" static struct playlist_info playlist; -#define PLAYLIST_CONTROL_FILE ROCKBOX_DIR "/.playlist_control" -#define PLAYLIST_CONTROL_FILE_VERSION 2 +#define PLAYLIST_CONTROL_FILE OPENNEO_DIR "/.playlist_control" +#define PLAYLIST_CONTROL_FILE_VERSION 1 /* Each playlist index has a flag associated with it which identifies what type of track it is. These flags are stored in the 3 high order bits of the index. - NOTE: This limits the playlist file size to a max of 512M. + NOTE: This limits the playlist file size to a max of 512K. Bits 31-30: 00 = Playlist track @@ -145,7 +123,6 @@ char *dir); static void display_playlist_count(int count, char *fmt); static void display_buffer_full(void); -static int flush_pending_control(void); /* * remove any files and indices associated with the playlist @@ -171,7 +148,6 @@ playlist.first_index = 0; playlist.amount = 0; playlist.last_insert_pos = -1; - playlist.shuffle_flush = false; if (!resume) { @@ -182,10 +158,6 @@ fd = creat(PLAYLIST_CONTROL_FILE, 0000200); if (fd >= 0) close(fd); - - /* Reset resume settings */ - global_settings.resume_first_index = 0; - global_settings.resume_seed = -1; } } @@ -230,13 +202,6 @@ if(playlist.fd < 0) return -1; /* failure */ -#ifdef HAVE_LCD_BITMAP - if(global_settings.statusbar) - lcd_setmargins(0, STATUSBAR_HEIGHT); - else - lcd_setmargins(0, 0); -#endif - splash(0, 0, true, str(LANG_PLAYLIST_LOAD)); /* use mp3 buffer for maximum load speed */ @@ -363,16 +328,8 @@ if (playlist.amount > 0 && insert_position <= playlist.first_index && position != PLAYLIST_PREPEND) - { playlist.first_index++; - if (seek_pos < 0) - { - global_settings.resume_first_index = playlist.first_index; - settings_save(); - } - } - if (insert_position < playlist.last_insert_pos || (insert_position == playlist.last_insert_pos && position < 0)) playlist.last_insert_pos++; @@ -381,9 +338,6 @@ { int result = -1; - if (flush_pending_control() < 0) - return -1; - mutex_lock(&playlist.control_mutex); if (lseek(playlist.control_fd, 0, SEEK_END) >= 0) @@ -404,6 +358,7 @@ if (result < 0) { splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); + DEBUGF("Could not update playlist control file %s!",PLAYLIST_CONTROL_FILE); return result; } } @@ -427,11 +382,11 @@ int num_files = 0; bool buffer_full = false; int i; - int dirfilter = SHOW_ALL; + int button; struct entry *files; /* use the tree browser dircache to load files */ - files = load_and_sort_directory(dirname, &dirfilter, &num_files, + files = load_and_sort_directory(dirname, SHOW_ALL, &num_files, &buffer_full); if(!files) @@ -452,11 +407,8 @@ for (i=0; i= 0) @@ -578,6 +519,7 @@ if (result < 0) { splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); + DEBUGF("Could not update playlist control file %s!",PLAYLIST_CONTROL_FILE); return result; } } @@ -596,10 +538,6 @@ int store; unsigned int current = playlist.indices[playlist.index]; - /* seed 0 is used to identify sorted playlist for resume purposes */ - if (seed == 0) - seed = 1; - /* seed with the given seed */ srand(seed); @@ -621,13 +559,30 @@ /* indices have been moved so last insert position is no longer valid */ playlist.last_insert_pos = -1; - if (write) + if (write && playlist.control_fd >= 0) + { + int result = -1; + + mutex_lock(&playlist.control_mutex); + + if (lseek(playlist.control_fd, 0, SEEK_END) >= 0) + { + if (fprintf(playlist.control_fd, "S:%d:%d\n", seed, + playlist.first_index) > 0) + { + fsync(playlist.control_fd); + result = 0; + } + } + + mutex_unlock(&playlist.control_mutex); + + if (result < 0) { - /* Don't write to disk immediately. Instead, save in settings and - only flush if playlist is modified (insertion/deletion) */ - playlist.shuffle_flush = true; - global_settings.resume_seed = seed; - settings_save(); + splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); + DEBUGF("Could not update playlist control file %s!",PLAYLIST_CONTROL_FILE); + return result; + } } return 0; @@ -653,11 +608,28 @@ if (write && playlist.control_fd >= 0) { - /* Don't write to disk immediately. Instead, save in settings and - only flush if playlist is modified (insertion/deletion) */ - playlist.shuffle_flush = true; - global_settings.resume_seed = 0; - settings_save(); + int result = -1; + + mutex_lock(&playlist.control_mutex); + + if (lseek(playlist.control_fd, 0, SEEK_END) >= 0) + { + if (fprintf(playlist.control_fd, "U:%d\n", playlist.first_index) > + 0) + { + fsync(playlist.control_fd); + result = 0; + } + } + + mutex_unlock(&playlist.control_mutex); + + if (result < 0) + { + splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); + DEBUGF("Could not update playlist control file %s!",PLAYLIST_CONTROL_FILE); + return result; + } } return 0; @@ -745,9 +717,7 @@ { if (playlist.indices[i] == seek) { - playlist.index = global_settings.resume_first_index = - playlist.first_index = i; - settings_save(); + playlist.index = playlist.first_index = i; break; } } @@ -826,10 +796,11 @@ if (max < 0) { - if (control_file) + if (control_file) { splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); - else + DEBUGF("Could not update playlist control file %s!",PLAYLIST_CONTROL_FILE); + } else splash(HZ*2, 0, true, str(LANG_PLAYLIST_ACCESS_ERROR)); return max; @@ -915,18 +886,7 @@ { lcd_clear_display(); -#ifdef HAVE_LCD_BITMAP - if(global_settings.statusbar) - lcd_setmargins(0, STATUSBAR_HEIGHT); - else - lcd_setmargins(0, 0); -#endif - -#ifdef HAVE_PLAYER_KEYPAD splash(0, 0, true, fmt, count, str(LANG_STOP_ABORT)); -#else - splash(0, 0, true, fmt, count, str(LANG_OFF_ABORT)); -#endif } /* @@ -943,56 +903,6 @@ } /* - * Flush any pending control commands to disk. Called when playlist is being - * modified. Returns 0 on success and -1 on failure. - */ -static int flush_pending_control(void) -{ - int result = 0; - - if (playlist.shuffle_flush && global_settings.resume_seed >= 0) - { - /* pending shuffle */ - mutex_lock(&playlist.control_mutex); - - if (lseek(playlist.control_fd, 0, SEEK_END) >= 0) - { - if (global_settings.resume_seed == 0) - result = fprintf(playlist.control_fd, "U:%d\n", - playlist.first_index); - else - result = fprintf(playlist.control_fd, "S:%d:%d\n", - global_settings.resume_seed, playlist.first_index); - - if (result > 0) - { - fsync(playlist.control_fd); - - playlist.shuffle_flush = false; - global_settings.resume_seed = -1; - settings_save(); - - result = 0; - } - else - result = -1; - } - else - result = -1; - - mutex_unlock(&playlist.control_mutex); - - if (result < 0) - { - splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); - return result; - } - } - - return result; -} - -/* * Initialize playlist entries at startup */ void playlist_init(void) @@ -1016,8 +926,10 @@ empty_playlist(false); playlist.control_fd = open(PLAYLIST_CONTROL_FILE, O_RDWR); - if (playlist.control_fd < 0) + if (playlist.control_fd < 0) { + DEBUGF("Playlist_Create: Could not update playlist control file!\n%s (%d)\n",PLAYLIST_CONTROL_FILE,playlist.control_fd); splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_ACCESS_ERROR)); + } if (!file) { @@ -1060,7 +972,6 @@ int nread; int total_read = 0; bool first = true; - bool sorted = true; enum { resume_playlist, @@ -1142,7 +1053,12 @@ version = atoi(str1); if (version != PLAYLIST_CONTROL_FILE_VERSION) - return -1; + { + DEBUGF("Playlist control not my version\n"); + result = -1; + exit_loop = true; + break; + } update_playlist_filename(str2, str3); @@ -1156,7 +1072,7 @@ else if (str2[0] != '\0') { playlist.in_ram = true; - resume_directory(str2); + DEBUGF("Playlist resuming directory\n - %s\n",str2); } /* load the rest of the data */ @@ -1182,6 +1098,7 @@ position = atoi(str1); last_position = atoi(str2); + DEBUGF("Playlist adding file\n - %s\n",str3); queue = (current_command == resume_add)?false:true; /* seek position is based on str3's position in @@ -1226,19 +1143,12 @@ break; } - if (!sorted) - { - /* Always sort list before shuffling */ - sort_playlist(false, false); - } - seed = atoi(str1); playlist.first_index = atoi(str2); if (randomise_playlist(seed, false, false) < 0) return -1; - sorted = false; break; } case resume_unshuffle: @@ -1256,7 +1166,6 @@ if (sort_playlist(false, false) < 0) return -1; - sorted = true; break; } case resume_reset: @@ -1391,27 +1300,8 @@ /* Terminate on EOF */ if(nread <= 0) - { - if (global_settings.resume_seed >= 0) - { - /* Apply shuffle command saved in settings */ - if (global_settings.resume_seed == 0) - sort_playlist(false, true); - else - { - if (!sorted) - sort_playlist(false, false); - - randomise_playlist(global_settings.resume_seed, false, - true); - } - - playlist.first_index = global_settings.resume_first_index; - } - break; } - } return 0; } @@ -1436,6 +1326,36 @@ playlist.buffer_end_pos += len; playlist.buffer[playlist.buffer_end_pos++] = '\0'; + if (playlist.control_fd >= 0) + { + int result = -1; + + mutex_lock(&playlist.control_mutex); + + if (lseek(playlist.control_fd, 0, SEEK_END) >= 0) + { + if (fprintf(playlist.control_fd, "A:%d:%d:%s\n", + PLAYLIST_INSERT_LAST, playlist.last_insert_pos,filename) > 0) + { + /* save the position in file where track name is written */ +// lseek(playlist.control_fd, 0, SEEK_CUR); + +// if (fprintf(playlist.control_fd, "%s\n", filename) > 0) + result = 0; + fsync(playlist.control_fd); + } + } + + mutex_unlock(&playlist.control_mutex); + + if (result < 0) + { + splash(HZ*2, 0, true, str(LANG_PLAYLIST_CONTROL_UPDATE_ERROR)); + DEBUGF("Could not update playlist control file %s!",PLAYLIST_CONTROL_FILE); + return result; + } + } + return 0; } @@ -1511,6 +1431,7 @@ char trackname[MAX_PATH+1]; int count = 0; int result = 0; + int button; if (playlist.control_fd < 0) { @@ -1544,15 +1465,13 @@ while ((max = read_line(fd, temp_buf, sizeof(temp_buf))) > 0) { /* user abort */ -#ifdef HAVE_PLAYER_KEYPAD - if (button_get(false) == BUTTON_STOP) -#else - if (button_get(false) == BUTTON_OFF) -#endif + button=button_get(false); + if (button == BUTTON_STOP || button == (BUTTON_IR | IR_BUTTON_STOP)) break; if (temp_buf[0] != '#' || temp_buf[0] != '\0') { + DEBUGF("Adding file '%s'\n",temp_buf); int insert_pos; /* we need to format so that relative paths are correctly @@ -1633,8 +1552,7 @@ { /* store the seek position before the shuffle */ seek_pos = playlist.indices[start_index]; - playlist.index = global_settings.resume_first_index = - playlist.first_index = start_index; + playlist.index = playlist.first_index = start_index; start_current = true; } @@ -1642,9 +1560,6 @@ randomise_playlist(random_seed, start_current, true); - /* Flush shuffle command to disk */ - flush_pending_control(); - return playlist.index; } @@ -1697,8 +1612,10 @@ bool control_file; index = get_next_index(steps); - if (index < 0) + if (index < 0) { + DEBUGF("get_next_index returned null!\n"); return NULL; + } control_file = playlist.indices[index] & PLAYLIST_INSERT_TYPE_MASK; seek = playlist.indices[index] & PLAYLIST_SEEK_MASK; @@ -1761,6 +1678,7 @@ } index = get_next_index(steps); + DEBUGF("playlist_next: Now playing song w/ index %d\n",index); playlist.index = index; if (playlist.last_insert_pos >= 0) @@ -1814,7 +1732,7 @@ /* Get resume info for current playing song. If return value is -1 then settings shouldn't be saved. */ -int playlist_get_resume_info(short *resume_index) +int playlist_get_resume_info(int *resume_index) { *resume_index = playlist.index; @@ -1898,13 +1816,11 @@ bool control_file; bool queue; int seek; + int button; /* user abort */ -#ifdef HAVE_PLAYER_KEYPAD - if (button_get(false) == BUTTON_STOP) -#else - if (button_get(false) == BUTTON_OFF) -#endif + button=button_get(false); + if (button == BUTTON_STOP || button == (BUTTON_IR | IR_BUTTON_STOP)) break; control_file = playlist.indices[index] & PLAYLIST_INSERT_TYPE_MASK; diff -rubBP /home/dast/src/rockbox/apps/playlist.h ./apps/playlist.h --- /home/dast/src/rockbox/apps/playlist.h Tue Dec 9 13:28:39 2003 +++ ./apps/playlist.h Wed Oct 29 15:12:02 2003 @@ -1,22 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: playlist.h,v 1.29 2003/12/09 08:18:02 hardeeps Exp $ - * - * Copyright (C) 2002 by wavey@wavey.org - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #ifndef __PLAYLIST_H__ #define __PLAYLIST_H__ @@ -39,11 +20,10 @@ char *buffer; /* buffer for in-ram playlists */ int buffer_size; /* size of buffer */ int buffer_end_pos; /* last position where buffer was written */ - short index; /* index of current playing track */ - short first_index; /* index of first song in playlist */ + int index; /* index of current playing track */ + int first_index; /* index of first song in playlist */ int amount; /* number of tracks in the index */ int last_insert_pos; /* last position we inserted a track */ - bool shuffle_flush; /* Does shuffle value need to be flushed? */ struct mutex control_mutex; /* mutex for control file access */ }; @@ -63,7 +43,7 @@ bool playlist_check(int steps); char *playlist_peek(int steps); int playlist_next(int steps); -int playlist_get_resume_info(short *resume_index); +int playlist_get_resume_info(int *resume_index); int playlist_get_display_index(void); int playlist_amount(void); char *playlist_name(char *buf, int buf_size); diff -rubBP /home/dast/src/rockbox/apps/playlist_menu.c ./apps/playlist_menu.c --- /home/dast/src/rockbox/apps/playlist_menu.c Wed Jul 2 17:54:44 2003 +++ ./apps/playlist_menu.c Tue Dec 2 21:59:15 2003 @@ -1,22 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: playlist_menu.c,v 1.2 2003/07/02 15:54:44 hardeeps Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #include #include "menu.h" @@ -34,9 +15,9 @@ { char filename[MAX_PATH+1]; - strncpy(filename, DEFAULT_PLAYLIST_NAME, sizeof(filename)); + strncpy( filename, DEFAULT_PLAYLIST_NAME, sizeof(filename) ); - if (!kbd_input(filename, sizeof(filename))) + if( kbd_input(&filename[1], sizeof(filename)-1) != 0 ) { playlist_save(filename); diff -rubBP /home/dast/src/rockbox/apps/playlist_menu.h ./apps/playlist_menu.h --- /home/dast/src/rockbox/apps/playlist_menu.h Tue Jul 1 23:05:43 2003 +++ ./apps/playlist_menu.h Wed Oct 29 15:12:02 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: playlist_menu.h,v 1.1 2003/07/01 21:05:43 hardeeps Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #ifndef _PLAYLIST_MENU_H #define _PLAYLIST_MENU_H diff -rubBP /home/dast/src/rockbox/apps/plugin.c ./apps/plugin.c --- /home/dast/src/rockbox/apps/plugin.c Tue Dec 9 07:48:55 2003 +++ ./apps/plugin.c Wed Oct 29 15:12:02 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: plugin.c,v 1.10 2003/12/09 06:48:55 bagder Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #include #include #include @@ -35,9 +17,6 @@ #include "keyboard.h" #include "mpeg.h" -#ifdef HAVE_LCD_BITMAP -#include "widgets.h" -#endif #ifdef SIMULATOR #include @@ -63,9 +42,9 @@ static bool plugin_loaded = false; static int plugin_size = 0; -static int plugin_test(int api_version, int model, int memsize); +static int plugin_test(int api_version); -static struct plugin_api rockbox_api = { +static struct plugin_api openneo_api = { PLUGIN_API_VERSION, plugin_test, @@ -75,45 +54,19 @@ lcd_puts, lcd_puts_scroll, lcd_stop_scroll, -#ifdef HAVE_LCD_CHARCELLS - lcd_define_pattern, - lcd_get_locked_pattern, - lcd_unlock_pattern, lcd_putc, -#else - lcd_putsxy, - lcd_bitmap, - lcd_drawline, - lcd_clearline, - lcd_drawpixel, - lcd_clearpixel, - lcd_setfont, - lcd_clearrect, - lcd_fillrect, - lcd_drawrect, - lcd_invertrect, - lcd_getstringsize, - lcd_update, - lcd_update_rect, - progressbar, - slidebar, - scrollbar, -#ifndef SIMULATOR - lcd_roll, -#endif -#endif /* button */ button_get, button_get_w_tmo, /* file */ - (open_func)PREFIX(open), + PREFIX(open), PREFIX(close), - (read_func)read, + read, lseek, - (creat_func)PREFIX(creat), - (write_func)write, + PREFIX(creat), + write, remove, rename, ftruncate, @@ -128,7 +81,6 @@ /* kernel */ PREFIX(sleep), - usb_screen, ¤t_tick, /* strings and memory */ @@ -138,18 +90,11 @@ memset, memcpy, - /* sound */ -#ifndef SIMULATOR -#ifdef HAVE_MAS3587F - mas_codec_readreg, -#endif -#endif - /* misc */ srand, rand, splash, - (qsort_func)qsort, + qsort, kbd_input, mpeg_current_track, atoi, @@ -170,15 +115,11 @@ #endif lcd_clear_display(); -#ifdef HAVE_LCD_BITMAP - lcd_setmargins(0,0); - lcd_update(); -#endif #ifdef SIMULATOR #ifdef WIN32 snprintf(path, sizeof path, "%s", plugin); #else - snprintf(path, sizeof path, "archos%s", plugin); + snprintf(path, sizeof path, "neo%s", plugin); #endif pd = dlopen(path, RTLD_NOW); if (!pd) { @@ -215,32 +156,20 @@ splash(HZ*2, 0, true, buf); return -1; } - if (plugin_size == 0) { - /* loaded a 0-byte plugin, implying it's not for this model */ - splash(HZ*2, 0, true, str(LANG_PLUGIN_WRONG_MODEL)); - return -1; - } #endif plugin_loaded = true; - rc = plugin_start(&rockbox_api, parameter); + rc = plugin_start(&openneo_api, parameter); plugin_loaded = false; switch (rc) { case PLUGIN_OK: break; - case PLUGIN_USB_CONNECTED: - return PLUGIN_USB_CONNECTED; - case PLUGIN_WRONG_API_VERSION: splash(HZ*2, 0, true, str(LANG_PLUGIN_WRONG_VERSION)); break; - case PLUGIN_WRONG_MODEL: - splash(HZ*2, 0, true, str(LANG_PLUGIN_WRONG_MODEL)); - break; - default: splash(HZ*2, 0, true, str(LANG_PLUGIN_ERROR)); break; @@ -276,17 +205,11 @@ return &pluginbuf[buffer_pos]; } -static int plugin_test(int api_version, int model, int memsize) +static int plugin_test(int api_version) { if (api_version < PLUGIN_MIN_API_VERSION || api_version > PLUGIN_API_VERSION) return PLUGIN_WRONG_API_VERSION; - if (model != MODEL) - return PLUGIN_WRONG_MODEL; - - if (memsize != MEM) - return PLUGIN_WRONG_MODEL; - return PLUGIN_OK; } Only in /home/dast/src/rockbox/apps: plugin.c.~1.9.~ diff -rubBP /home/dast/src/rockbox/apps/plugin.h ./apps/plugin.h --- /home/dast/src/rockbox/apps/plugin.h Mon Dec 8 22:58:38 2003 +++ ./apps/plugin.h Wed Oct 29 15:12:02 2003 @@ -1,21 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: plugin.h,v 1.12 2003/12/08 21:58:38 bagder Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #ifndef _PLUGIN_H_ #define _PLUGIN_H_ @@ -25,10 +7,6 @@ #define NO_REDEFINES_PLEASE #endif -#ifndef MEM -#define MEM 2 -#endif - #include #include #include @@ -36,41 +14,26 @@ #include "dir.h" #include "kernel.h" #include "button.h" -#include "font.h" #include "system.h" #include "lcd.h" #include "id3.h" #include "mpeg.h" /* increase this every time the api struct changes */ -#define PLUGIN_API_VERSION 7 +#define PLUGIN_API_VERSION 1 /* update this to latest version if a change to the api struct breaks backwards compatibility */ -#define PLUGIN_MIN_API_VERSION 6 +#define PLUGIN_MIN_API_VERSION 1 /* plugin return codes */ enum plugin_status { PLUGIN_OK = 0, - PLUGIN_USB_CONNECTED, PLUGIN_WRONG_API_VERSION = -1, - PLUGIN_WRONG_MODEL = -2, - PLUGIN_ERROR = -3, -}; - -/* different (incompatible) plugin models */ -enum model { - PLAYER, - RECORDER + PLUGIN_ERROR = -2, }; -#ifdef HAVE_LCD_CHARCELLS -#define MODEL PLAYER -#else -#define MODEL RECORDER -#endif - /* compatibility test macro */ #define TEST_PLUGIN_API(_api_) \ do { \ @@ -96,37 +59,7 @@ void (*lcd_puts)(int x, int y, unsigned char *string); void (*lcd_puts_scroll)(int x, int y, unsigned char* string); void (*lcd_stop_scroll)(void); -#ifdef HAVE_LCD_CHARCELLS - void (*lcd_define_pattern)(int which,char *pattern); - unsigned char (*lcd_get_locked_pattern)(void); - void (*lcd_unlock_pattern)(unsigned char pat); void (*lcd_putc)(int x, int y, unsigned short ch); -#else - void (*lcd_putsxy)(int x, int y, unsigned char *string); - void (*lcd_bitmap)(unsigned char *src, int x, int y, - int nx, int ny, bool clear); - void (*lcd_drawline)(int x1, int y1, int x2, int y2); - void (*lcd_clearline)(int x1, int y1, int x2, int y2); - void (*lcd_drawpixel)(int x, int y); - void (*lcd_clearpixel)(int x, int y); - void (*lcd_setfont)(int font); - void (*lcd_clearrect)(int x, int y, int nx, int ny); - void (*lcd_fillrect)(int x, int y, int nx, int ny); - void (*lcd_drawrect)(int x, int y, int nx, int ny); - void (*lcd_invertrect)(int x, int y, int nx, int ny); - int (*lcd_getstringsize)(unsigned char *str, int *w, int *h); - void (*lcd_update)(void); - void (*lcd_update_rect)(int x, int y, int width, int height); - void (*progressbar)(int x, int y, int width, int height, - int percent, int direction); - void (*slidebar)(int x, int y, int width, int height, - int percent, int direction); - void (*scrollbar)(int x, int y, int width, int height, int items, - int min_shown, int max_shown, int orientation); -#ifndef SIMULATOR - void (*lcd_roll)(int pixels); -#endif -#endif /* button */ int (*button_get)(bool block); @@ -135,13 +68,13 @@ /* file */ int (*open)(const char* pathname, int flags); int (*close)(int fd); - ssize_t (*read)(int fd, void* buf, size_t count); - off_t (*lseek)(int fd, off_t offset, int whence); - int (*creat)(const char *pathname, mode_t mode); - ssize_t (*write)(int fd, const void* buf, size_t count); + int (*read)(int fd, void* buf, int count); + int (*lseek)(int fd, int offset, int whence); + int (*creat)(const char *pathname, int mode); + int (*write)(int fd, void* buf, int count); int (*remove)(const char* pathname); int (*rename)(const char* path, const char* newname); - int (*ftruncate)(int fd, off_t length); + int (*ftruncate)(int fd, unsigned int size); int (*filesize)(int fd); int (*fprintf)(int fd, const char *fmt, ...); int (*read_line)(int fd, char* buffer, int buffer_size); @@ -153,7 +86,6 @@ /* kernel */ void (*sleep)(int ticks); - void (*usb_screen)(void); long* current_tick; /* strings and memory */ @@ -163,13 +95,6 @@ void* (*memset)(void *dst, int c, size_t length); void* (*memcpy)(void *out, const void *in, size_t n); - /* sound */ -#ifndef SIMULATOR -#ifdef HAVE_MAS3587F - int (*mas_codec_readreg)(int reg); -#endif -#endif - /* misc */ void (*srand)(unsigned int seed); int (*rand)(void); @@ -188,7 +113,7 @@ void* plugin_get_buffer(int *buffer_size); /* defined by the plugin */ -enum plugin_status plugin_start(struct plugin_api* rockbox, void* parameter) +enum plugin_status plugin_start(struct plugin_api* openneo, void* parameter) __attribute__ ((section (".entry"))); #endif Only in /home/dast/src/rockbox/apps: plugin.h.~1.11.~ Only in /home/dast/src/rockbox/apps: plugins Only in /home/dast/src/rockbox/apps: recorder diff -rubBP /home/dast/src/rockbox/apps/screens.c ./apps/screens.c --- /home/dast/src/rockbox/apps/screens.c Thu Dec 4 16:35:38 2003 +++ ./apps/screens.c Mon Nov 24 04:30:19 2003 @@ -1,664 +1,24 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: screens.c,v 1.35 2003/12/04 00:08:25 zagor Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #include #include #include -#include "backlight.h" #include "button.h" #include "lcd.h" #include "lang.h" -#include "icons.h" -#include "font.h" #include "mpeg.h" -#include "usb.h" #include "settings.h" #include "status.h" #include "playlist.h" #include "sprintf.h" #include "kernel.h" -#include "power.h" #include "system.h" -#include "powermgmt.h" -#include "adc.h" -#ifdef HAVE_LCD_BITMAP -#define BMPHEIGHT_usb_logo 32 -#define BMPWIDTH_usb_logo 100 -static unsigned char usb_logo[] = { - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x20, 0x10, 0x08, - 0x04, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x81, 0x81, 0x81, 0x81, - 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, - 0x01, 0x01, 0x01, 0x01, 0xf1, 0x4f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, - 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0xc0, - 0x00, 0x00, 0xe0, 0x1c, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x81, 0xc0, 0xe0, 0xe0, 0xe0, 0xe0, - 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x80, 0xc0, 0xe0, 0x70, 0x38, 0x1c, 0x1c, - 0x0c, 0x0e, 0x0e, 0x06, 0x06, 0x06, 0x06, 0x06, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, - 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0xc0, 0xc0, 0x80, 0x80, 0x00, 0x00, - 0x00, 0x00, 0xe0, 0x1f, 0x00, 0xf8, 0x06, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, - 0x02, 0x02, 0x02, 0x82, 0x7e, 0x00, 0xc0, 0x3e, 0x01, - 0x70, 0x4f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, - 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, - 0x40, 0x40, 0x40, 0x40, 0x40, 0x80, 0x00, 0x07, 0x0f, 0x1f, 0x1f, 0x1f, 0x1f, - 0x0f, 0x07, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f, - 0x1f, 0x3f, 0x7b, 0xf3, 0xe3, 0xc3, 0x83, 0x83, 0x83, 0x83, 0xe3, 0xe3, 0xe3, - 0xe3, 0xe3, 0xe3, 0x03, 0x03, 0x03, 0x3f, 0x1f, 0x1f, 0x0f, 0x0f, 0x07, 0x02, - 0xc0, 0x3e, 0x01, 0xe0, 0x9f, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x80, 0xf0, 0x0f, 0x80, 0x78, 0x07, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0c, 0x10, 0x20, 0x40, 0x40, 0x80, 0x80, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, - 0x80, 0x80, 0x80, 0x80, 0x80, 0x81, 0x81, 0x81, 0x81, 0x81, 0x87, 0x87, 0x87, - 0x87, 0x87, 0x87, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf0, - 0x0f, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x04, 0x07, 0x00, 0x00, 0x00, 0x00, -}; -#endif - -void usb_display_info(void) -{ - lcd_clear_display(); - -#ifdef HAVE_LCD_BITMAP - /* lcd_bitmap() only supports 16 pixels height! */ - lcd_bitmap(usb_logo, 6, 16, - BMPWIDTH_usb_logo, 8, false); - lcd_bitmap(usb_logo+BMPWIDTH_usb_logo, 6, 24, - BMPWIDTH_usb_logo, 8, false); - lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*2, 6, 32, - BMPWIDTH_usb_logo, 8, false); - lcd_bitmap(usb_logo+BMPWIDTH_usb_logo*3, 6, 40, - BMPWIDTH_usb_logo, 8, false); - status_draw(true); - lcd_update(); -#else - lcd_puts(0, 0, "[USB Mode]"); - status_set_param(false); - status_set_audio(false); - status_set_usb(true); - status_draw(false); -#endif -} - -void usb_screen(void) -{ -#ifndef SIMULATOR - backlight_on(); - usb_acknowledge(SYS_USB_CONNECTED_ACK); - usb_display_info(); - while(usb_wait_for_disconnect_w_tmo(&button_queue, HZ)) { - if(usb_inserted()) { - status_draw(false); - } - } -#ifdef HAVE_LCD_CHARCELLS - status_set_usb(false); -#endif - - backlight_on(); -#endif -} - - -/* some simulator dummies */ -#ifdef SIMULATOR -#define BATTERY_SCALE_FACTOR 7000 -unsigned short adc_read(int channel) -{ - (void)channel; - return 100; -} -#endif - - -#ifdef HAVE_LCD_BITMAP -void charging_display_info(bool animate) -{ - unsigned char charging_logo[36]; - const int pox_x = (LCD_WIDTH - sizeof(charging_logo)) / 2; - const int pox_y = 32; - static unsigned phase = 3; - unsigned i; - char buf[32]; - (void)buf; - -#ifdef NEED_ATA_POWER_BATT_MEASURE - if (ide_powered()) /* FM and V2 can only measure when ATA power is on */ -#endif - { - int battery_voltage; - int batt_int, batt_frac; - - battery_voltage = (adc_read(ADC_UNREG_POWER) * BATTERY_SCALE_FACTOR) / 10000; - batt_int = battery_voltage / 100; - batt_frac = battery_voltage % 100; - - snprintf(buf, 32, " Batt: %d.%02dV %d%% ", batt_int, batt_frac, - battery_level()); - lcd_puts(0, 7, buf); - } - -#ifdef HAVE_CHARGE_CTRL - - snprintf(buf, 32, "Charge mode:"); - lcd_puts(0, 2, buf); - - if (charge_state == 1) - snprintf(buf, 32, str(LANG_BATTERY_CHARGE)); - else if (charge_state == 2) - snprintf(buf, 32, str(LANG_BATTERY_TOPOFF_CHARGE)); - else if (charge_state == 3) - snprintf(buf, 32, str(LANG_BATTERY_TRICKLE_CHARGE)); - else - snprintf(buf, 32, "not charging"); - - lcd_puts(0, 3, buf); - if (charger_enabled) - { - backlight_on(); /* using the light gives good indication */ - } - else - { - backlight_off(); - animate = false; - } -#endif - - - /* middle part */ - memset(charging_logo+3, 0x00, 32); - charging_logo[0] = 0x3C; - charging_logo[1] = 0x24; - charging_logo[2] = charging_logo[35] = 0xFF; - - if (!animate) - { /* draw the outline */ - /* middle part */ - lcd_bitmap(charging_logo, pox_x, pox_y + 8, sizeof(charging_logo), 8, true); - /* upper line */ - charging_logo[0] = charging_logo[1] = 0x00; - memset(charging_logo+2, 0x80, 34); - lcd_bitmap(charging_logo, pox_x, pox_y, sizeof(charging_logo), 8, false); - /* lower line */ - memset(charging_logo+2, 0x01, 34); - lcd_bitmap(charging_logo, pox_x, pox_y + 16, sizeof(charging_logo), 8, false); - } - else - { /* animate the middle part */ - for (i = 3; i 7) - bitpos = 14 - bitpos; - charging_logo[i] = 0x01 << bitpos; - } - } - lcd_bitmap(charging_logo, pox_x, pox_y + 8, sizeof(charging_logo), 8, true); - phase++; - } - lcd_update(); -} -#else /* not HAVE_LCD_BITMAP */ -void charging_display_info(bool animate) -{ - /* ToDo for Player */ - (void)animate; -} -#endif - - -/* blocks while charging, returns on event: - 1 if charger cable was removed - 2 if Off/Stop key was pressed - 3 if On key was pressed - 4 if USB was connected */ -int charging_screen(void) -{ - int button; - int rc = 0; -#ifdef HAVE_RECORDER_KEYPAD - const int offbutton = BUTTON_OFF; -#else - const int offbutton = BUTTON_STOP; -#endif - - ide_power_enable(false); /* power down the disk, else would be spinning */ - - lcd_clear_display(); - backlight_on(); - status_draw(true); - -#ifdef HAVE_LCD_BITMAP - charging_display_info(false); -#else - status_set_playmode(STATUS_STOP); - lcd_puts(0, 1, "[charging]"); -#endif - - do - { - status_draw(false); - charging_display_info(true); - button = button_get_w_tmo(HZ/3); - if (button == (BUTTON_ON | BUTTON_REL)) - rc = 3; - else if (button == offbutton) - rc = 2; - else - { - if (usb_detect()) - rc = 4; - else if (!charger_inserted()) - rc = 1; - } - } while (!rc); - - return rc; -} - - - -#ifdef HAVE_RECORDER_KEYPAD -/* returns: - 0 if no key was pressed - 1 if a key was pressed (or if ON was held down long enough to repeat) - 2 if USB was connected */ -int on_screen(void) -{ - static int pitch = 1000; - bool exit = false; - bool used = false; - - while (!exit) { - - if ( used ) { - char* ptr; - char buf[32]; - int w, h; - - lcd_clear_display(); - lcd_setfont(FONT_SYSFIXED); - - ptr = str(LANG_PITCH_UP); - lcd_getstringsize(ptr,&w,&h); - lcd_putsxy((LCD_WIDTH-w)/2, 0, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_UpArrow], - LCD_WIDTH/2 - 3, h*2, 7, 8, true); - - snprintf(buf, sizeof buf, "%d.%d%%", pitch / 10, pitch % 10 ); - lcd_getstringsize(buf,&w,&h); - lcd_putsxy((LCD_WIDTH-w)/2, h, buf); - - ptr = str(LANG_PITCH_DOWN); - lcd_getstringsize(ptr,&w,&h); - lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); - - ptr = str(LANG_PAUSE); - lcd_getstringsize(ptr,&w,&h); - lcd_putsxy((LCD_WIDTH-(w/2))/2, LCD_HEIGHT/2 - h/2, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_Pause], - (LCD_WIDTH-(w/2))/2-10, LCD_HEIGHT/2 - h/2, 7, 8, true); - - lcd_update(); - } - - /* use lastbutton, so the main loop can decide whether to - exit to browser or not */ - switch (button_get(true)) { - case BUTTON_UP: - case BUTTON_ON | BUTTON_UP: - case BUTTON_ON | BUTTON_UP | BUTTON_REPEAT: - used = true; - pitch++; - if ( pitch > 2000 ) - pitch = 2000; - mpeg_set_pitch(pitch); - break; - - case BUTTON_DOWN: - case BUTTON_ON | BUTTON_DOWN: - case BUTTON_ON | BUTTON_DOWN | BUTTON_REPEAT: - used = true; - pitch--; - if ( pitch < 500 ) - pitch = 500; - mpeg_set_pitch(pitch); - break; - - case BUTTON_ON | BUTTON_PLAY: - mpeg_pause(); - used = true; - break; - - case BUTTON_PLAY | BUTTON_REL: - mpeg_resume(); - used = true; - break; - - case BUTTON_ON | BUTTON_PLAY | BUTTON_REL: - mpeg_resume(); - exit = true; - break; - - case BUTTON_ON | BUTTON_RIGHT: - if ( pitch < 2000 ) { - pitch += 20; - mpeg_set_pitch(pitch); - } - break; - - case BUTTON_RIGHT | BUTTON_REL: - if ( pitch > 500 ) { - pitch -= 20; - mpeg_set_pitch(pitch); - } - break; - - case BUTTON_ON | BUTTON_LEFT: - if ( pitch > 500 ) { - pitch -= 20; - mpeg_set_pitch(pitch); - } - break; - - case BUTTON_LEFT | BUTTON_REL: - if ( pitch < 2000 ) { - pitch += 20; - mpeg_set_pitch(pitch); - } - break; - -#ifdef SIMULATOR - case BUTTON_ON: -#else - case BUTTON_ON | BUTTON_REL: - case BUTTON_ON | BUTTON_UP | BUTTON_REL: - case BUTTON_ON | BUTTON_DOWN | BUTTON_REL: -#endif - exit = true; - break; - - case BUTTON_ON | BUTTON_REPEAT: - used = true; - break; - - case SYS_USB_CONNECTED: - usb_screen(); - return 2; - } - } - - lcd_setfont(FONT_UI); - - if ( used ) - return 1; - else - return 0; -} - -bool f2_screen(void) -{ - bool exit = false; - bool used = false; - int w, h; - char buf[32]; - int oldrepeat = global_settings.repeat_mode; - - lcd_setfont(FONT_SYSFIXED); - lcd_getstringsize("A",&w,&h); - - while (!exit) { - char* ptr=NULL; - - lcd_clear_display(); - - /* Shuffle mode */ - lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_SHUFFLE)); - lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F2_MODE)); - lcd_putsxy(0, LCD_HEIGHT/2, - global_settings.playlist_shuffle ? - str(LANG_ON) : str(LANG_OFF)); - lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], - LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); - - /* Directory Filter */ - switch ( global_settings.dirfilter ) { - case SHOW_ALL: - ptr = str(LANG_FILTER_ALL); - break; - - case SHOW_SUPPORTED: - ptr = str(LANG_FILTER_SUPPORTED); - break; - - case SHOW_MUSIC: - ptr = str(LANG_FILTER_MUSIC); - break; - - case SHOW_PLAYLIST: - ptr = str(LANG_FILTER_PLAYLIST); - break; - } - - snprintf(buf, sizeof buf, "%s:", str(LANG_FILTER)); - lcd_getstringsize(buf,&w,&h); - lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, buf); - lcd_getstringsize(ptr,&w,&h); - lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); - - /* Repeat Mode */ - switch ( global_settings.repeat_mode ) { - case REPEAT_OFF: - ptr = str(LANG_OFF); - break; - - case REPEAT_ALL: - ptr = str(LANG_REPEAT_ALL); - break; - - case REPEAT_ONE: - ptr = str(LANG_REPEAT_ONE); - break; - } - - lcd_getstringsize(str(LANG_REPEAT),&w,&h); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2, str(LANG_REPEAT)); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F2_MODE)); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, ptr); - lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], - LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); - - lcd_update(); - - switch (button_get(true)) { - case BUTTON_LEFT: - case BUTTON_F2 | BUTTON_LEFT: - global_settings.playlist_shuffle = - !global_settings.playlist_shuffle; - - if(mpeg_status() & MPEG_STATUS_PLAY) - { - if (global_settings.playlist_shuffle) - playlist_randomise(current_tick, true); - else - playlist_sort(true); - } - used = true; - break; - - case BUTTON_DOWN: - case BUTTON_F2 | BUTTON_DOWN: - global_settings.dirfilter++; - if ( global_settings.dirfilter >= NUM_FILTER_MODES ) - global_settings.dirfilter = 0; - used = true; - break; - - case BUTTON_RIGHT: - case BUTTON_F2 | BUTTON_RIGHT: - global_settings.repeat_mode++; - if ( global_settings.repeat_mode >= NUM_REPEAT_MODES ) - global_settings.repeat_mode = 0; - used = true; - break; - - case BUTTON_F2 | BUTTON_REL: - if ( used ) - exit = true; - used = true; - break; - - case BUTTON_F2 | BUTTON_REPEAT: - used = true; - break; - - case BUTTON_OFF | BUTTON_REPEAT: - return false; - - case SYS_USB_CONNECTED: - usb_screen(); - return true; - } - } - - settings_save(); - lcd_setfont(FONT_UI); - if ( oldrepeat != global_settings.repeat_mode ) - mpeg_flush_and_reload_tracks(); - - return false; -} - -bool f3_screen(void) -{ - bool exit = false; - bool used = false; - - lcd_setfont(FONT_SYSFIXED); - - while (!exit) { - int w,h; - char* ptr; - - ptr = str(LANG_F3_STATUS); - lcd_getstringsize(ptr,&w,&h); - lcd_clear_display(); - - lcd_putsxy(0, LCD_HEIGHT/2 - h*2, str(LANG_F3_SCROLL)); - lcd_putsxy(0, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); - lcd_putsxy(0, LCD_HEIGHT/2, - global_settings.scrollbar ? str(LANG_ON) : str(LANG_OFF)); - lcd_bitmap(bitmap_icons_7x8[Icon_FastBackward], - LCD_WIDTH/2 - 16, LCD_HEIGHT/2 - 4, 7, 8, true); - - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h*2, ptr); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2 - h, str(LANG_F3_BAR)); - lcd_putsxy(LCD_WIDTH - w, LCD_HEIGHT/2, - global_settings.statusbar ? str(LANG_ON) : str(LANG_OFF)); - lcd_bitmap(bitmap_icons_7x8[Icon_FastForward], - LCD_WIDTH/2 + 8, LCD_HEIGHT/2 - 4, 7, 8, true); - - /* Invert */ - lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h*2, str(LANG_INVERT)); - lcd_putsxy((LCD_WIDTH-w)/2, LCD_HEIGHT - h, - global_settings.invert ? - str(LANG_INVERT_LCD_INVERSE) : str(LANG_INVERT_LCD_NORMAL)); - lcd_bitmap(bitmap_icons_7x8[Icon_DownArrow], - LCD_WIDTH/2 - 3, LCD_HEIGHT - h*3, 7, 8, true); - - lcd_update(); - - switch (button_get(true)) { - case BUTTON_LEFT: - case BUTTON_F3 | BUTTON_LEFT: - global_settings.scrollbar = !global_settings.scrollbar; - used = true; - break; - - case BUTTON_RIGHT: - case BUTTON_F3 | BUTTON_RIGHT: - global_settings.statusbar = !global_settings.statusbar; - used = true; - break; - - case BUTTON_DOWN: - case BUTTON_F3 | BUTTON_DOWN: - global_settings.invert = !global_settings.invert; - lcd_set_invert_display(global_settings.invert); - used = true; - break; - - case BUTTON_F3 | BUTTON_REL: - if ( used ) - exit = true; - used = true; - break; - - case BUTTON_F3 | BUTTON_REPEAT: - used = true; - break; - - case BUTTON_OFF | BUTTON_REPEAT: - return false; - - case SYS_USB_CONNECTED: - usb_screen(); - return true; - } - } - - settings_save(); - if (global_settings.statusbar) - lcd_setmargins(0, STATUSBAR_HEIGHT); - else - lcd_setmargins(0, 0); - lcd_setfont(FONT_UI); - - return false; -} -#endif - -#ifdef HAVE_LCD_BITMAP -#define SPACE 3 /* pixels between words */ -#define MAXLETTERS 128 /* 16*8 */ -#define MAXLINES 10 -#else #define SPACE 1 /* one letter space */ #undef LCD_WIDTH -#define LCD_WIDTH 11 +#define LCD_WIDTH 20 #undef LCD_HEIGHT -#define LCD_HEIGHT 2 -#define MAXLETTERS 22 /* 11 * 2 */ -#define MAXLINES 2 -#endif +#define LCD_HEIGHT 4 +#define MAXLETTERS 80 /* 11 * 2 */ +#define MAXLINES 4 void splash(int ticks, /* how long */ int keymask, /* what keymask aborts the waiting (if any) */ @@ -671,15 +31,12 @@ char *store=NULL; int x=0; int y=0; - int w, h; + int w, h=0; unsigned char splash_buf[MAXLETTERS]; va_list ap; unsigned char widths[MAXLINES]; int line=0; bool first=true; -#ifdef HAVE_LCD_BITMAP - int maxw=0; -#endif va_start( ap, fmt ); vsnprintf( splash_buf, sizeof(splash_buf), fmt, ap ); @@ -689,12 +46,8 @@ /* first a pass to measure sizes */ next = strtok_r(splash_buf, " ", &store); while (next) { -#ifdef HAVE_LCD_BITMAP - lcd_getstringsize(next, &w, &h); -#else w = strlen(next); h = 1; /* store height in characters */ -#endif if(!first) { if(x+w> LCD_WIDTH) { /* Too wide, wrap */ @@ -715,21 +68,9 @@ x += w+SPACE; widths[line]=x-SPACE; /* don't count the trailing space */ -#ifdef HAVE_LCD_BITMAP - /* store the widest line */ - if(widths[line]>maxw) - maxw = widths[line]; -#endif next = strtok_r(NULL, " ", &store); } -#ifdef HAVE_LCD_BITMAP - /* Start displaying the message at position y. The reason for the - added h here is that it isn't added until the end of lines in the - loop above and we always break the loop in the middle of a line. */ y = (LCD_HEIGHT - (y+h) )/2; -#else - y = 0; /* vertical center on 2 lines would be silly */ -#endif first=true; /* Now recreate the string again since the strtok_r() above has ruined @@ -745,34 +86,12 @@ x = 0; } -#ifdef HAVE_LCD_BITMAP - /* If we center the display and it wouldn't cover the full screen, - then just clear the box we need and put a nice little frame and - put the text in there! */ - if(center && (y > 2)) { - if(maxw < (LCD_WIDTH -4)) { - int xx = (LCD_WIDTH-maxw)/2 - 2; - lcd_clearrect(xx, y-2, maxw+4, LCD_HEIGHT-y*2+4); - lcd_drawrect(xx, y-2, maxw+4, LCD_HEIGHT-y*2+4); - } - else { - lcd_clearrect(0, y-2, LCD_WIDTH, LCD_HEIGHT-y*2+4); - lcd_drawline(0, y-2, LCD_WIDTH-1, y-2); - lcd_drawline(0, LCD_HEIGHT-y+2, LCD_WIDTH-1, LCD_HEIGHT-y+2); - } - } - else -#endif lcd_clear_display(); line=0; next = strtok_r(splash_buf, " ", &store); while (next) { -#ifdef HAVE_LCD_BITMAP - lcd_getstringsize(next, &w, &h); -#else w = strlen(next); h = 1; -#endif if(!first) { if(x+w> LCD_WIDTH) { /* too wide */ @@ -790,11 +109,7 @@ } else first=false; -#ifdef HAVE_LCD_BITMAP - lcd_putsxy(x, y, next); -#else lcd_puts(x, y, next); -#endif x += w+SPACE; /* pixels space! */ next = strtok_r(NULL, " ", &store); } @@ -816,8 +131,21 @@ } } -void charging_splash(void) +void display_field_value( int y, const char* field, const char* value ) { - splash(2*HZ, 0, true, str(LANG_BATTERY_CHARGE)); - while (button_get(false)); + char buffer[24]; + int flen = strlen(field) + 1; + int vlen = strlen(value); + + snprintf( buffer, sizeof(buffer), "%s:", field ); + lcd_puts_fmt(0, y, buffer, FMT_LEFT|FMT_RPADDED); + + /* If value does not fit scroll it */ + if( vlen > (20 - flen) ) + lcd_puts_scroll(flen, y, value); + else + { + /* Else right align the value */ + lcd_puts_fmt(0,y,value, FMT_RIGHT ); + } } diff -rubBP /home/dast/src/rockbox/apps/screens.h ./apps/screens.h --- /home/dast/src/rockbox/apps/screens.h Thu Dec 4 16:35:38 2003 +++ ./apps/screens.h Mon Nov 24 03:55:53 2003 @@ -1,35 +1,6 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: screens.h,v 1.6 2003/12/04 00:08:25 zagor Exp $ - * - * Copyright (C) 2002 Björn Stenberg - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ #ifndef _SCREENS_H_ #define _SCREENS_H_ -void usb_display_info(void); -void usb_screen(void); -int charging_screen(void); -void charging_splash(void); - -#ifdef HAVE_RECORDER_KEYPAD -int on_screen(void); -bool f2_screen(void); -bool f3_screen(void); -#endif - void splash(int ticks, /* how long */ int keymask,/* what keymask aborts the waiting (if any) */ bool center, /* FALSE means left-justified, TRUE means @@ -37,5 +8,6 @@ char *fmt, /* what to say *printf style */ ...); +void display_field_value( int y, const char* field, const char* value ); #endif diff -rubBP /home/dast/src/rockbox/apps/settings.c ./apps/settings.c --- /home/dast/src/rockbox/apps/settings.c Tue Dec 9 13:28:39 2003 +++ ./apps/settings.c Fri Nov 7 07:55:00 2003 @@ -1,23 +1,3 @@ -/*************************************************************************** - * __________ __ ___. - * Open \______ \ ____ ____ | | _\_ |__ _______ ___ - * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / - * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < - * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ - * \/ \/ \/ \/ \/ - * $Id: settings.c,v 1.177 2003/12/09 08:18:03 hardeeps Exp $ - * - * Copyright (C) 2002 by wavey@wavey.org - * RTC config saving code (C) 2002 by hessu@hes.iki.fi - * - * All files in this archive are subject to the GNU General Public License. - * See the file COPYING in the source tree root for full license agreement. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ****************************************************************************/ - #include #include "config.h" #include "kernel.h" @@ -27,16 +7,12 @@ #include "panic.h" #include "debug.h" #include "button.h" -#include "usb.h" -#include "backlight.h" +#include "remote.h" #include "lcd.h" #include "mpeg.h" #include "string.h" #include "ata.h" #include "fat.h" -#include "power.h" -#include "backlight.h" -#include "powermgmt.h" #include "status.h" #include "atoi.h" #include "screens.h" @@ -45,119 +21,23 @@ #include "errno.h" #include "system.h" #include "misc.h" -#ifdef HAVE_LCD_BITMAP -#include "icons.h" -#include "font.h" -#include "peakmeter.h" -#include "hwcompat.h" -#endif #include "lang.h" #include "language.h" #include "wps-display.h" -#include "powermgmt.h" #include "sprintf.h" #include "keyboard.h" #include "version.h" -#ifdef HAVE_MAS3507D -void dac_line_in(bool enable); -#endif + struct user_settings global_settings; -char rockboxdir[] = ROCKBOX_DIR; /* config/font/data file directory */ +char openneodir[] = OPENNEO_DIR; /* config/font/data file directory */ -#define CONFIG_BLOCK_VERSION 8 +#define CONFIG_BLOCK_VERSION 1 #define CONFIG_BLOCK_SIZE 512 -#define RTC_BLOCK_SIZE 44 -#ifdef HAVE_LCD_BITMAP -#define MAX_LINES 10 -#else -#define MAX_LINES 2 -#endif - -/******************************************** - -Config block as saved on the battery-packed RTC user RAM memory block -of 44 bytes, starting at offset 0x14 of the RTC memory space. - -offset abs -0x00 0x14 "Roc" header signature: 0x52 0x6f 0x63 -0x03 0x17 -0x04 0x18 -0x05 0x19 -0x06 0x1a -0x07 0x1b -0x08 0x1c -0x09 0x1d -0x0a 0x1e -0x0b 0x1f -0x0c 0x20 -0x0d 0x21 -0x0e 0x22 -0x0f 0x23 -0x10 0x24 -0x11 0x25 -0x12 0x26 <(short) Resume playlist index, or -1 if no playlist resume> -0x14 0x28 <(short) Resume playlist first index> -0x16 0x2a <(int) Byte offset into resume file> -0x1a 0x2e