ready for 3.1

git-svn-id: svn://svn.rockbox.org/rockbox/branches/v3_1@19569 a1c6a512-1295-4272-9138-f99709370657

apps/codecs/demac/Makefile

@@ -4,7 +4,7 @@ FILTERS = libdemac/filter_16_11.o libdemac/filter_64_11.o libdemac/filter_256_13
 LIBOBJS = libdemac/parser.o libdemac/decoder.o libdemac/entropy.o libdemac/predictor.o libdemac/crc.o $(FILTERS)
 OBJS = demac.o wavwrite.o $(LIBOBJS)
 
-CFLAGS = -Wall -O3 -Ilibdemac
+CFLAGS = -Wall -g -O3 -Ilibdemac
 
 ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
 EXT = .exe

apps/codecs/demac/demac.c

@@ -2,7 +2,7 @@
 
 demac - A Monkey's Audio decoder
 
-$Id:$
+$Id$
 
 Copyright (C) Dave Chapman 2007
 
@@ -180,17 +180,27 @@ int ape_decode(char* infile, char* outfile)
 
             /* Convert the output samples to WAV format and write to output file */
             p = wavbuffer;
-            if (ape_ctx.bps == 16) {
+            if (ape_ctx.bps == 8) {
+                for (i = 0 ; i < blockstodecode ; i++)
+                {
+                    /* 8 bit WAV uses unsigned samples */
+                    *(p++) = (decoded0[i] + 0x80) & 0xff;
+
+                    if (ape_ctx.channels == 2) {
+                        *(p++) = (decoded1[i] + 0x80) & 0xff;
+                    }
+                }
+            } else if (ape_ctx.bps == 16) {
                 for (i = 0 ; i < blockstodecode ; i++)
                 {
                     sample16 = decoded0[i];
                     *(p++) = sample16 & 0xff;
-                    *(p++) = (sample16&0xff00) >> 8;
+                    *(p++) = (sample16 >> 8) & 0xff;
 
                     if (ape_ctx.channels == 2) {
                         sample16 = decoded1[i];
                         *(p++) = sample16 & 0xff;
-                        *(p++) = (sample16&0xff00) >> 8;
+                        *(p++) = (sample16 >> 8) & 0xff;
                     }
                 }
             } else if (ape_ctx.bps == 24) {
@@ -198,14 +208,14 @@ int ape_decode(char* infile, char* outfile)
                 {
                     sample32 = decoded0[i];
                     *(p++) = sample32 & 0xff;
-                    *(p++) = (sample32&0xff00) >> 8;
-                    *(p++) = (sample32&0xff0000) >> 16;
+                    *(p++) = (sample32 >> 8) & 0xff;
+                    *(p++) = (sample32 >> 16) & 0xff;
 
                     if (ape_ctx.channels == 2) {
                         sample32 = decoded1[i];
                         *(p++) = sample32 & 0xff;
-                        *(p++) = (sample32&0xff00) >> 8;
-                        *(p++) = (sample32&0xff0000) >> 16;
+                        *(p++) = (sample32 >> 8) & 0xff;
+                        *(p++) = (sample32 >> 16) & 0xff;
                     }
                 }
             }

apps/codecs/demac/libdemac/decoder.c

@@ -89,16 +89,19 @@ int ICODE_ATTR_DEMAC decode_chunk(struct ape_ctx_t* ape_ctx,
 #else
     #define SCALE(x) (x)
 #endif
+         
+    if ((ape_ctx->channels==1) || ((ape_ctx->frameflags
+        & (APE_FRAMECODE_PSEUDO_STEREO|APE_FRAMECODE_STEREO_SILENCE))
+        == APE_FRAMECODE_PSEUDO_STEREO)) {
 
-    if ((ape_ctx->channels==1) || (ape_ctx->frameflags & APE_FRAMECODE_PSEUDO_STEREO)) {
-        if (ape_ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
-            entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, decoded1, count);
+        entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed,
+                       decoded0, NULL, count);
+
+        if (ape_ctx->frameflags & APE_FRAMECODE_MONO_SILENCE) {
             /* We are pure silence, so we're done. */
             return 0;
-        } else {
-            entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, NULL, count);
         }
-    
+
         switch (ape_ctx->compressiontype)
         {
             case 2000:
@@ -124,33 +127,32 @@ int ICODE_ATTR_DEMAC decode_chunk(struct ape_ctx_t* ape_ctx,
         predictor_decode_mono(&ape_ctx->predictor,decoded0,count);
 
         if (ape_ctx->channels==2) {
-            /* Pseudo-stereo - just copy left channel to right channel */
+            /* Pseudo-stereo - copy left channel to right channel */
             while (count--)
             {
                 left = *decoded0;
                 *(decoded1++) = *(decoded0++) = SCALE(left);
             }
-        } else {
-            /* Mono - do nothing unless it's 8-bit audio */
-            if (ape_ctx->bps == 8) {
-                /* TODO: Handle 8-bit streams */
-            } else {
-                /* Scale to output depth */
-                while (count--)
-                {
-                    left = *decoded0;
-                    *(decoded0++) = SCALE(left);
-                }    
-            }
-
         }
+#ifdef ROCKBOX
+         else {
+            /* Scale to output depth */
+            while (count--)
+            {
+                left = *decoded0;
+                *(decoded0++) = SCALE(left);
+            }
+        }
+#endif
     } else { /* Stereo */
-        if (ape_ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
+        entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed,
+                       decoded0, decoded1, count);
+
+        if ((ape_ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE)
+            == APE_FRAMECODE_STEREO_SILENCE) {
             /* We are pure silence, so we're done. */
             return 0;
         }
-    
-        entropy_decode(ape_ctx, inbuffer, firstbyte, bytesconsumed, decoded0, decoded1, count);
 
         /* Apply filters - compression type 1000 doesn't have any */
         switch (ape_ctx->compressiontype)
@@ -177,18 +179,14 @@ int ICODE_ATTR_DEMAC decode_chunk(struct ape_ctx_t* ape_ctx,
         /* Now apply the predictor decoding */
         predictor_decode_stereo(&ape_ctx->predictor,decoded0,decoded1,count);
 
-        if (ape_ctx->bps == 8) {
-            /* TODO: Handle 8-bit streams */
-        } else {
-            /* Decorrelate and scale to output depth */
-            while (count--)
-            {
-                left = *decoded1 - (*decoded0 / 2);
-                right = left + *decoded0;
+        /* Decorrelate and scale to output depth */
+        while (count--)
+        {
+            left = *decoded1 - (*decoded0 / 2);
+            right = left + *decoded0;
 
-                *(decoded0++) = SCALE(left);
-                *(decoded1++) = SCALE(right);
-            }
+            *(decoded0++) = SCALE(left);
+            *(decoded1++) = SCALE(right);
         }
     }
     return 0;

apps/codecs/demac/libdemac/entropy.c

@@ -430,10 +430,13 @@ void ICODE_ATTR_DEMAC entropy_decode(struct ape_ctx_t* ape_ctx,
 
     ape_ctx->blocksdecoded += blockstodecode;
 
-    if (ape_ctx->frameflags & APE_FRAMECODE_STEREO_SILENCE) {
+    if ((ape_ctx->frameflags & APE_FRAMECODE_LEFT_SILENCE)
+        && ((ape_ctx->frameflags & APE_FRAMECODE_RIGHT_SILENCE)
+            || (decoded1 == NULL))) {
         /* We are pure silence, just memset the output buffer. */
         memset(decoded0, 0, blockstodecode * sizeof(int32_t));
-        memset(decoded1, 0, blockstodecode * sizeof(int32_t));
+        if (decoded1 != NULL)
+            memset(decoded1, 0, blockstodecode * sizeof(int32_t));
     } else {
         if (ape_ctx->fileversion > 3970) {
             while (LIKELY(blockstodecode--)) {

apps/codecs/demac/libdemac/filter.c

@@ -138,9 +138,9 @@ static void ICODE_ATTR_DEMAC do_apply_filter_3980(struct filter_t* f,
         /* Update the adaption coefficients */
         absres = (res < 0 ? -res : res);
 
-        if (UNLIKELY(absres > (f->avg * 3)))
+        if (UNLIKELY(absres > 3 * f->avg))
             *f->adaptcoeffs = ((res >> 25) & 64) - 32;
-        else if (absres > (f->avg * 4) / 3)
+        else if (3 * absres > 4 * f->avg)
             *f->adaptcoeffs = ((res >> 26) & 32) - 16;
         else if (LIKELY(absres > 0))
             *f->adaptcoeffs = ((res >> 27) & 16) - 8;

apps/codecs/demac/libdemac/parser.h

@@ -50,7 +50,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA
 */
 
 #define APE_FRAMECODE_MONO_SILENCE    1
-#define APE_FRAMECODE_STEREO_SILENCE  3
+#define APE_FRAMECODE_LEFT_SILENCE    1 /* same as mono */
+#define APE_FRAMECODE_RIGHT_SILENCE   2
+#define APE_FRAMECODE_STEREO_SILENCE  3 /* combined */
 #define APE_FRAMECODE_PSEUDO_STEREO   4
 
 #define PREDICTOR_ORDER 8

apps/codecs/libwma/wmadec.h

@@ -148,8 +148,8 @@ WMADecodeContext;
 
 int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx);
 int wma_decode_superframe_init(WMADecodeContext* s,
-                               uint8_t *buf, int buf_size);
+                               const uint8_t *buf, int buf_size);
 int wma_decode_superframe_frame(WMADecodeContext* s,
                                 int32_t *samples,
-                                uint8_t *buf, int buf_size);
+                                const uint8_t *buf, int buf_size);
 #endif

apps/codecs/libwma/wmadeci.c

@@ -328,6 +328,11 @@ int wma_decode_init(WMADecodeContext* s, asf_waveformatex_t *wfx)
     coldfire_set_macsr(EMAC_FRACTIONAL | EMAC_SATURATE);
     #endif
 
+    /*clear stereo setting to avoid glitches when switching stereo->mono*/
+    s->channel_coded[0]=0;
+    s->channel_coded[1]=0;
+    s->ms_stereo=0;
+
     s->sample_rate = wfx->rate;
     s->nb_channels = wfx->channels;
     s->bit_rate = wfx->bitrate;
@@ -982,12 +987,12 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
 
     if (s->nb_channels == 2)
     {
-        s->ms_stereo = get_bits(&s->gb, 1);
+        s->ms_stereo = get_bits1(&s->gb);
     }
     v = 0;
     for (ch = 0; ch < s->nb_channels; ++ch)
     {
-        a = get_bits(&s->gb, 1);
+        a = get_bits1(&s->gb);
         s->channel_coded[ch] = a;
         v |= a;
     }
@@ -1043,7 +1048,7 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
                 n = s->exponent_high_sizes[bsize];
                 for(i=0;i<n;++i)
                 {
-                    a = get_bits(&s->gb, 1);
+                    a = get_bits1(&s->gb);
                     s->high_band_coded[ch][i] = a;
                     /* if noise coding, the coefficients are not transmitted */
                     if (a)
@@ -1085,7 +1090,7 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
     }
 
     /* exponents can be reused in short blocks. */
-    if ((s->block_len_bits == s->frame_len_bits) || get_bits(&s->gb, 1))
+    if ((s->block_len_bits == s->frame_len_bits) || get_bits1(&s->gb))
     {
         for(ch = 0; ch < s->nb_channels; ++ch)
         {
@@ -1155,7 +1160,7 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
                     run = run_table[code];
                     level = level_table[code];
                 }
-                sign = get_bits(&s->gb, 1);
+                sign = get_bits1(&s->gb);
                 if (!sign)
                     level = -level;
                 ptr += run;
@@ -1190,13 +1195,13 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
     }
 
 
-    /* finally compute the MDCT coefficients */
+   /* finally compute the MDCT coefficients */
     for(ch = 0; ch < s->nb_channels; ++ch)
     {
         if (s->channel_coded[ch])
         {
             int16_t *coefs1;
-            fixed32 *exponents, *exp_ptr;
+            fixed32 *exponents;
             fixed32 *coefs, atemp;
             fixed64 mult;
             fixed64 mult1;
@@ -1210,13 +1215,14 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
             exponents = s->exponents[ch];
             esize = s->exponents_bsize[ch];
             coefs = (*(s->coefs))[ch];
-
             n=0;
 
           /*
-          *  The calculation of coefs has a shift right by 2 built in.  This prepares samples
-          *  for the Tremor IMDCT which uses a slightly different fixed format then the ffmpeg one.
-          *  If the old ffmpeg imdct is used, each shift storing into coefs should be reduced by 1.
+          *  The calculation of coefs has a shift right by 2 built in.  This
+          *  prepares samples for the Tremor IMDCT which uses a slightly
+          *  different fixed format then the ffmpeg one. If the old ffmpeg
+          *  imdct is used, each shift storing into coefs should be reduced
+          *  by 1.
           *  See SVN logs for details.
           */
 
@@ -1226,22 +1232,21 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
                 /*TODO:  mult should be converted to 32 bit to speed up noise coding*/
 
                 mult = fixdiv64(pow_table[total_gain+20],Fixed32To64(s->max_exponent[ch]));
-                mult = mult* mdct_norm;        //what the hell?  This is actually fixed64*2^16!
+                mult = mult* mdct_norm;
                 mult1 = mult;
 
                 /* very low freqs : noise */
                 for(i = 0;i < s->coefs_start; ++i)
                 {
-                    *coefs++ = fixmul32( (fixmul32(s->noise_table[s->noise_index],(*exponents++))>>4),Fixed32From64(mult1)) >>2;
+                    *coefs++ = fixmul32( (fixmul32(s->noise_table[s->noise_index],
+                            exponents[i<<bsize>>esize])>>4),Fixed32From64(mult1)) >>2;
                     s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
                 }
 
                 n1 = s->exponent_high_sizes[bsize];
 
                 /* compute power of high bands */
-                exp_ptr = exponents +
-                          s->high_band_start[bsize] -
-                          s->coefs_start;
+                exponents = s->exponents[ch] +(s->high_band_start[bsize]<<bsize);
                 last_high_band = 0; /* avoid warning */
                 for (j=0;j<n1;++j)
                 {
@@ -1253,17 +1258,18 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
                         e2 = 0;
                         for(i = 0;i < n; ++i)
                         {
-                            /*v is noramlized later on so its fixed format is irrelevant*/
-                            v = exp_ptr[i]>>4;
+                            /*v is normalized later on so its fixed format is irrelevant*/
+                            v = exponents[i<<bsize>>esize]>>4;
                             e2 += fixmul32(v, v)>>3;
                         }
                          exp_power[j] = e2/n; /*n is an int...*/
                         last_high_band = j;
                     }
-                    exp_ptr += n;
+                    exponents += n<<bsize;
                 }
 
                 /* main freqs and high freqs */
+                exponents = s->exponents[ch] + (s->coefs_start<<bsize);
                 for(j=-1;j<n1;++j)
                 {
                     if (j < 0)
@@ -1280,44 +1286,44 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
                     {
                         /* use noise with specified power */
                         fixed32 tmp = fixdiv32(exp_power[j],exp_power[last_high_band]);
-                        mult1 = (fixed64)fixsqrt32(tmp);
-                        /* XXX: use a table */
+
                         /*mult1 is 48.16, pow_table is 48.16*/
-                        mult1 = mult1 * pow_table[s->high_band_values[ch][j]+20] >> PRECISION;
+                        mult1 = fixmul32(fixsqrt32(tmp),
+                                pow_table[s->high_band_values[ch][j]+20]) >> 16;
 
                         /*this step has a fairly high degree of error for some reason*/
-                           mult1 = fixdiv64(mult1,fixmul32(s->max_exponent[ch],s->noise_mult));
-
-                         mult1 = mult1*mdct_norm>>PRECISION;
+                        mult1 = fixdiv64(mult1,fixmul32(s->max_exponent[ch],s->noise_mult));
+                        mult1 = mult1*mdct_norm>>PRECISION;
                         for(i = 0;i < n; ++i)
                         {
                             noise = s->noise_table[s->noise_index];
                             s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
-                            *coefs++ = fixmul32((fixmul32(*exponents,noise)>>4),Fixed32From64(mult1)) >>2;
-                            ++exponents;
+                            *coefs++ = fixmul32((fixmul32(exponents[i<<bsize>>esize],noise)>>4),
+                                    Fixed32From64(mult1)) >>2;
+
                         }
+                        exponents += n<<bsize;
                     }
                     else
                     {
                         /* coded values + small noise */
                         for(i = 0;i < n; ++i)
                         {
-                            // PJJ: check code path
                             noise = s->noise_table[s->noise_index];
                             s->noise_index = (s->noise_index + 1) & (NOISE_TAB_SIZE - 1);
 
                            /*don't forget to renormalize the noise*/
                            temp1 = (((int32_t)*coefs1++)<<16) + (noise>>4);
-                           temp2 = fixmul32(*exponents, mult>>18);
+                           temp2 = fixmul32(exponents[i<<bsize>>esize], mult>>18);
                            *coefs++ = fixmul32(temp1, temp2);
-                           ++exponents;
                         }
+                        exponents += n<<bsize;
                     }
                 }
 
                 /* very high freqs : noise */
                 n = s->block_len - s->coefs_end[bsize];
-                mult2 = fixmul32(mult>>16,exponents[-1]) ;  /*the work around for 32.32 vars are getting stupid*/
+                mult2 = fixmul32(mult>>16,exponents[((-1<<bsize))>>esize]) ;
                 for (i = 0; i < n; ++i)
                 {
                     /*renormalize the noise product and then reduce to 14.18 precison*/
@@ -1330,7 +1336,8 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
             {
                 /*Noise coding not used, simply convert from exp to fixed representation*/
 
-                fixed32 mult3 = (fixed32)(fixdiv64(pow_table[total_gain+20],Fixed32To64(s->max_exponent[ch])));
+                fixed32 mult3 = (fixed32)(fixdiv64(pow_table[total_gain+20],
+                        Fixed32To64(s->max_exponent[ch])));
                 mult3 = fixmul32(mult3, mdct_norm);
 
                 /*zero the first 3 coefficients for WMA V1, does nothing otherwise*/
@@ -1339,11 +1346,13 @@ static int wma_decode_block(WMADecodeContext *s, int32_t *scratch_buffer)
 
                 n = nb_coefs[ch];
 
-                /* XXX: optimize more, unrolling this loop in asm might be a good idea */
+                /* XXX: optimize more, unrolling this loop in asm
+                                might be a good idea */
 
                 for(i = 0;i < n; ++i)
                 {
-                    atemp = (coefs1[i] * mult3)>>2;  /*ffmpeg imdct needs 15.17, while tremor 14.18*/
+                    /*ffmpeg imdct needs 15.17, while tremor 14.18*/
+                    atemp = (coefs1[i] * mult3)>>2;
                     *coefs++=fixmul32(atemp,exponents[i<<bsize>>esize]);
                 }
                 n = s->block_len - s->coefs_end[bsize];
@@ -1434,7 +1443,7 @@ static int wma_decode_frame(WMADecodeContext *s, int32_t *samples)
     /* read each block */
     s->block_num = 0;
     s->block_pos = 0;
-    
+
 
     for(;;)
     {
@@ -1475,7 +1484,7 @@ static int wma_decode_frame(WMADecodeContext *s, int32_t *samples)
 /* Initialise the superframe decoding */
 
 int wma_decode_superframe_init(WMADecodeContext* s,
-                                 uint8_t *buf,  /*input*/
+                                 const uint8_t *buf,  /*input*/
                                  int buf_size)
 {
     if (buf_size==0)
@@ -1483,7 +1492,7 @@ int wma_decode_superframe_init(WMADecodeContext* s,
         s->last_superframe_len = 0;
         return 0;
     }
-    
+
     s->current_frame = 0;
 
     init_get_bits(&s->gb, buf, buf_size*8);
@@ -1491,7 +1500,7 @@ int wma_decode_superframe_init(WMADecodeContext* s,
     if (s->use_bit_reservoir)
     {
         /* read super frame header */
-        get_bits(&s->gb, 4); /* super frame index */
+        skip_bits(&s->gb, 4); /* super frame index */
         s->nb_frames = get_bits(&s->gb, 4);
 
         if (s->last_superframe_len == 0)
@@ -1514,7 +1523,7 @@ int wma_decode_superframe_init(WMADecodeContext* s,
 
 int wma_decode_superframe_frame(WMADecodeContext* s,
                                 int32_t* samples, /*output*/
-                                uint8_t *buf,  /*input*/
+                                const uint8_t *buf,  /*input*/
                                 int buf_size)
 {
     int pos, len;
@@ -1533,7 +1542,7 @@ int wma_decode_superframe_frame(WMADecodeContext* s,
             }
             q = s->last_superframe + s->last_superframe_len;
             len = s->bit_offset;
-            while (len > 0)
+            while (len > 7)
             {
                 *q++ = (get_bits)(&s->gb, 8);
                 len -= 8;
@@ -1588,7 +1597,7 @@ int wma_decode_superframe_frame(WMADecodeContext* s,
         len = buf_size - pos;
         if (len > MAX_CODED_SUPERFRAME_SIZE || len < 0)
         {
-            DEBUGF("superframe size too large error after decodeing\n");
+            DEBUGF("superframe size too large error after decoding\n");
             goto fail;
         }
         s->last_superframe_len = len;

apps/debug_menu.c

@@ -2427,15 +2427,6 @@ static bool logf_usb_serial(void)
 }
 #endif
 
-#if defined(HAVE_USBSTACK) && defined(USB_STORAGE)
-static bool usb_reconnect(void)
-{
-    splash(HZ, "Reconnect mass storage");
-    usb_storage_reconnect();
-    return false;
-}
-#endif
-
 #if CONFIG_USBOTG == USBOTG_ISP1583
 extern int dbg_usb_num_items(void);
 extern char* dbg_usb_item(int selected_item, void *data, char *buffer, size_t buffer_len);
@@ -2572,9 +2563,6 @@ static const struct the_menu_item menuitems[] = {
 #if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL)
         {"logf over usb",logf_usb_serial },
 #endif
-#if defined(HAVE_USBSTACK) && defined(USB_STORAGE)
-        {"reconnect usb storage",usb_reconnect},
-#endif
 #ifdef CPU_BOOST_LOGGING
         {"cpu_boost log",cpu_boost_log},
 #endif

apps/lang/chinese-simp.lang

@@ -136,15 +136,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user: 
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "重启播放..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -8068,7 +8068,7 @@
   user: 
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
@@ -8085,7 +8085,7 @@
   user: 
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
@@ -12042,3 +12042,136 @@
     *: "搜索结果"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "设为快屏左键"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "设为快屏左键"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "恢复默认值"
+  </dest>
+  <voice>
+    *: "恢复默认值"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "设为快屏下键"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "设为快屏下键"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "设为快屏右键"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "设为快屏右键"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>

apps/lang/chinese-trad.lang

@@ -135,15 +135,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "重新開始播放..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -4443,18 +4443,21 @@
   user:
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    e200*,c200: "MMC:"
-    ondio*: none
+    multivolume: "磁盤1"
+    e200*,c200: "Multimedia 卡:"
+    ondio*: "MMC卡:"
   </dest>
   <voice>
     *: none
-    e200*,c200: "Multimedia card"
-    ondio*: ""
+    multivolume: "磁盤1"
+    e200*,c200: "Multimedia 卡"
+    ondio*: "mmc卡"
   </voice>
 </phrase>
 <phrase>
@@ -7418,10 +7421,6 @@
   </dest>
   <voice>
     *: ""
-    player,h100,h120,h300: ""
-    ipod*: ""
-    x5,m5: ""
-    h10,h10_5gb,e200*,c200: ""
   </voice>
 </phrase>
 <phrase>
@@ -8072,40 +8071,6 @@
     recording: "Mono"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_SYSFONT_EQUALIZER_EDIT_MODE
-  desc: in the equalizer settings menu
-  user:
-  <source>
-    *: none
-    swcodec: "Edit mode: %s"
-  </source>
-  <dest>
-    *: none
-    swcodec: "Edit mode: %s"
-  </dest>
-  <voice>
-    *: none
-    swcodec: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_SYSFONT_EQUALIZER_BAND_CUTOFF
-  desc: in the equalizer settings menu
-  user:
-  <source>
-    *: none
-    swcodec: "Cutoff Frequency"
-  </source>
-  <dest>
-    *: none
-    swcodec: "Cutoff Frequency"
-  </dest>
-  <voice>
-    *: none
-    swcodec: "Cutoff Frequency"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SYSFONT_SHUFFLE
   desc: deprecated
@@ -10704,14 +10669,17 @@
   user:
   <source>
     *: none
+    button_light: "Button Light Timeout"
     fuze,e200*: "Wheel Light Timeout"
   </source>
   <dest>
     *: none
+    button_light: "Button Light Timeout"
     fuze,e200*: "轉盤燈自動關時間"
   </dest>
   <voice>
     *: none
+    button_light: "Button Light Timeout"
     fuze,e200*: "Wheel Light Timeout"
   </voice>
 </phrase>
@@ -11606,3 +11574,130 @@
     *: "不知道"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_RECORDING_SIZE
+  desc: Display of recorded file size
+  user:
+  <source>
+    *: none
+    recording: "Size:"
+  </source>
+  <dest>
+    *: none
+    recording: "已錄制文件大小"
+  </dest>
+  <voice>
+    *: none
+    recording: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_AGC_MAXGAIN
+  desc: AGC maximum gain in recording screen
+  user:
+  <source>
+    *: none
+    agc: "AGC max. gain"
+  </source>
+  <dest>
+    *: none
+    agc: "自動增益控制最高增益值"
+  </dest>
+  <voice>
+    *: none
+    agc: "自動增益控制最高增益值"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ENABLE_STUDY_MODE
+  desc: DEPRECATED
+  user:
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user:
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "專輯封面"
+  </dest>
+  <voice>
+    *: none
+    albumart: "專輯封面"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "單聲道(左)+單聲道(右)"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "單聲道(左)+單聲道(右)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOUCHPAD_SENSITIVITY
+  desc: touchpad sensitivity setting
+  user:
+  <source>
+    *: none
+    gigabeatf: "Touchpad Sensitivity"
+  </source>
+  <dest>
+    *: none
+    gigabeatf: "觸摸板靈敏度"
+  </dest>
+  <voice>
+    *: none
+    gigabeatf: "觸摸板靈敏度"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FAST
+  desc: in settings_menu
+  user:
+  <source>
+    *: "Fast"
+  </source>
+  <dest>
+    *: "快"
+  </dest>
+  <voice>
+    *: "快"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SKIP_LENGTH
+  desc: playback settings menu
+  user:
+  <source>
+    *: "Skip Length"
+  </source>
+  <dest>
+    *: "跳轉長度"
+  </dest>
+  <voice>
+    *: "跳轉長度"
+  </voice>
+</phrase>

apps/lang/deutsch.lang

@@ -30,6 +30,7 @@
 # - Tobias Schladt
 # - Marianne Arnold
 # - Sascha Wolf
+# - Kaspar Rothenfußer
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -8606,15 +8607,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "Neustart der Wiedergabe..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -10152,11 +10153,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Editiermodus: %s"
+    swcodec: "Editiermodus: %s %s"
   </dest>
   <voice>
     *: none
@@ -10169,7 +10170,7 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
@@ -11872,6 +11873,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_PRESET
   desc: automatic gain control in record settings and screen
+  user:
   <source>
     *: none
     agc: "AGC"
@@ -11888,6 +11890,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_CLIPTIME
   desc: in record settings
+  user:
   <source>
     *: none
     agc: "AGC clip time"
@@ -11904,6 +11907,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_MAXGAIN
   desc: AGC maximum gain in recording screen
+  user:
   <source>
     *: none
     agc: "AGC max. gain"
@@ -12050,3 +12054,136 @@
     recording_swcodec: "Monomodus"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Als linke Schnelleinstellung verwenden"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Als linke Schnelleinstellung verwenden"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "Einstellung zurücksetzen"
+  </dest>
+  <voice>
+    *: "Einstellung zurücksetzen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Als untere Schnelleinstellung verwenden"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Als untere Schnelleinstellung verwenden"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Als rechte Schnelleinstellung verwenden"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Als rechte Schnelleinstellung verwenden"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>

apps/lang/english.lang

@@ -8148,7 +8148,6 @@
   </dest>
   <voice>
     *: "End of Song List"
-    player: "End of List"
   </voice>
 </phrase>
 <phrase>

apps/lang/francais.lang

@@ -44,6 +44,7 @@
 #    Refonte totale du fichier par Mustapha Senhaji (Moos) <moos75 AT gmail.com>
 #    Nov 2005, Avr 2006, Mai 2006, Juil 2006, Oct 2006, Dec 2006, Mar 2007, Sep 2007,
 #    Oct 2007, Nov 2007, Dec 2007, Jan 2008, Avril 2008, Août 2008, Oct 2008
+#    Dec 2008
 #
 <phrase>
   id: LANG_SET_BOOL_YES
@@ -6782,7 +6783,7 @@
     *: "%d pistes (%s) enreg."
   </dest>
   <voice>
-    *: ""
+    *: "pistes enregistrées"
   </voice>
 </phrase>
 <phrase>
@@ -6971,16 +6972,19 @@
   user:
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
+    multivolume: "DD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    multivolume: "D D 1"
     e200*,c200: "micro S D"
     ondio*: "M M C"
   </voice>
@@ -8632,15 +8636,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "Reprise de la lecture..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -10178,11 +10182,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Mode édition: %s"
+    swcodec: "Mode édition: %s %s"
   </dest>
   <voice>
     *: none
@@ -10195,7 +10199,7 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
@@ -11841,10 +11845,10 @@
     *: "Skip Track"
   </source>
   <dest>
-    *: "Désactiver"
+    *: "Exploration normale"
   </dest>
   <voice>
-    *: "Désactiver"
+    *: "Exploration normale"
   </voice>
 </phrase>
 <phrase>
@@ -12062,3 +12066,137 @@
     *: "Résultats de la recherche"
   </voice>
 </phrase>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "Réinitialiser le réglage"
+  </dest>
+  <voice>
+    *: "Réinitialiser le réglage"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Choisir comme item de gauche"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Choisir comme item de gauche"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Choisir comme item de droite"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Choisir comme item de droite"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Choisir comme item du bas"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Choisir comme item du bas"
+  </voice>
+</phrase>

apps/lang/greek.lang

@@ -6926,16 +6926,19 @@
   user:
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    multivolume: "Έιτς Ντι 1"
     e200*,c200: "μάικρο Ες Ντι"
     ondio*: "Εμ Εμ Σι"
   </voice>
@@ -8401,6 +8404,8 @@
     ipod*: "PLAY/PAUSE to abort"
     x5,m5: "Long PLAY to abort"
     h10,h10_5gb,e200*,c200: "PREV to abort"
+    gigabeats: "BACK to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF για ακύρωση"
@@ -8408,6 +8413,8 @@
     ipod*: "PLAY/PAUSE για ακύρωση"
     x5,m5: "Long PLAY για ακύρωση"
     h10,h10_5gb,e200*,c200: "PREV για ακύρωση"
+    gigabeats: "BACK για ακύρωση"
+    gigabeatf: "POWER για ακύρωση"
   </dest>
   <voice>
     *: ""
@@ -8583,15 +8590,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "Επανεκκίνηση αναπαραγωγής..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -10129,11 +10136,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Τρόπος επεξεργασίας: %s %s"
   </dest>
   <voice>
     *: none
@@ -10146,11 +10153,11 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Αποκοπή"
   </dest>
   <voice>
     *: none
@@ -11965,3 +11972,201 @@
     gigabeatf: "Ψηλά"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user:
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "Εξώφυλλο άλμπουμ:"
+  </dest>
+  <voice>
+    *: none
+    albumart: "Εξώφυλλο άλμπουμ:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "Μονοφωνικό αριστερά + δεξιά"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Μονοφωνικό αριστερά συν δεξιά"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Δεξί αντικείμενο στην οθόνη ταχείας πρόσβασης"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Δεξί αντικείμενο στην οθόνη ταχείας πρόσβασης"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "Επαναφορά ρύθμισης"
+  </dest>
+  <voice>
+    *: "Επαναφορά ρύθμισης"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Κάτω αντικείμενο στην οθόνη ταχείας πρόσβασης"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Κάτω αντικείμενο στην οθόνη ταχείας πρόσβασης"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Αριστερό αντικείμενο στην οθόνη ταχείας πρόσβασης"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Αριστερό αντικείμενο στην οθόνη ταχείας πρόσβασης"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH_RESULTS
+  desc: title for the list of results displayed after searching in a playlist
+  user:
+  <source>
+    *: "Search Results"
+  </source>
+  <dest>
+    *: "Αποτελέσματα εύρεσης"
+  </dest>
+  <voice>
+    *: "Αποτελέσματα εύρεσης"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_MONO_MODE
+  desc: in the recording settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono mode"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "Μονοφωνικός τρόπος"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Μονοφωνικός τρόπος"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>

apps/lang/hebrew.lang

@@ -434,7 +434,7 @@
     *: "Playlists"
   </source>
   <dest>
-    *: "רשימות השמעה"
+    *: "רשימות שירים"
   </dest>
   <voice>
     *: "Playlists"
@@ -5971,7 +5971,7 @@
   </source>
   <dest>
     *: none
-    recording: "מה לעשות בפיצול"
+    recording: "מה לעשות בעת פיצול"
   </dest>
   <voice>
     *: none
@@ -6139,7 +6139,7 @@
   </source>
   <dest>
     *: none
-    recording: "נקה ספרית הקלטות"
+    recording: "נקה את ספרית ההקלטות"
   </dest>
   <voice>
     *: none
@@ -6156,7 +6156,7 @@
   </source>
   <dest>
     *: none
-    recording: "לא ניתן לכתוב לספרית ההקלטה!"
+    recording: "לא ניתן לכתוב לספרית ההקלטות!"
   </dest>
   <voice>
     *: none
@@ -6207,7 +6207,7 @@
   </source>
   <dest>
     *: none
-    remote: "שלט בלבד"
+    remote: "יחידת שלט בלבד"
   </dest>
   <voice>
     *: none
@@ -6740,7 +6740,7 @@
     *: "Recursively Insert Directories"
   </source>
   <dest>
-    *: "הכנס את כל תת-הספריות"
+    *: "הכנס את כל תתי-הספריות"
   </dest>
   <voice>
     *: "Recursively Insert Directories"
@@ -6754,7 +6754,7 @@
     *: "Recursively?"
   </source>
   <dest>
-    *: "בצורה רקורסיבית?"
+    *: "את כל תתי-הספריות?"
   </dest>
   <voice>
     *: "Recursively?"
@@ -6768,7 +6768,7 @@
     *: "Warn When Erasing Dynamic Playlist"
   </source>
   <dest>
-    *: "הזהר לפני מחיקת רשימת השירים הנוכחית"
+    *: "הזהר לפני מחיקת רשימת השירים הדינאמית"
   </dest>
   <voice>
     *: "Warn When Erasing Dynamic Playlist"
@@ -6782,7 +6782,7 @@
     *: "Erase dynamic playlist?"
   </source>
   <dest>
-    *: "למחוק רשימת שירים נוכחית?"
+    *: "למחוק רשימת שירים דינאמית?"
   </dest>
   <voice>
     *: "Erase dynamic playlist?"
@@ -6845,9 +6845,9 @@
     h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
   </source>
   <dest>
-    *: "Battery: %d%% %dh %dm"
+    *: "סוללה: %d%% %dh %dm"
     player,recorder,fmrecorder,recorderv2,ondio*,ifp7xx: "%d%% %dh %dm"
-    h10,ipodmini,ipodmini2g: "Batt: %d%% %dh %dm"
+    h10,ipodmini,ipodmini2g: "סולל: %d%% %dh %dm"
   </dest>
   <voice>
     *: "Battery level"
@@ -6875,7 +6875,7 @@
     *: "Free:"
   </source>
   <dest>
-    *: "מקום חופשי בכונן:"
+    *: "מקום פנוי:"
   </dest>
   <voice>
     *: "Free diskspace:"
@@ -6904,16 +6904,19 @@
   user:
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
+    multivolume: "HD1"
     e200*,c200: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    multivolume: "H D 1"
     e200*,c200: "micro S D"
     ondio*: "M M C"
   </voice>
@@ -6926,7 +6929,7 @@
     *: "Version"
   </source>
   <dest>
-    *: "גרסה"
+    *: "גירסה"
   </dest>
   <voice>
     *: "Version"
@@ -7346,7 +7349,7 @@
     *: "Context Menu"
   </source>
   <dest>
-    *: "תפריט"
+    *: "תפריט הקשר"
   </dest>
   <voice>
     *: "Context Menu"
@@ -7388,7 +7391,7 @@
     *: "Show Track Info"
   </source>
   <dest>
-    *: "ID3 הצג מידע"
+    *: "הצג מידע שיר"
   </dest>
   <voice>
     *: "Show Track Info"
@@ -7402,7 +7405,7 @@
     *: "[Title]"
   </source>
   <dest>
-    *: "[שם השיר]"
+    *: "[כותרת]"
   </dest>
   <voice>
     *: ""
@@ -7444,7 +7447,7 @@
     *: "[Tracknum]"
   </source>
   <dest>
-    *: "[מספר שיר]"
+    *: "[מספר רצועה]"
   </dest>
   <voice>
     *: ""
@@ -7598,7 +7601,7 @@
     *: "[Track Gain]"
   </source>
   <dest>
-    *: "[הגברה חוזרת שיר]"
+    *: "[הגברה שיר]"
   </dest>
   <voice>
     *: ""
@@ -7612,7 +7615,7 @@
     *: "[Album Gain]"
   </source>
   <dest>
-    *: "[הגברה חוזרת אלבום]"
+    *: "[הגברה אלבום]"
   </dest>
   <voice>
     *: ""
@@ -7626,7 +7629,7 @@
     *: "[Path]"
   </source>
   <dest>
-    *: "[כתובת]"
+    *: "[נתיב]"
   </dest>
   <voice>
     *: ""
@@ -7710,7 +7713,7 @@
     *: "File/directory exists. Overwrite?"
   </source>
   <dest>
-    *: "הקובץ\ספריה קיימים כבר. לכתוב עליהם?"
+    *: "הקובץ\ספריה כבר קיימים. לדרוס אותם?"
   </dest>
   <voice>
     *: "File or directory exists. Overwrite?"
@@ -7873,7 +7876,7 @@
     *: "Open With..."
   </source>
   <dest>
-    *: "...פתח באמצעות"
+    *: "פתיחה באמצעות..."
   </dest>
   <voice>
     *: "open with"
@@ -8014,7 +8017,7 @@
     *: "Playlist Buffer Full"
   </source>
   <dest>
-    *: "זיכרון רשימת השירים מלא"
+    *: "חוצץ רשימת השירים מלא"
   </dest>
   <voice>
     *: "Playlist Buffer Full"
@@ -8199,7 +8202,7 @@
     *: "Time"
   </source>
   <dest>
-    *: "הגדר תאריך וזמן"
+    *: "זמן"
   </dest>
   <voice>
     *: "Time"
@@ -8334,7 +8337,7 @@
   </source>
   <dest>
     *: none
-    ondio*: "אנא הסר כרטיס מולטימדיה"
+    ondio*: "אנא הסר כרטיס MMC"
   </dest>
   <voice>
     *: none
@@ -8349,7 +8352,7 @@
     *: "Boot changed"
   </source>
   <dest>
-    *: "קובץ המערכת שונה"
+    *: "קובץ האיתחול השתנה"
   </dest>
   <voice>
     *: "Boot changed"
@@ -8379,6 +8382,8 @@
     ipod*: "PLAY/PAUSE to abort"
     x5,m5: "Long PLAY to abort"
     h10,h10_5gb,e200*,c200: "PREV to abort"
+    gigabeats: "BACK to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF כדי לבטל"
@@ -8386,6 +8391,8 @@
     ipod*: "PLAY/PAUSE כדי לבטל"
     x5,m5: "PLAY ארוך כדי לבטל"
     h10,h10_5gb,e200*,c200: "PREV כדי לבטל"
+    gigabeats: "BACK כדי לבטל"
+    gigabeatf: "POWER כדי לבטל"
   </dest>
   <voice>
     *: ""
@@ -8399,7 +8406,7 @@
     *: "No files"
   </source>
   <dest>
-    *: "קבצים אין"
+    *: "אין קבצים"
   </dest>
   <voice>
     *: "No files"
@@ -8427,7 +8434,7 @@
     *: "Can't open %s"
   </source>
   <dest>
-    *: "אינו נפתח %s"
+    *: "לא ניתן לפתוח את %s"
   </dest>
   <voice>
     *: ""
@@ -8441,7 +8448,7 @@
     *: "Failed reading %s"
   </source>
   <dest>
-    *: "נכשלה הקריאה %s"
+    *: "נכשלה הקריאה של %s"
   </dest>
   <voice>
     *: ""
@@ -8483,7 +8490,7 @@
     *: "Plugin returned error"
   </source>
   <dest>
-    *: "ההתקן החזיר שגיאה"
+    *: "התוסף החזיר שגיאה"
   </dest>
   <voice>
     *: ""
@@ -8525,7 +8532,7 @@
     *: "Dir Buffer is Full!"
   </source>
   <dest>
-    *: "זיכרון התיקיות מלא!"
+    *: "חוצץ התיקיות מלא!"
   </dest>
   <voice>
     *: "Directory Buffer is Full!"
@@ -8553,7 +8560,7 @@
     *: "Plugin name too long"
   </source>
   <dest>
-    *: "שם ההתקן ארוך מידיי"
+    *: "שם התוסף ארוך מידיי"
   </dest>
   <voice>
     *: "Plugin name too long"
@@ -8561,15 +8568,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "...מאתחל את ההשמעה"
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -8584,7 +8591,7 @@
     *: "Please reboot to enable"
   </source>
   <dest>
-    *: "אנא אתחל את הנגן כדי להחיל את השינויים"
+    *: "אנא אתחל כדי להשתמש באפשרות זו"
   </dest>
   <voice>
     *: "Please reboot to enable"
@@ -8600,7 +8607,7 @@
   </source>
   <dest>
     *: none
-    charging: "סוללה: בטעינה"
+    charging: "סוללה: טעינה"
   </dest>
   <voice>
     *: none
@@ -8617,7 +8624,7 @@
   </source>
   <dest>
     *: none
-    recorder: "טעינת: כיבוי במקסימום"
+    recorder: "סוללה: כיבוי במקסימום"
   </dest>
   <voice>
     *: none
@@ -8634,7 +8641,7 @@
   </source>
   <dest>
     *: none
-    charging: "טעינת: טפטוף טעינה"
+    charging: "סוללה: טפטוף טעינה"
   </dest>
   <voice>
     *: none
@@ -10107,11 +10114,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "מצב עריכה: %s %s"
   </dest>
   <voice>
     *: none
@@ -10124,11 +10131,11 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "קיטעון"
   </dest>
   <voice>
     *: none
@@ -10145,7 +10152,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Gain"
+    lcd_bitmap: "הגבר"
   </dest>
   <voice>
     *: none
@@ -10366,7 +10373,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Mode:"
+    lcd_bitmap: "מצב:"
   </dest>
   <voice>
     *: none
@@ -10383,7 +10390,7 @@
   </source>
   <dest>
     *: none
-    recorder_pad: "Menu"
+    recorder_pad: "תפריט"
   </dest>
   <voice>
     *: none
@@ -10400,7 +10407,7 @@
   </source>
   <dest>
     *: none
-    recorder_pad: "Option"
+    recorder_pad: "אפשרות"
   </dest>
   <voice>
     *: none
@@ -10468,7 +10475,7 @@
   </source>
   <dest>
     *: none
-    recording: "Stereo"
+    recording: "סטריאו"
   </dest>
   <voice>
     *: none
@@ -10485,7 +10492,7 @@
   </source>
   <dest>
     *: none
-    recording: "Mono"
+    recording: "מונו"
   </dest>
   <voice>
     *: none
@@ -10502,7 +10509,7 @@
   </source>
   <dest>
     *: none
-    recording_hwcodec: "Quality"
+    recording_hwcodec: "איכות"
   </dest>
   <voice>
     *: none
@@ -10519,7 +10526,7 @@
   </source>
   <dest>
     *: none
-    recording: "Frequency"
+    recording: "תדירות"
   </dest>
   <voice>
     *: none
@@ -10536,7 +10543,7 @@
   </source>
   <dest>
     *: none
-    recording: "Source"
+    recording: "מקור"
   </dest>
   <voice>
     *: none
@@ -10553,7 +10560,7 @@
   </source>
   <dest>
     *: none
-    recording: "Int. Mic"
+    recording: "מיק. פנימי"
   </dest>
   <voice>
     *: none
@@ -10587,7 +10594,7 @@
   </source>
   <dest>
     *: none
-    recording: "Digital"
+    recording: "דיגיטלי"
   </dest>
   <voice>
     *: none
@@ -10604,7 +10611,7 @@
   </source>
   <dest>
     *: none
-    recording: "Channels"
+    recording: "ערוצים"
   </dest>
   <voice>
     *: none
@@ -10621,7 +10628,7 @@
   </source>
   <dest>
     *: none
-    recording: "Trigger"
+    recording: "הדק הפעלה"
   </dest>
   <voice>
     *: none
@@ -10706,7 +10713,7 @@
   </source>
   <dest>
     *: none
-    recording: "Gain Left"
+    recording: "הגבר שמאל"
   </dest>
   <voice>
     *: none
@@ -10723,7 +10730,7 @@
   </source>
   <dest>
     *: none
-    recording: "Gain Right"
+    recording: "הגבר ימין"
   </dest>
   <voice>
     *: none
@@ -10926,7 +10933,7 @@
     *: "Demos"
   </source>
   <dest>
-    *: "Demos"
+    *: "הדגמות"
   </dest>
   <voice>
     *: "Demos"
@@ -11182,7 +11189,7 @@
   </source>
   <dest>
     *: none
-    usbstack: "Device Driver"
+    usbstack: "מנהל התקן"
   </dest>
   <voice>
     *: none
@@ -11512,7 +11519,7 @@
   </source>
   <dest>
     *: none
-    swcodec: "Keyclick Repeats"
+    swcodec: "לחיצות חוזרות"
   </dest>
   <voice>
     *: none
@@ -11529,7 +11536,7 @@
   </source>
   <dest>
     *: none
-    accessory_supply: "Accessory Power Supply"
+    accessory_supply: "ספק כוח של התקן עזר"
   </dest>
   <voice>
     *: none
@@ -11749,7 +11756,7 @@
     *: "Skip Length"
   </source>
   <dest>
-    *: "Skip Length"
+    *: "דלג אורך"
   </dest>
   <voice>
     *: "Skip Length"
@@ -11763,7 +11770,7 @@
     *: "Skip Track"
   </source>
   <dest>
-    *: "דלג רצועה"
+    *: "דלג שיר"
   </dest>
   <voice>
     *: "Skip Track"
@@ -11909,7 +11916,7 @@
   </source>
   <dest>
     *: none
-    recording: "Split Time:"
+    recording: "זמן פיצול:"
   </dest>
   <voice>
     *: none
@@ -11933,3 +11940,201 @@
     recording: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user:
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "תמונת אלבום:"
+  </dest>
+  <voice>
+    *: none
+    albumart: "Album Art:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "מונו ימין + שמאל"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Mono Left plus Right"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "קבע כפריט מסך מהיר שמאלי"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "אפס הגדרות"
+  </dest>
+  <voice>
+    *: "Reset Setting"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "קבע כפריט מסך מהיר תחתון"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "קבע כפריט מסך מהיר ימני"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH_RESULTS
+  desc: title for the list of results displayed after searching in a playlist
+  user:
+  <source>
+    *: "Search Results"
+  </source>
+  <dest>
+    *: "תוצאות חיפוש"
+  </dest>
+  <voice>
+    *: "Search Results"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_MONO_MODE
+  desc: in the recording settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono mode"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "מצב מונו"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Mono mode"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>

apps/lang/japanese.lang

@@ -21,6 +21,7 @@
 # - Takumi Suzuki
 # - Shunsuke Shimizu
 # - Tadayuki Nishizono
+# - Yoshihisa Uchida
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -509,7 +510,7 @@
     *: ", シャッフル"
   </dest>
   <voice>
-    *: "シャッフル"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -778,6 +779,23 @@
     *: "モノラル 右"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "モノラル (左右)"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "モノラル 左右"
+  </voice>
+</phrase>
 <phrase>
   id: LANG_CHANNEL_KARAOKE
   desc: in sound_settings
@@ -843,6 +861,7 @@
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "Cross Gain"
@@ -859,6 +878,7 @@
 <phrase>
   id: LANG_CROSSFEED_HF_ATTENUATION
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Attenuation"
@@ -875,6 +895,7 @@
 <phrase>
   id: LANG_CROSSFEED_HF_CUTOFF
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Cutoff"
@@ -2043,6 +2064,7 @@
 <phrase>
   id: LANG_RANDOM
   desc: random folder
+  user:
   <source>
     *: "Random"
   </source>
@@ -2513,6 +2535,7 @@
 <phrase>
   id: LANG_TAGCACHE_BUSY
   desc: when trying to shutdown and tagcache is committing
+  user:
   <source>
     *: "Database is not ready"
   </source>
@@ -3265,11 +3288,11 @@
     scrollwheel: none
   </source>
   <dest>
-    *: "List Acceleration Start Delay"
+    *: "加速するまでの時間"
     scrollwheel: none
   </dest>
   <voice>
-    *: "List Acceleration Start Delay"
+    *: "加速するまでの時間"
     scrollwheel: none
   </voice>
 </phrase>
@@ -3282,11 +3305,11 @@
     scrollwheel: none
   </source>
   <dest>
-    *: "List Acceleration Speed"
+    *: "加速度"
     scrollwheel: none
   </dest>
   <voice>
-    *: "List Acceleration Speed"
+    *: "加速度"
     scrollwheel: none
   </voice>
 </phrase>
@@ -4645,7 +4668,7 @@
   </dest>
   <voice>
     *: none
-    alarm: ""
+    alarm: "起床"
   </voice>
 </phrase>
 <phrase>
@@ -5386,7 +5409,7 @@
   </dest>
   <voice>
     *: none
-    radio: "スクリーン凍結"
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -5579,6 +5602,7 @@
 <phrase>
   id: LANG_FM_REGION
   desc: fm tuner region setting
+  user:
   <source>
     *: none
     radio: "Region"
@@ -5595,6 +5619,7 @@
 <phrase>
   id: LANG_FM_EUROPE
   desc: fm tuner region europe
+  user:
   <source>
     *: none
     radio: "Europe"
@@ -5611,6 +5636,7 @@
 <phrase>
   id: LANG_FM_US
   desc: fm region us / canada
+  user:
   <source>
     *: none
     radio: "US / Canada"
@@ -5627,6 +5653,7 @@
 <phrase>
   id: LANG_FM_JAPAN
   desc: fm region japan
+  user:
   <source>
     *: none
     radio: "Japan"
@@ -5643,6 +5670,7 @@
 <phrase>
   id: LANG_FM_KOREA
   desc: fm region korea
+  user:
   <source>
     *: none
     radio: "Korea"
@@ -5738,7 +5766,7 @@
   </dest>
   <voice>
     *: none
-    recording: "AIFF"
+    recording: "A I F F"
   </voice>
 </phrase>
 <phrase>
@@ -5951,6 +5979,7 @@
 <phrase>
   id: LANG_SPLIT_MEASURE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Measure"
@@ -5967,6 +5996,7 @@
 <phrase>
   id: LANG_SPLIT_TYPE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "What to do when Splitting"
@@ -6017,6 +6047,7 @@
 <phrase>
   id: LANG_SPLIT_TIME
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Time"
@@ -6033,6 +6064,7 @@
 <phrase>
   id: LANG_SPLIT_SIZE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Filesize"
@@ -6270,6 +6302,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_TYPE
   desc: in recording trigger menu
+  user:
   <source>
     *: none
     recording: "Trigtype"
@@ -6286,6 +6319,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_NEWFILESTP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "New file"
@@ -6302,6 +6336,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_STOP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "Stop"
@@ -6437,6 +6472,7 @@
 <phrase>
   id: LANG_RECORD_AGC_PRESET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -6453,6 +6489,7 @@
 <phrase>
   id: LANG_AGC_SAFETY
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Safety (clip)"
@@ -6469,6 +6506,7 @@
 <phrase>
   id: LANG_AGC_LIVE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Live (slow)"
@@ -6485,6 +6523,7 @@
 <phrase>
   id: LANG_AGC_DJSET
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "DJ-Set (slow)"
@@ -6501,6 +6540,7 @@
 <phrase>
   id: LANG_AGC_MEDIUM
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Medium"
@@ -6517,6 +6557,7 @@
 <phrase>
   id: LANG_AGC_VOICE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Voice (fast)"
@@ -6533,6 +6574,7 @@
 <phrase>
   id: LANG_RECORD_AGC_CLIPTIME
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -6906,16 +6948,19 @@
   user:
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    multivolume: "H D 1"
     e200*,c200: "マイクロSD"
     ondio*: "マルチメディアカード"
   </voice>
@@ -8207,6 +8252,8 @@
     *: "時間"
   </voice>
 </phrase>
+/* TODO: cleanup LANG_USB_CHARGING unless HAVE_USB_CHARGING_ENABLE defined,
+ * the selector should probably be usb_charging_enable as well. */
 <phrase>
   id: LANG_USB_CHARGING
   desc: in Battery menu
@@ -8306,7 +8353,7 @@
   </dest>
   <voice>
     *: none
-    recording: ""
+    recording: "マイナス無限大"
   </voice>
 </phrase>
 <phrase>
@@ -8381,6 +8428,8 @@
     ipod*: "PLAY/PAUSE to abort"
     x5,m5: "Long PLAY to abort"
     h10,h10_5gb,e200*,c200: "PREV to abort"
+    gigabeats: "BACK to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF： キャンセル"
@@ -8388,6 +8437,8 @@
     ipod*: "PLAY/PAUSE： キャンセル"
     x5,m5: "Long PLAY： キャンセル"
     h10,h10_5gb,e200*,c200: "PREV： キャンセル"
+    gigabeats: "BACK： キャンセル"
+    gigabeatf: "POWER： キャンセル"
   </dest>
   <voice>
     *: ""
@@ -8488,7 +8539,7 @@
     *: "プラグインがエラーを返しました"
   </dest>
   <voice>
-    *: "プラグインがエラーを返しました"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8563,15 +8614,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "再生を再開しています..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -8682,7 +8733,7 @@
     *: "B"
   </dest>
   <voice>
-    *: "バイト"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10109,11 +10160,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "調整項目: %s %s"
   </dest>
   <voice>
     *: none
@@ -10126,15 +10177,15 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "カットオフ周波数"
   </dest>
   <voice>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "カットオフ周波数"
   </voice>
 </phrase>
 <phrase>
@@ -10147,11 +10198,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Gain"
+    lcd_bitmap: "ゲイン"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Gain"
+    lcd_bitmap: "ゲイン"
   </voice>
 </phrase>
 <phrase>
@@ -10368,7 +10419,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Mode:"
+    lcd_bitmap: "項目:"
   </dest>
   <voice>
     *: none
@@ -10385,7 +10436,7 @@
   </source>
   <dest>
     *: none
-    recorder_pad: "Menu"
+    recorder_pad: "メニュー"
   </dest>
   <voice>
     *: none
@@ -10402,7 +10453,7 @@
   </source>
   <dest>
     *: none
-    recorder_pad: "Option"
+    recorder_pad: "オプション"
   </dest>
   <voice>
     *: none
@@ -10470,11 +10521,11 @@
   </source>
   <dest>
     *: none
-    recording: "Stereo"
+    recording: "ステレオ"
   </dest>
   <voice>
     *: none
-    recording: "Stereo"
+    recording: "ステレオ"
   </voice>
 </phrase>
 <phrase>
@@ -10487,11 +10538,11 @@
   </source>
   <dest>
     *: none
-    recording: "Mono"
+    recording: "モノラル"
   </dest>
   <voice>
     *: none
-    recording: "Mono"
+    recording: "モノラル"
   </voice>
 </phrase>
 <phrase>
@@ -10504,11 +10555,11 @@
   </source>
   <dest>
     *: none
-    recording_hwcodec: "Quality"
+    recording_hwcodec: "品質"
   </dest>
   <voice>
     *: none
-    recording_hwcodec: "Quality"
+    recording_hwcodec: "品質"
   </voice>
 </phrase>
 <phrase>
@@ -10521,11 +10572,11 @@
   </source>
   <dest>
     *: none
-    recording: "Frequency"
+    recording: "周波数"
   </dest>
   <voice>
     *: none
-    recording: "Frequency"
+    recording: "周波数"
   </voice>
 </phrase>
 <phrase>
@@ -10538,11 +10589,11 @@
   </source>
   <dest>
     *: none
-    recording: "Source"
+    recording: "ソース"
   </dest>
   <voice>
     *: none
-    recording: "Source"
+    recording: "ソース"
   </voice>
 </phrase>
 <phrase>
@@ -10555,11 +10606,11 @@
   </source>
   <dest>
     *: none
-    recording: "Int. Mic"
+    recording: "内蔵のマイク"
   </dest>
   <voice>
     *: none
-    recording: "Internal Microphone"
+    recording: "内蔵のマイク"
   </voice>
 </phrase>
 <phrase>
@@ -10572,11 +10623,11 @@
   </source>
   <dest>
     *: none
-    recording: "Line In"
+    recording: "ライン入力"
   </dest>
   <voice>
     *: none
-    recording: "Line In"
+    recording: "ライン入力"
   </voice>
 </phrase>
 <phrase>
@@ -10589,11 +10640,11 @@
   </source>
   <dest>
     *: none
-    recording: "Digital"
+    recording: "デジタル"
   </dest>
   <voice>
     *: none
-    recording: "Digital"
+    recording: "デジタル"
   </voice>
 </phrase>
 <phrase>
@@ -10606,11 +10657,11 @@
   </source>
   <dest>
     *: none
-    recording: "Channels"
+    recording: "チャンネルの設定"
   </dest>
   <voice>
     *: none
-    recording: "Channels"
+    recording: "チャンネルの設定"
   </voice>
 </phrase>
 <phrase>
@@ -10623,11 +10674,11 @@
   </source>
   <dest>
     *: none
-    recording: "Trigger"
+    recording: "トリガ"
   </dest>
   <voice>
     *: none
-    recording: "Trigger"
+    recording: "トリガ"
   </voice>
 </phrase>
 <phrase>
@@ -10708,7 +10759,7 @@
   </source>
   <dest>
     *: none
-    recording: "Gain Left"
+    recording: "左ゲイン"
   </dest>
   <voice>
     *: none
@@ -10725,7 +10776,7 @@
   </source>
   <dest>
     *: none
-    recording: "Gain Right"
+    recording: "右ゲイン"
   </dest>
   <voice>
     *: none
@@ -10769,6 +10820,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_PRESET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10785,6 +10837,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_SAFETY
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10801,6 +10854,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_LIVE
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10817,6 +10871,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_DJSET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10833,6 +10888,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_MEDIUM
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10849,6 +10905,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_VOICE
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10865,6 +10922,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -11397,7 +11455,7 @@
     multivolume: "なし"
   </voice>
 </phrase>
-<phrase>
+<phrase>  
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user:
@@ -11530,11 +11588,11 @@
     accessory_supply: "Accessory Power Supply"
   </source>
   <dest>
-    *: "アクセサリへの電源供給"
+    *: none
     accessory_supply: "アクセサリへの電源供給"
   </dest>
   <voice>
-    *: "アクセサリへの電源供給"
+    *: none
     accessory_supply: "アクセサリへの電源供給"
   </voice>
 </phrase>
@@ -11639,7 +11697,7 @@
 <phrase>
   id: LANG_STOP_RECORDING_AND_SHUTDOWN
   desc: in record timesplit options
-  user: 
+  user:
   <source>
     *: none
     recording: "Stop Recording And Shutdown"
@@ -11656,7 +11714,7 @@
 <phrase>
   id: LANG_TOUCHPAD_SENSITIVITY
   desc: touchpad sensitivity setting
-  user: 
+  user:
   <source>
     *: none
     gigabeatf: "Touchpad Sensitivity"
@@ -11822,6 +11880,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_PRESET
   desc: automatic gain control in record settings and screen
+  user:
   <source>
     *: none
     agc: "AGC"
@@ -11838,6 +11897,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_CLIPTIME
   desc: in record settings
+  user:
   <source>
     *: none
     agc: "AGC clip time"
@@ -11854,6 +11914,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_MAXGAIN
   desc: AGC maximum gain in recording screen
+  user:
   <source>
     *: none
     agc: "AGC max. gain"
@@ -11894,7 +11955,7 @@
   </source>
   <dest>
     *: none
-    recording: "CLIP:"
+    recording: "クリップ:"
   </dest>
   <voice>
     *: none
@@ -11935,3 +11996,184 @@
     recording: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user:
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "アルバムアート:"
+  </dest>
+  <voice>
+    *: none
+    albumart: "アルバムアート:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_MONO_MODE
+  desc: in the recording settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono mode"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "モノラル"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "モノラル"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH_RESULTS
+  desc: title for the list of results displayed after searching in a playlist
+  user:
+  <source>
+    *: "Search Results"
+  </source>
+  <dest>
+    *: "検索結果"
+  </dest>
+  <voice>
+    *: "検索結果"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "設定を初期状態に戻す"
+  </dest>
+  <voice>
+    *: "設定を初期状態に戻す"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "左クイック画面の項目として設定"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "左クイック画面の項目として設定"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "右クイック画面の項目として設定"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "右クイック画面の項目として設定"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "下クイック画面の項目として設定"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "下クイック画面の項目として設定"
+  </voice>
+</phrase>

apps/lang/portugues.lang

@@ -2193,7 +2193,7 @@
     *: "Voice Menus"
   </source>
   <dest>
-    *: "Menús de Voz"
+    *: "Menus de Voz"
   </dest>
   <voice>
     *: "Voice Menus"
@@ -3636,7 +3636,7 @@
     *: "Max Entries in File Browser"
   </source>
   <dest>
-    *: "Número Máx. de Ficheiros no Explorador de Directoria"
+    *: "Número Máx. de Ficheiros no Explorador de Ficheiros"
   </dest>
   <voice>
     *: "Maximum files in directory browser"
@@ -4003,7 +4003,7 @@
     *: "Rockbox Info"
   </source>
   <dest>
-    *: "Informação da Rockbox:"
+    *: "Informação do Rockbox:"
   </dest>
   <voice>
     *: ""
@@ -4036,7 +4036,7 @@
   </source>
   <dest>
     *: none
-    recorder: "Bateria: Carregamento Completado"
+    recorder: "Bateria: Carregamento Completo"
   </dest>
   <voice>
     *: none
@@ -7608,7 +7608,6 @@
     recording: "Fonte"
   </voice>
 </phrase>
-</phrase>
 <phrase>
   id: LANG_SYSFONT_RECORDING_SRC_DIGITAL
   desc: in the recording settings
@@ -7823,7 +7822,7 @@
   </source>
   <dest>
     *: none
-    recorder_pad: "Menú"
+    recorder_pad: "Menu"
   </dest>
   <voice>
     *: none
@@ -8568,7 +8567,7 @@
     *: "Theme Settings"
   </source>
   <dest>
-    *: "Opoções de Temas"
+    *: "Opções de Temas"
   </dest>
   <voice>
     *: "Theme Settings"
@@ -9717,7 +9716,7 @@
   </source>
   <dest>
     *: none
-    lcd_color: "Barra (Gradient Colour)"
+    lcd_color: "Barra (Cor Gradiente)"
   </dest>
   <voice>
     *: none
@@ -10616,3 +10615,902 @@
     radio: "FM Radio Menu"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_FM_SAVE_CHANGES
+  desc: When you try to exit radio to confirm save
+  user:
+  <source>
+    *: none
+    radio: "Save Changes?"
+  </source>
+  <dest>
+    *: none
+    radio: "Guardar Alterações?"
+  </dest>
+  <voice>
+    *: none
+    radio: "Save Changes?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AFMT_PCM_WAV
+  desc: audio format description
+  user:
+  <source>
+    *: none
+    recording: "PCM Wave"
+  </source>
+  <dest>
+    *: none
+    recording: "Onda PCM"
+  </dest>
+  <voice>
+    *: none
+    recording: "PCM Wave"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICE_FILETYPE
+  desc: voice settings menu
+  user:
+  <source>
+    *: "Say File Type"
+  </source>
+  <dest>
+    *: "Dizer Tipo de Ficheiro"
+  </dest>
+  <voice>
+    *: "Say File Type"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT_CURSOR
+  desc: in settings_menu
+  user:
+  <source>
+    *: none
+    lcd_bitmap: "Line Selector Type"
+  </source>
+  <dest>
+    *: none
+    lcd_bitmap: "Tipo de Linha de Selecção"
+  </dest>
+  <voice>
+    *: none
+    lcd_bitmap: "Line Selector Type"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NOT_PRESENT
+  desc: when external memory is not present
+  user:
+  <source>
+    *: none
+    multivolume: "Not present"
+  </source>
+  <dest>
+    *: none
+    multivolume: "Não presente"
+  </dest>
+  <voice>
+    *: none
+    multivolume: "Not present"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_AGC_MAXGAIN
+  desc: AGC maximum gain in recording screen
+  user:
+  <source>
+    *: none
+    agc: "AGC max. gain"
+  </source>
+  <dest>
+    *: none
+    agc: "Ganho max. de AGC"
+  </dest>
+  <voice>
+    *: none
+    agc: "AGC maximum gain"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NEVER
+  desc: in lcd settings
+  user:
+  <source>
+    *: none
+    lcd_sleep: "Never"
+  </source>
+  <dest>
+    *: none
+    lcd_sleep: "Nunca"
+  </dest>
+  <voice>
+    *: none
+    lcd_sleep: "Never"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECTOR_START_COLOR
+  desc: line selector color option
+  user:
+  <source>
+    *: none
+    lcd_color: "Primary Colour"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "Cor Primária"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Primary Colour"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_INIT
+  desc: while initializing tagcache on boot
+  user:
+  <source>
+    *: "Committing database"
+  </source>
+  <dest>
+    *: "Submetendo base de dados"
+  </dest>
+  <voice>
+    *: "Committing database"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BUILDING_DATABASE
+  desc: splash database building progress
+  user:
+  <source>
+    *: "Building database... %d found (OFF to return)"
+    h100,h120,h300: "Building database... %d found (STOP to return)"
+    ipod*: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200,sa9200: "Building database... %d found (PREV to return)"
+  </source>
+  <dest>
+    *: "Construindo Base da Dados... %d encontrado (OFF para voltar)"
+    h100,h120,h300: "Construindo Base da Dados... %d encontrado (STOP para voltar)"
+    ipod*: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
+    x5,m5,gigabeat*,mrobe100: "Construindo Base da Dados... %d encontrado (LEFT para voltar)"
+    h10,h10_5gb,e200*,c200,sa9200: "Construindo Base da Dados... %d encontrado (PREV para voltar)"
+  </dest>
+  <voice>
+    *: "entries found for database"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS
+  desc: "<All tracks>" entry in tag browser
+  user:
+  <source>
+    *: "<All tracks>"
+  </source>
+  <dest>
+    *: "<Todas as faixas>"
+  </dest>
+  <voice>
+    *: "All tracks"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIR_BROWSER
+  desc: main menu title
+  user:
+  <source>
+    *: "Files"
+  </source>
+  <dest>
+    *: "Ficheiros"
+  </dest>
+  <voice>
+    *: "Files"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_COMMENT
+  desc: in tag viewer
+  user:
+  <source>
+    *: "[Comment]"
+  </source>
+  <dest>
+    *: "[Comentário]"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AGC_DJSET
+  desc: AGC preset
+  user:
+  <source>
+    *: none
+    agc: "DJ-Set (slow)"
+  </source>
+  <dest>
+    *: none
+    agc: "DJ-Set (lento)"
+  </dest>
+  <voice>
+    *: none
+    agc: "DJ set (slow)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SYSFONT_RECORDING_SRC_MIC
+  desc: in the recording settings
+  user:
+  <source>
+    *: none
+    recording: "Int. Mic"
+  </source>
+  <dest>
+    *: none
+    recording: "Mic Int."
+  </dest>
+  <voice>
+    *: none
+    recording: "Internal Microphone"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_IMPORT
+  desc: in tag cache settings
+  user:
+  <source>
+    *: "Import Modifications"
+  </source>
+  <dest>
+    *: "Importar Modificações"
+  </dest>
+  <voice>
+    *: "Import Modifications"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user:
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "Capa de Álbum:"
+  </dest>
+  <voice>
+    *: none
+    albumart: "Album Art:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LCD_SLEEP_AFTER_BACKLIGHT_OFF
+  desc: In display settings, time to switch LCD chip into power saving state
+  user:
+  <source>
+    *: none
+    lcd_sleep: "Sleep (After Backlight Off)"
+  </source>
+  <dest>
+    *: none
+    lcd_sleep: "Dormir (Depois de Retro-iluminação desligada)"
+  </dest>
+  <voice>
+    *: none
+    lcd_sleep: "Sleep after backlight off"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REC_SIZE
+  desc: in record timesplit options
+  user:
+  <source>
+    *: none
+    recording: "Filesize"
+  </source>
+  <dest>
+    *: none
+    recording: "Tamanho de Ficheiro"
+  </dest>
+  <voice>
+    *: none
+    recording: "Filesize"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_GAIN
+  desc: Generic string for gain used in EQ menu and recording screen
+  user:
+  <source>
+    *: "Gain"
+  </source>
+  <dest>
+    *: "Ganho"
+  </dest>
+  <voice>
+    *: "Gain"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DELETING
+  desc:
+  user:
+  <source>
+    *: "Deleting..."
+  </source>
+  <dest>
+    *: "Eliminando..."
+  </dest>
+  <voice>
+    *: "Deleting"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "Mono Esquerda + Direita"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Mono Left plus Right"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TOUCHPAD_SENSITIVITY
+  desc: touchpad sensitivity setting
+  user:
+  <source>
+    *: none
+    gigabeatf: "Touchpad Sensitivity"
+  </source>
+  <dest>
+    *: none
+    gigabeatf: "Sensitividade do Touchpad"
+  </dest>
+  <voice>
+    *: none
+    gigabeatf: "Touchpad Sensitivity"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USB_CHARGING
+  desc: in Battery menu
+  user:
+  <source>
+    *: none
+    usb_charging: "Charge During USB Connection"
+  </source>
+  <dest>
+    *: none
+    usb_charging: "Carregar Durante Conecção USB"
+  </dest>
+  <voice>
+    *: none
+    usb_charging: "Charge During U S B Connection"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_LCD_OFF
+  desc: Remote lcd off splash in recording screen
+  user:
+  <source>
+    *: none
+    remote: "Remote Display OFF"
+  </source>
+  <dest>
+    *: none
+    remote: "Display Remoto OFF"
+  </dest>
+  <voice>
+    *: none
+    remote: "Remote Display OFF"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SOURCE_FREQUENCY
+  desc: when recording source frequency setting must follow source
+  user:
+  <source>
+    *: none
+    recording: "(Same As Source)"
+  </source>
+  <dest>
+    *: none
+    recording: "(Igual à Fonte)"
+  </dest>
+  <voice>
+    *: none
+    recording: "Same As Source"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HEADPHONE_UNPLUG_DISABLE_AUTORESUME
+  desc: in pause_phones_menu.
+  user:
+  <source>
+    *: none
+    headphone_detection: "Disable resume on startup if phones unplugged"
+  </source>
+  <dest>
+    *: none
+    headphone_detection: "Disactivar resumir ao ligar se auriculares estiverem desconectados"
+  </dest>
+  <voice>
+    *: none
+    headphone_detection: "Disable resume on startup if phones unplugged"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOOKMARK_CONTEXT_RESUME
+  desc: bookmark context menu, resume this bookmark
+  user:
+  <source>
+    *: "Resume"
+  </source>
+  <dest>
+    *: "Resumir"
+  </dest>
+  <voice>
+    *: "Resume"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PASTE
+  desc: The verb/action Paste
+  user:
+  <source>
+    *: "Paste"
+  </source>
+  <dest>
+    *: "Colar"
+  </dest>
+  <voice>
+    *: "Paste"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TALK_BATTERY_LEVEL
+  desc: Setting for spontaneous battery level announcement
+  user:
+  <source>
+    *: "Announce Battery Level"
+  </source>
+  <dest>
+    *: "Anunciar Nível da Bateria"
+  </dest>
+  <voice>
+    *: "Announce Battery Level"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FM_EUROPE
+  desc: fm tuner region europe
+  user:
+  <source>
+    *: none
+    radio: "Europe"
+  </source>
+  <dest>
+    *: none
+    radio: "Europa"
+  </dest>
+  <voice>
+    *: none
+    radio: "Europe"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECTOR_COLOR_MENU
+  desc: line selector color menu title
+  user:
+  <source>
+    *: none
+    lcd_color: "Line Selector Colours"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "Cor da Linha de Selecção"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Line Selector Colours"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_WARNING_BATTERY_LOW
+  desc: general warning
+  user:
+  <source>
+    *: "WARNING! Low Battery!"
+  </source>
+  <dest>
+    *: "AVISO! Bateria Baixa!"
+  </dest>
+  <voice>
+    *: "WARNING! Low Battery!"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYLISTVIEWER_SETTINGS
+  desc: title for the playlist viewer settings menus
+  user:
+  <source>
+    *: "Playlist Viewer Settings"
+  </source>
+  <dest>
+    *: "Definições do Visualizador da Playlist"
+  </dest>
+  <voice>
+    *: "Playlist Viewer Settings"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SET_TIME
+  desc: in settings_menu
+  user:
+  <source>
+    *: none
+    rtc: "Set Time/Date"
+  </source>
+  <dest>
+    *: none
+    rtc: "Definir Tempo/Data"
+  </dest>
+  <voice>
+    *: none
+    rtc: "Set Time and Date"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_AUTOUPDATE
+  desc: in tag cache settings
+  user:
+  <source>
+    *: "Auto Update"
+  </source>
+  <dest>
+    *: "Actualização Automática"
+  </dest>
+  <voice>
+    *: "Auto Update"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BROWSE_CUESHEET
+  desc:
+  user:
+  <source>
+    *: "Browse Cuesheet"
+  </source>
+  <dest>
+    *: "Explorar Cuesheet"
+  </dest>
+  <voice>
+    *: "Browse Cuesheet"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_MODE
+  desc: in usbstack settings
+  user:
+  <source>
+    *: none
+    usbstack: "USB Stack Mode"
+  </source>
+  <dest>
+    *: none
+    usbstack: "Modo de USB Stack"
+  </dest>
+  <voice>
+    *: none
+    usbstack: "USB Stack Mode"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLUGIN_GAMES
+  desc: in the main menu
+  user:
+  <source>
+    *: "Games"
+  </source>
+  <dest>
+    *: "Jogos"
+  </dest>
+  <voice>
+    *: "Games"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_REMOTE_SCROLL_SETS
+  desc: "Remote Scrolling Options" Submenu in "Scrolling Options" menu
+  user:
+  <source>
+    *: none
+    remote: "Remote Scrolling Options"
+  </source>
+  <dest>
+    *: none
+    remote: "Opções de Navegação Remota"
+  </dest>
+  <voice>
+    *: none
+    remote: "Remote Scrolling Options"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALARM_WAKEUP_SCREEN
+  desc: in alarm menu setting
+  user:
+  <source>
+    *: none
+    alarm: "Alarm Wake up Screen"
+  </source>
+  <dest>
+    *: none
+    alarm: "Alarme para ligar ecrã"
+  </dest>
+  <voice>
+    *: none
+    alarm: "Alarm Wake up Screen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICE_SPELL
+  desc: "talkbox" mode for files+directories
+  user:
+  <source>
+    *: "Spell"
+  </source>
+  <dest>
+    *: "Soletrar"
+  </dest>
+  <voice>
+    *: "Spell"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_TIMESPLIT_REC
+  desc: Display of record timer interval setting, on the record screen
+  user:
+  <source>
+    *: none
+    recording: "Split Time:"
+  </source>
+  <dest>
+    *: none
+    recording: "Tempo de Separação:"
+  </dest>
+  <voice>
+    *: none
+    recording: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_BITRATE
+  desc: in tag viewer
+  user:
+  <source>
+    *: "[Bitrate]"
+  </source>
+  <dest>
+    *: "[Taxa de Bits]"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PITCH_DOWN_SEMITONE
+  desc: in wps
+  user:
+  <source>
+    *: none
+    pitchscreen: "Semitone Down"
+  </source>
+  <dest>
+    *: none
+    pitchscreen: "Semitom Abaixo"
+  </dest>
+  <voice>
+    *: none
+    pitchscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CATALOG
+  desc: in onplay menu
+  user:
+  <source>
+    *: "Playlist Catalog"
+  </source>
+  <dest>
+    *: "Catálogo de Playlists"
+  </dest>
+  <voice>
+    *: "Playlist Catalog"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_LENGTH
+  desc: in tag viewer
+  user:
+  <source>
+    *: "[Length]"
+  </source>
+  <dest>
+    *: "[Comprimento]"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RUNNING_TIME
+  desc: in run time screen
+  user:
+  <source>
+    *: "Running Time"
+  </source>
+  <dest>
+    *: "Tempo Ligado"
+  </dest>
+  <voice>
+    *: "Running Time"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HEADPHONE_UNPLUG_RW
+  desc: in pause_phones_menu.
+  user:
+  <source>
+    *: none
+    headphone_detection: "Duration to Rewind"
+  </source>
+  <dest>
+    *: none
+    headphone_detection: "Duração para Retroceder"
+  </dest>
+  <voice>
+    *: none
+    headphone_detection: "Duration to Rewind"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SPLIT_TIME
+  desc: in record timesplit options
+  user:
+  <source>
+    *: none
+    recording: "Split Time"
+  </source>
+  <dest>
+    *: none
+    recording: "Tempo de Separação"
+  </dest>
+  <voice>
+    *: none
+    recording: "Split Time"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_DISCNUM
+  desc: in tag viewer
+  user:
+  <source>
+    *: "[Discnum]"
+  </source>
+  <dest>
+    *: "[Número do Disco]"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_ALBUMARTIST
+  desc: in tag viewer
+  user:
+  <source>
+    *: "[Album Artist]"
+  </source>
+  <dest>
+    *: "[Artista do Álbum]"
+  </dest>
+  <voice>
+    *: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CLEAR_TIME
+  desc: in run time screen
+  user:
+  <source>
+    *: "Clear Time?"
+  </source>
+  <dest>
+    *: "Limpar o tempo?"
+  </dest>
+  <voice>
+    *: "Clear Time?"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BACKLIGHT_ON_BUTTON_HOLD
+  desc: in lcd settings
+  user:
+  <source>
+    *: none
+    hold_button: "Backlight on Hold"
+  </source>
+  <dest>
+    *: none
+    hold_button: "Retro-iluminação quando Bloquado"
+  </dest>
+  <voice>
+    *: none
+    hold_button: "Backlight on hold"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CROSSFEED_DIRECT_GAIN
+  desc: in crossfeed settings
+  user:
+  <source>
+    *: none
+    swcodec: "Direct Gain"
+  </source>
+  <dest>
+    *: none
+    swcodec: "Ganho Directo"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Direct gain"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGCACHE_FORCE_UPDATE_SPLASH
+  desc: in tag cache settings
+  user:
+  <source>
+    *: "Updating in background"
+  </source>
+  <dest>
+    *: "Actualizando em plano de fundo"
+  </dest>
+  <voice>
+    *: "Updating in background"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HIGH
+  desc: in settings_menu
+  user:
+  <source>
+    *: none
+    gigabeatf: "High"
+  </source>
+  <dest>
+    *: none
+    gigabeatf: "Alto"
+  </dest>
+  <voice>
+    *: none
+    gigabeatf: "High"
+  </voice>
+</phrase>

apps/lang/russian.lang

@@ -23,6 +23,7 @@
 # - Adrian Osoianu
 # - Dennis Ivanov
 # - Alexander Levin
+# - Anton Veretenenko
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -140,15 +141,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "Перезапускаю воспроизведение..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -4086,18 +4087,21 @@
   user:
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
-    e200*,c200: "mSD"
+    multivolume: "HD1"
+    e200*,c200: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    e200*,c200: "mSD"
-    ondio*: "MMC:"
+    multivolume: "Эйч Ди 1"
+    e200*,c200: "микро Эс Ди"
+    ondio*: "Эм Эм Си"
   </voice>
 </phrase>
 <phrase>
@@ -6955,6 +6959,8 @@
     ipod*: "PLAY/PAUSE to abort"
     x5,m5: "Long PLAY to abort"
     h10,h10_5gb,e200*,c200: "PREV to abort"
+    gigabeats: "BACK to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "ВЫКЛ. для отмены"
@@ -6962,6 +6968,8 @@
     ipod*: "ПАУЗА для отмены"
     x5,m5: "ВОСПР. для отмены"
     h10,h10_5gb,e200*,c200: "ПРЕД. для отмены"
+    gigabeats: "НАЗАД для отмены"
+    gigabeatf: "ВЫКЛ. для отмены"
   </dest>
   <voice>
     *: ""
@@ -7336,11 +7344,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Режим редактир.: %s"
+    swcodec: "Режим редактир.: %s %s"
   </dest>
   <voice>
     *: none
@@ -7353,11 +7361,11 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
-    swcodec: "Частота среза"
+    swcodec: "Срез"
   </dest>
   <voice>
     *: none
@@ -8142,18 +8150,18 @@
     *: "Building database... %d found (OFF to return)"
     h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeat*,mrobe100: "Building database... %d found (LEFT to return)"
+    h10,h10_5gb,e200*,c200,sa9200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
     *: "Построение базы... %d найдено (ВЫКЛ. для отмены)"
     h100,h120,h300: "Построение базы... %d найдено (СТОП для отмены)"
     ipod*: "Построение базы... %d найдено (ПРЕД. для отмены)"
+    x5,m5,gigabeat*,mrobe100: "Построение базы... %d найдено (ВЛЕВО для отмены)"
+    h10,h10_5gb,e200*,c200,sa9200: "Построение базы... %d найдено (ПРЕД. для отмены)"
   </dest>
   <voice>
     *: "найдено записей в базе"
-    h100,h120,h300: ""
-    ipod*: ""
-    x5,m5,gigabeat*,mrobe100: ""
-    h10,h10_5gb,e200*,c200,sa9200: ""
   </voice>
 </phrase>
 <phrase>
@@ -11986,3 +11994,201 @@
     agc: "Длительность автоподстройки"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user:
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "Обложка альбома:"
+  </dest>
+  <voice>
+    *: none
+    albumart: "Обложка альбома"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "Моно Левый + Правый"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Моно, Левый плюс Правый"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Установить как левую кнопку на быстром экране"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Установить как левую кнопку на быстром экране"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "Сбросить настройки"
+  </dest>
+  <voice>
+    *: "Сбросить настройки"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Установить как нижнюю кнопку на быстром экране"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Установить как нижнюю кнопку на быстром экране"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "Установить как правую кнопку на быстром экране"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "Установить как правую кнопку на быстром экране"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH_RESULTS
+  desc: title for the list of results displayed after searching in a playlist
+  user:
+  <source>
+    *: "Search Results"
+  </source>
+  <dest>
+    *: "Результаты поиска"
+  </dest>
+  <voice>
+    *: "Результаты поиска"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_MONO_MODE
+  desc: in the recording settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono mode"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "Режим моно"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "Режим моно"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>

apps/lang/srpski.lang

@@ -1311,7 +1311,7 @@
   </dest>
   <voice>
     *: none
-    masf: "Време опадања за AV"
+    masf: ""
   </voice>
 </phrase>
 <phrase>
@@ -1987,7 +1987,7 @@
 </phrase>
 <phrase>
   id: LANG_ID3_ORDER
-  desc: DEPRECATED 
+  desc: DEPRECATED
   user:
   <source>
     *: ""
@@ -2001,7 +2001,7 @@
 </phrase>
 <phrase>
   id: LANG_ID3_V1_FIRST
-  desc: DEPRECATED 
+  desc: DEPRECATED
   user:
   <source>
     *: ""
@@ -2015,7 +2015,7 @@
 </phrase>
 <phrase>
   id: LANG_ID3_V2_FIRST
-  desc: DEPRECATED 
+  desc: DEPRECATED
   user:
   <source>
     *: ""
@@ -3089,7 +3089,7 @@
     *: "Пример за изабрану брзину скроловања"
   </dest>
   <voice>
-    *: "Пример за изабрану брзину скроловања"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -5283,7 +5283,7 @@
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: "Мени"
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
@@ -5300,7 +5300,7 @@
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: "Излаз"
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
@@ -5317,7 +5317,7 @@
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: "Акција"
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
@@ -5351,7 +5351,7 @@
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: "Додај"
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
@@ -5368,7 +5368,7 @@
   </dest>
   <voice>
     *: none
-    radio_screen_button_bar: "Снимај"
+    radio_screen_button_bar: ""
   </voice>
 </phrase>
 <phrase>
@@ -5402,7 +5402,7 @@
   </dest>
   <voice>
     *: none
-    radio: "Екран је замрзнут!"
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -6425,7 +6425,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Пред-снимање"
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -7333,7 +7333,7 @@
     *: "Нема плејлисти"
   </dest>
   <voice>
-    *: ""
+    *: "Нема плејлисти"
   </voice>
 </phrase>
 <phrase>
@@ -7885,7 +7885,7 @@
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Позадина учитана"
+    lcd_non-mono: ""
   </voice>
 </phrase>
 <phrase>
@@ -7902,7 +7902,7 @@
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Учитавање позадине није успело"
+    lcd_non-mono: ""
   </voice>
 </phrase>
 <phrase>
@@ -7992,7 +7992,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "Навише"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -8009,7 +8009,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "Наниже"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -8026,7 +8026,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "Полустепен горе"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -8043,7 +8043,7 @@
   </dest>
   <voice>
     *: none
-    pitchscreen: "Полустепен доле"
+    pitchscreen: ""
   </voice>
 </phrase>
 <phrase>
@@ -8088,7 +8088,7 @@
     *: "Креирам"
   </dest>
   <voice>
-    *: "Креирам"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8228,7 +8228,7 @@
     *: "Мод:"
   </dest>
   <voice>
-    *: "Мод"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8273,7 +8273,7 @@
     *: "Тастери закључани"
   </dest>
   <voice>
-    *: "Тастери закључани"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8287,7 +8287,7 @@
     *: "Тастери откључани"
   </dest>
   <voice>
-    *: "Тастери откључани"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8304,7 +8304,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Време"
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -10040,7 +10040,7 @@
     *: ""
   </source>
   <dest>
-     *: ""
+    *: ""
   </dest>
   <voice>
     *: "cuesheet"
@@ -10151,11 +10151,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Mod izmene: %s"
+    swcodec: "Mod izmene: %s %s"
   </dest>
   <voice>
     *: none
@@ -10168,15 +10168,15 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
-    swcodec: "Granicna frekvencija"
+    swcodec: "Granicna"
   </dest>
   <voice>
     *: none
-    swcodec: "Granicna frekvencija"
+    swcodec: "Granicna"
   </voice>
 </phrase>
 <phrase>
@@ -11446,7 +11446,7 @@
     multivolume: "Није присутна"
   </voice>
 </phrase>
-<phrase>  
+<phrase>
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user:
@@ -11688,7 +11688,7 @@
 <phrase>
   id: LANG_STOP_RECORDING_AND_SHUTDOWN
   desc: in record timesplit options
-  user: 
+  user:
   <source>
     *: none
     recording: "Stop Recording And Shutdown"

apps/lang/walon.lang

@@ -833,11 +833,11 @@
   </source>
   <dest>
     *: none
-    swcodec: "Crossfeed"
+    swcodec: "Ahessaedje mitan-croejhlé"
   </dest>
   <voice>
     *: none
-    swcodec: "Crossfeed"
+    swcodec: "ahessaedje mitan-croejhlé"
   </voice>
 </phrase>
 <phrase>
@@ -2276,10 +2276,10 @@
     *: "By Type"
   </source>
   <dest>
-    *: "Pa Sôre"
+    *: "Pal sôre"
   </dest>
   <voice>
-    *: "By Type"
+    *: "Pal sôre"
   </voice>
 </phrase>
 <phrase>
@@ -6758,7 +6758,7 @@
     *: "%d bokets (%s) schapés"
   </dest>
   <voice>
-    *: ""
+    *: "Bokets schapés"
   </voice>
 </phrase>
 <phrase>
@@ -6953,13 +6953,13 @@
   </source>
   <dest>
     *: none
-    multivolume: "HD1"
+    multivolume: "DP1"
     e200*,c200: "MSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
-    multivolume: "H D 1"
+    multivolume: "D P 1"
     e200*,c200: "micro S D"
     ondio*: "M M C"
   </voice>
@@ -9945,7 +9945,7 @@
     *: ""
   </source>
   <dest>
-    *: deprecated
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -10997,7 +10997,7 @@
     *: "[Work]"
   </source>
   <dest>
-    *: "[Work]"
+    *: "[Ouve]"
   </dest>
   <voice>
     *: ""
@@ -11753,7 +11753,7 @@
     *: "Foirt londjin"
   </dest>
   <voice>
-    *: "Very slow"
+    *: "Foirt londjin"
   </voice>
 </phrase>
 <phrase>

apps/onplay.c

@@ -966,7 +966,8 @@ static int ratingitem_callback(int action,const struct menu_item_ex *this_item)
     switch (action)
     {
         case ACTION_REQUEST_MENUITEM:
-            if (!selected_file || !global_settings.runtimedb)
+            if (!selected_file || !global_settings.runtimedb ||
+                !tagcache_is_usable())
                 return ACTION_EXIT_MENUITEM;
             break;
     }

apps/plugins/SOURCES

@@ -28,8 +28,12 @@ lamp.c
 #ifndef OLYMPUS_MROBE_500
 
 #if (CONFIG_CODEC == SWCODEC) || !defined(SIMULATOR)
+
+/* button maps are broken on the following */
+#if !defined(SANSA_C200) && !defined(ARCHOS_ONDIOSP) && !defined(ARCHOS_ONDIOFM) && !defined(ARCHOS_PLAYER)
 metronome.c
 #endif
+#endif
 
 #if ((CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F)) && !defined(SIMULATOR)
 wavplay.c

docs/CREDITS

@@ -439,6 +439,10 @@ Anton Veretenenko
 Vicente Ibarra
 Rui Araújo
 Brian Cloutier
+Yoshihisa Uchida
+Sanggon Lee
+Anton Veretenenko
+Kaspar Rothenfußer
 
 
 The libmad team

docs/CREDITS-MANUAL

@@ -31,4 +31,4 @@ Philippe Latulippe
 Costas Calamvokis
 Peter Harley
 Will Robertson
-
+Robert Menes

manual/advanced_topics/archos-flashing.tex

@@ -59,7 +59,7 @@ The replacement firmware contains a bootloader and two images. The first image
 is the \emph{permanent} rescue software, to be used in case something is wrong
 with the second (main) image. In current firmware files this first image
 contains \emph{Bootbox} (see wiki for details). The second image is what is
-booted by default. The current firmware files contain a copy of Rockbox 3.0.1
+booted by default. The current firmware files contain a copy of Rockbox 3.1
 in the main image. It can easily be updated/replaced later.
 
 The bootloader allows to select which image to run. Pressing

manual/appendix/appendix.tex

@@ -7,8 +7,6 @@
 
 \input{appendix/config_file_options.tex}
 
-\input{appendix/menu_structure.tex}
-
 \chapter{User feedback}\label{sec:feedback}
 \section{Bug reports}
 If you experience inappropriate performance from any supported feature,
@@ -115,9 +113,7 @@ The recording hardware (the MAS) does not allow us to do this
   done when connected to a host computer.
 \end{itemize}
 
-\chapter{Changelog}
-\section{What is new since v2.5?}
-Changes in version 2.5
+\input{appendix/changelog.tex}
 
 \chapter{Credits}
 People that have contributed to the project, one way or another. Friends!

manual/appendix/changelog.tex

@@ -0,0 +1,149 @@
+\chapter{\label{ref:changelog}Changelog}
+\section{What is new since v3.0?}
+
+\subsection{New features}
+\begin{changelog}
+\item 2008-12-09: Album Art resizing.
+\item 2008-12-09: FM radio support on Gigabeat S.
+\item 2008-11-26: Software controlled backlight fading for targets without hardware fading (e200v1, c200v1, X5, Cowon D2 and H300)
+\end{changelog}
+
+\subsection{Enhancements}
+\begin{changelog}
+\item 2008-12-01: Several new tags were added to the WPS syntax
+\item 2008-11-20: The build system received a major overhaul
+\item 2008-11-03: Customisable options in the QuickScreen
+\item 2008-10-25: Calendar plugin on all RTC equipped targets
+\item 2008-10-08: Configurable mono recording mode
+\item 2008-10-07: Support for version 1.1 scrobbler log files
+\item 2008-10-03: APE playback optimized
+\item 2008-09-21: MP3 playback optimized for dual-core targets
+\end{changelog}
+
+\section{What is new since v2.5?}
+
+\subsection{New features}
+\begin{changelog}
+\item 2008-07-07: Added keybox plugin
+\item 2008-05-04: Added study mode
+\item 2008-04-23: Lamp (originally "flashlight") plugin
+\item 2008-03-23: New bitmap strips feature in the WPS
+\item 2008-03-21: Viewport tag added for WPS
+\item 2008-03-18: The Olympus m:robe 100 is now a supported target
+\item 2007-12-09: PictureFlow: A nice animated visualization for album art
+\item 2007-11-26: Matrix Demo
+\item 2007-11-11: Rockbox can now display album art
+\item 2007-09-06: Sound on Sansa c200
+\item 2007-09-04: The SanDisk Sansa e200R models are now Rockboxed!
+\item 2007-08-06: Make several splashes and confirmation screens speak
+\item 2007-08-03: iPod 3rd gen is now officially a supported target 
+\item 2007-08-02: Superdom game
+\item 2007-07-27: Sound on iPod 2nd Gen
+\item 2007-07-25: Jackpot support for bitmap targets
+\item 2007-06-30: Reversi game
+\item 2007-06-29: Rocklife plugin
+\item 2007-06-28: Maze game
+\item 2007-06-17: Custom filetype colour feature introduced 
+\item 2007-05-23: The 80GB Ipod Video is now supported by Rockbox
+\item 2007-04-09: WAV file viewer
+\item 2007-03-11: Sound on the Sansa e200
+\item 2007-03-04: Rockbox runs and plays music on the iAudio M5
+\item 2007-03-01: Add the Rockbox Menu
+\item 2007-02-16: Chopper game
+\item 2007-02-14: Cuesheet support
+\item 2007-02-14: Icons in the menus
+\item 2007-02-10: Album Artist and Comment Tag Support
+\item 2007-02-09: Speex Codec Support
+\item 2007-01-31: Invadrox, a Space Invaders clone
+\item 2007-01-16: BlackJack plugin
+\item 2007-01-02: Mazezam, a puzzle game for all bitmap lcd targets
+\item 2006-12-29: Toshiba Gigabeat X and F series support
+\item 2006-11-30: File properties in context menu
+\item 2006-11-06: Samplerate and format selection added to recording
+  settings. Encoders can be configured individually on a menu specific
+  to the encoder in the recording menu
+\item 2006-11-06: Pitch adjustment in semitone steps
+\item 2006-10-27: Audio dithering option
+\item 2006-10-19: last.fm (audioscrobbler) logging support
+\item 2006-10-05: FM radio region setting
+\item 2006-09-15: ZX spectrum emulator plugin - zxbox
+\item 2006-08-28: Encoder Codec Interface for recording with
+  additional FM recording support
+\item 2006-08-07: Initial version of mpegplayer plugin
+\item 2006-07-19: Rockpaint plugin
+\item 2006-07-18: Playlist catalog
+\item 2006-04-19: Rockbox is functional and plays audio on the iPod Mini 1G
+\item 2006-03-30: Rockbox is functional and plays audio on the iPod Mini 2G
+\item 2006-03-28: DOOM
+\item 2006-03-28: Sound on the iAudio X5 , X5L and X5V
+\item 2006-03-26: Experimental WAV playback plugin for Archos Recorder/Ondio
+\item 2006-03-26: Initial version of Tag Cache
+\item 2006-03-20: Bubbles, a bubble game
+\item 2006-03-19: Tetrox, a Tetris clone
+\item 2006-03-12: Xobox, a Xonix/Qix clone
+\item 2006-03-11: Pacbox, a pacman arcade machine emulator
+\item 2006-02-22: "Chessbox" chess game plugin
+\item 2006-02-13: iPod 5G audio playback
+\item 2006-01-28: Color bitmap support in the WPS (for color models)
+\item 2006-01-23: Brickmania game plugin
+\item 2005-12-06: Unicode support
+\item 2005-11-05: Jewels game plugin - a Bejeweled clone.
+\end{changelog}
+
+\subsection{Enhancements}
+\begin{changelog}
+\item 2008-08-06: Redesigned recording screen
+\item 2008-02-23: New default theme: cabbie 2.0
+\item 2008-01-04: All new greyscale library with improved performance
+\item 2007-08-08: Added support for grouping tags
+\item 2007-08-06: Organise the plugins into categories
+\item 2007-08-05: Voice file changes. Older voices no longer work, now
+  all voice files are target-specific.
+\item 2007-08-03: Added support for the disc number tag
+\item 2007-04-04: WPS tokenizer: Rewritten WPS code
+\item 2007-03-20: rockbox.* file moved inside /.rockbox directory
+\item 2007-01-23: Settings are now saved to /.rockbox/config.cfg and
+  the hidden config sector is not used anymore
+\item 2006-11-29: Playlists are saved with the extension .m3u8,
+  extension .m3u is now read using the chosen codepage
+\item 2006-09-16: New scheduler. Audio playback is now prioritised
+  over other tasks
+\item 2006-09-02: Enhanced statusbar in recording screen
+\item 2006-08-15: Support for displaying the path in the file browser
+\item 2006-02-07: Equalizer configuration for software codec platforms
+\item 2006-02-06: The Rockbox manual is available in \LaTeX format
+\item 2005-12-05: New wps' added. Engineeer2, marquee, and DancePuffDuo
+\end{changelog}
+
+\subsection{New codecs supported}
+\subsubsection{Lossy codecs}
+\begin{changelog}
+\item Ogg/vorbis
+\item MPC
+\item A/52 (AC3)
+\item AAC (MP4)
+\item WMA
+\item ADX
+\item Speex
+\end{changelog}
+
+\subsubsection{Lossless codecs}
+\begin{changelog}
+\item WAV
+\item AIFF
+\item FLAC
+\item ALAC
+\item Wavpack
+\item Shorten
+\item Monkey's Audio
+\end{changelog}
+
+\subsubsection{Other codecs}
+\begin{changelog}
+\item SID
+\item MOD
+\item NSF, NSFE
+\item SPC
+\item MIDI
+\item SAP
+\end{changelog}

manual/appendix/config_file_options.tex

@@ -17,7 +17,7 @@
                   \opt{ipodvideo}{-57 to +6}%
                   \opt{x5}{-73 to +6}
                   \opt{e200}{-74 to +6}
-                  \opt{ipodcolor}{-\fixme{??} to +\fixme{??}}%
+                  \opt{ipodcolor}{-74 to +6}%
                                         & dB\\
     \nopt{x5}{%
       bass      & \opt{MASCODEC}{-15 to +15}%
@@ -45,7 +45,6 @@
     seek acceleration & very fast, fast, normal, slow, very slow & N/A\\
     antiskip        & 5s, 15s, 30s, 1min, 2min, 3min, 5min, 10min & N/A\\
     volume fade     & on, off           & N/A\\
-    id3 tag priority & v2-v1, v1-v2     & N/A\\
     sort case       & on, off           & N/A\\
     show files      & all, supported, music, playlists & N/A\\
     show filename exts & off, on, unknown, view\_all & N/A\\
@@ -61,8 +60,8 @@
                     & on, off, ask      & N/A\\
     scroll speed    & 1 to 25           & Hz\\
     scroll delay    & 0 to 2500         & ms\\
-    scroll step     & \fixme{devise a way to get ranges from config-*.h} & pixels\\
-    screen scroll step & \fixme{devise a way to get ranges from config-*.h} & pixels\\
+    scroll step     & & pixels\\
+    screen scroll step & & pixels\\
     Screen Scrolls Out Of View & on, off & N/A\\
     bidir limit     & 0 to 200          & \% screen\\
     scroll paginated & on, off & N/A\\
@@ -80,9 +79,9 @@
     backlight filters first keypress & on, off & N/A\\
     backlight on button hold & normal, off, on & N/A\\
     caption backlight & on, off & N/A\\
-    brightness      & \fixme{devise a way to get ranges from config-*.h} & N/A\\
+    brightness      & & N/A\\
     disk spindown   & 3 to 254          & seconds\\
-    battery capacity & \fixme{devise a way to get ranges from config-*.h} & mAh\\
+    battery capacity & & mAh\\
     \opt{battery_types}{
       battery type  & alkaline, nimh    & N/A\\
     }

manual/configure_rockbox/playback_options.tex

@@ -60,38 +60,29 @@ related to audio playback.
   These settings control the speed and acceleration during fast forward and rewind.
   The setting \setting{FF/RW Min Step} controls the initial speed and \setting{FF/RW Accel} controls the acceleration.
 
-\section{Anti-Skip Buffer}
-  This setting allows you to control how much music is
-  stored in the \daps{} memory whilst playing a song, acting as a buffer
-  against shock or playback problems. The \dap{} transfers the selected
-  amount of the forthcoming song into its memory at high speed whilst you are
-  playing the song. It keeps a ``rolling'' buffer, which keeps feeding more
-  of the forthcoming song into memory as it goes along.
-  If the \dap{} is knocked, shaken or jogged heavily while Rockbox is trying
-  to read the hard drive, Rockbox might not be able to read the drive.
-  Rockbox will retry over and over again until it succeeds, but may
-  eventually reach the end of the memory buffer. When that happens, Rockbox
-  must stop playing and wait for more data from the disk, which causes your
-  music to skip. The anti-skip setting tells Rockbox how much extra buffer
-  memory to spare to handle this situation. This setting therefore allows you
-  to reduce the chances of there being a gap or pause during playback of
-  songs.
-    
-  \nopt{ondio}{
-    \opt{MASCODEC}{The anti-skip buffer can be set to a value between 0 and 7
-      seconds.}
-  }%
-  \opt{ondio}{
-    The anti-skip buffer can safely be kept at zero. It will eventually be 
-    eliminated.
-  }%
-  \opt{swcodec}{The anti-skip buffer can be set to various values between
-    5 seconds and 10 minutes.}%
+\opt{disk_storage}{
+  \section{Anti-Skip Buffer}
+    This setting controls how early Rockbox starts refilling the music buffer
+    from the hard drive when playing. A longer Anti-Skip Buffer helps prevent
+    skips in music playback if Rockbox has trouble reading from the disk.
+    This can happen if the \dap{} is knocked, shaken or jogged heavily while
+    Rockbox is trying to read the hard drive.
+
+    \opt{MASCODEC}{
+      The anti-skip buffer can be set to a value between 0 and 7
+      seconds.
+    }
+
+    \opt{swcodec}{
+      The anti-skip buffer can be set to various values between
+      5 seconds and 10 minutes.
+    }
+
+    \note{Having a large anti-skip buffer tends to use more power, and may
+      reduce your battery life. It is recommended to always use the lowest
+      possible setting that allows correct and continuous playback.}
+}
 
-  \note{Having a large anti-skip buffer tends to use more power, and may
-    reduce your battery life. It is recommended to always use the lowest
-    possible setting that allows correct and continuous playback.}
-    
 \section{Fade on Stop/Pause}
   Enables and disables a fade effect when you
   pause or stop playing a song. If the Fade on Stop/Pause option is

manual/getting_started/installation.tex

@@ -219,10 +219,20 @@ you want to install and get the appropriate version for your \dap{}.
 
 \begin{description}
 
-\item[Release.] The release version is the latest stable release, free
-  of known critical bugs. The current stable release of Rockbox, version
-  3.0, is available at \url{http://www.rockbox.org/download/}.
-  
+\item[Release.]
+  \opt{release30}{The release version is the latest stable release, free
+      of known critical bugs. The current stable release of Rockbox, version
+      3.0, is available at \url{http://www.rockbox.org/download/}.
+  }
+  \opt{release31}{The release version is the latest stable release, free
+      of known critical bugs. The current stable release of Rockbox, version
+      3.1, is available at \url{http://www.rockbox.org/download/}.
+  }
+  \opt{unreleased}{
+      There has not yet been a stable release for the \playername{}. Until
+      there is one, use a current build.
+  }
+
 \item[Current Build.] The current build is built at each source code change to
   the Rockbox SVN repository and represents the current state of Rockbox
   development. This means that the build could contain bugs but most of

manual/getting_started/ipod_install.tex

@@ -1,6 +1,6 @@
 % $Id$ %
 
-\opt{ipodnano}{\warn{If your Nano has a stainless steel back and plastic front 
+\opt{ipodnano}{\warn{If your Nano has a stainless steel back and plastic front,  
 it is a 1st generation and is compatible with Rockbox.  If, on the other hand, 
 your Nano has a one-piece aluminum body it is a 2nd generation Nano and there 
 is currently no Rockbox port available.  Do not attempt to install the 
@@ -17,19 +17,28 @@ step once.
 \begin{enumerate}
 
 \item Make sure you are logged into your computer as Administrator, or a 
-user with Administrator privileges and connect your \dap{}.
+user with Administrator privileges and connect your \dap{}. If you have
+configured iTunes to open automatically when your \dap{} is attached
+(the default behaviour), then wait for it to open and then quit it. You
+also need to ensure the ``Enable use as disk'' option is enabled for
+your \dap{} in iTunes.
 
 \item Download ipodpatcher.exe from 
 \download{bootloader/ipod/ipodpatcher/win32/ipodpatcher.exe} 
 and run it.
 
 \item If all has gone well, you should see some information displayed about
-your ipod and a message asking you if you wish to install the Rockbox
+your \dap{} and a message asking you if you wish to install the Rockbox
 bootloader. Press i followed by ENTER, and ipodpatcher will now
 install the bootloader. After a short time you should see the message
 ``[INFO] Bootloader installed successfully.'' Press ENTER again to exit
 ipodpatcher.
 
+\item \note{If ipodpatcher fails to install the bootloader for you, please
+be certain that you do indeed have a supported iPod model. If you do, run
+ipodpatcher once more and try again. If you don't, then do not attempt to
+install again.}
+
 \item Make sure that you have correctly extracted a build of Rockbox so that
 you have a \fname{/.rockbox}, which contains all the files needed by Rockbox
 in the root of your \daps{} drive and that you have also installed the fonts
@@ -44,20 +53,16 @@ package -- see \reference{sec:installing_fonts} for more information.
 \begin{enumerate}
 
 \item Attach your \dap{} to your Mac and wait for its icon to appear in 
-Finder. If you have configured itunes to open automatically when your
+Finder. If you have configured iTunes to open automatically when your
 \dap{} is attached (the default behaviour), then wait for it to open and
 then quit it. You also need to ensure the ``Enable use as disk'' option
-is enabled for your \dap{} in itunes.
-
-\item\label{subsec:macos_umount} Open up Disk Utility
-(in Applications $\rightarrow$ Utilities) and click 
-on the name of your \dap{} (e.g. DAVES IPOD) in the list on the left 
-pane. Then click on the ``unmount'' icon at the top. \warn{Do \emph{not}
-click on the ``eject'' icon.}
+is enabled for your \dap{} in iTunes.
 
 \item Download and open ipodpatcher.dmg from 
 \download{bootloader/ipod/ipodpatcher/macosx/ipodpatcher.dmg} 
-and then double-click on the ipodpatcher icon inside. 
+and then double-click on the ipodpatcher icon inside. You can also
+drag the ipodpatcher icon to a location on your hard drive and launch
+it from the Terminal.
 
 \item If all has gone well, you should see some 
 information displayed about your \dap{} and a message asking you if you 
@@ -66,10 +71,11 @@ ipodpatcher will now install the bootloader. After a short time you
 should see the message ``[INFO] Bootloader installed successfully.'' Press 
 ENTER again to exit ipodpatcher and then quit the Terminal application.
 
-\item \warn{If you received a ``Resource busy'' error from 
-ipodpatcher, then this means you did not complete step 
-\ref{subsec:macos_umount}. Go back to Disk Utility, unmount your
-\dap{} and then run ipodpatcher again.}
+\item \note{If ipodpatcher fails to install the bootloader for you, please
+be certain that you do indeed have a supported iPod model. If you do, run
+ipodpatcher once more and try again. If you don't, then do not attempt to
+install again.}
+
 
 \item Your \dap{} will now automatically reconnect itself to your Mac. 
 Wait for it to connect, and then eject and unplug it in the normal way. 
@@ -108,7 +114,7 @@ steps will assume you have saved it in your home directory.
 sufficient permission to perform raw disk access to your \dap{}.}
 
 \item If all has gone well, you should see some information displayed about
-your ipod and a message asking you if you wish to install the Rockbox
+your \dap{} and a message asking you if you wish to install the Rockbox
 bootloader. Press i followed by ENTER, and ipodpatcher will now install the
 bootloader. After a short time you should see the message ``[INFO] Bootloader
 installed successfully.'' Press ENTER again to exit ipodpatcher.

manual/platform/c200.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Sansa}
 \newcommand{\playertype}{c200}

manual/platform/e200.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,sansa}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Sansa}
 \newcommand{\playertype}{e200}

manual/platform/gigabeatf.tex

@@ -7,6 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,gigabeat}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Toshiba}
 \newcommand{\playertype}{Gigabeat F Series}

manual/platform/gigabeats.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,gigabeat}
+\edef\UseOption{\UseOption,unreleased}
 
 \newcommand{\playerman}{Toshiba}
 \newcommand{\playertype}{Gigabeat S Series}

manual/platform/h10.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H10}

manual/platform/h100.tex

@@ -7,6 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H100}

manual/platform/h10_5gb.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iriver}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H10}

manual/platform/h300.tex

@@ -7,6 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,iriver}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iriver}
 \newcommand{\playertype}{H3xx}

manual/platform/ipod1g2g.tex

@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{1G / 2G}

manual/platform/ipod3g.tex

@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{3G}

manual/platform/ipod4g.tex

@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{4G}

manual/platform/ipodcolor.tex

@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Color}

manual/platform/ipodmini.tex

@@ -5,6 +5,7 @@
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,ipod}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Mini}

manual/platform/ipodnano.tex

@@ -4,6 +4,7 @@
 \edef\UseOption{\UseOption,IPOD_4G_PAD}
 \edef\UseOption{\UseOption,HAVE_BACKLIGHT}
 \edef\UseOption{\UseOption,ipod}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Nano}

manual/platform/ipodvideo.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,ipod}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Ipod}
 \newcommand{\playertype}{Video}

manual/platform/m5.tex

@@ -7,6 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iaudio}
 \newcommand{\playertype}{M5}

manual/platform/mrobe100.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_BUTTON_LIGHTS}
 \edef\UseOption{\UseOption,olympus}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Olympus}
 \newcommand{\playertype}{m:robe 100}

manual/platform/ondiofm.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,MASCODEC}
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Ondio}

manual/platform/ondiosp.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,ONDIO_PAD}
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Ondio}

manual/platform/player.tex

@@ -7,6 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
 \edef\UseOption{\UseOption,rombox}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Studio/Player}

manual/platform/recorder.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Recorder}

manual/platform/recorderv2fm.tex

@@ -6,6 +6,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,archos}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Archos}
 \newcommand{\playertype}{Recorder V2/FM}

manual/platform/x5.tex

@@ -7,6 +7,7 @@
 \edef\UseOption{\UseOption,HAVE_DISK_STORAGE}
 \edef\UseOption{\UseOption,HAVE_CAR_ADAPTER_MODE}
 \edef\UseOption{\UseOption,iaudio}
+\edef\UseOption{\UseOption,release31}
 
 \newcommand{\playerman}{Iaudio}
 \newcommand{\playertype}{X5}

manual/plugins/doom.tex

@@ -133,4 +133,3 @@ Rockdoom options, you will need to quit your current game and restart the plugin
 \subsubsection{Playing the game}
 After installation of the \fname{wad} files is complete you can start the
 game.
-\fixme{more description is needed}

manual/plugins/main.tex

@@ -168,7 +168,8 @@ the associated file. Viewers are stored in the
 
 {\input{plugins/md5sum.tex}}
 
-{\input{plugins/metronome.tex}}
+\nopt{player,ondio,c200}{\input{plugins/metronome.tex}
+}
 
 {\input{plugins/random_folder_advance_config.tex}}
 

manual/rockbox_interface/main.tex

@@ -502,8 +502,28 @@ With the \dap{} connected to the computer as an MSC/UMS device (like a
 USB Drive), music files can be put on the player via any standard file
 transfer method that you would use to copy files between drives (e.g. Drag 'n' Drop).
 The default directory structure that is assumed by some parts of Rockbox
-(album art searching, WPS missing-tag fallback) is: /ArtistName/AlbumName/*.ext.
-See \reference{ref:Supportedaudioformats} for a list of supported audio formats.
+\opt{albumart}{%
+    (album art searching, and missing-tag fallback in some WPSes) uses the
+    parent directory of a song as the Album name, and the parent directory of
+    that folder as the Artist name. While files may be organized however you
+    like, the \wikilink{AlbumArt} wiki page explains the requirement for Album
+    Art to work properly, and WPSes may display information incorrectly if your
+    files are not properly tagged, and you have your music organized in a way
+    different than they assume when attempting to guess the Artist and Album
+    names from your filetree.
+}%
+\nopt{albumart}{%
+    (missing-tag fallback in some WPSes) uses the parent directory of a song
+    as the Album name, and the parent directory of that folder as the Artist
+    name. While files may be organized however you like, WPSes may display
+    information incorrectly if your files are not properly tagged, and you have
+    your music organized in a way different than they assume when attempting to
+    guess the Artist and Album names from your filetree.
+}
+\opt{swcodec}{
+    See \reference{ref:Supportedaudioformats} for a list of supported audio
+    formats.
+}
 
 \subsection{The first contact}
 

manual/working_with_playlists/main.tex

@@ -1,9 +1,5 @@
 % $Id$ %
 \section{\label{ref:working_with_playlists}Working with Playlists}
-\fixme{This section is currently in a half written state, with possible errors
-  and a lot of stuff missing. Please help us fix this chapter by submitting
-  additions/corrections to the tracker}
-
 \subsection{Playlist terminology}
 Some common terms that are used in Rockbox when referring to
 playlists:
@@ -142,7 +138,7 @@ were before shutdown.
   
 \subsection{Modifying playlists}
 \subsubsection{Reshuffling}
-Reshuffeling the current playlist is easily done from the \setting{Playlist}
+Reshuffling the current playlist is easily done from the \setting{Playlist}
 sub menu in the WPS, just select \setting{Reshuffle}.
 
 \subsubsection{Moving and removing tracks}

tools/release/bins.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.1";
 
 my $verbose;
 if($ARGV[0] eq "-v") {

tools/release/manuals.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.1";
 
 my $verbose;
 if($ARGV[0] eq "-v") {

tools/release/tarball.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-version="3.0"
+version="3.1"
 
 srcdir=.
 tempdir=rockbox-temp

tools/release/voices.pl

@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-$version="3.0";
+$version="3.1";
 
 my $verbose;
 if($ARGV[0] eq "-v") {

tools/svnversion.sh

@@ -30,7 +30,7 @@ svnversion_safe() {
                 if [ -z "$OUTPUT" ]; then
                     echo "unknown"
                 else
-                    echo "r$OUTPUT"
+                    echo "r$OUTPUT-3.1"
                 fi
             else # not a git repository
                 echo "unknown"