Fix warnings introduced in prior commit

* #define CONFIG_RTC APPLICATION  (in sim builds)
 * #define CONFIG_STORAGE 0        (in PCTOOL builds)

Change-Id: Iabb77bd0a29ca06a13d1075f1e8cedb00f785c64

.gitignore

@@ -23,6 +23,9 @@ __pycache__
 /tools/checkwps/rockbox-info.txt
 /tools/checkwps/checkwps.failures
 
+# Release
+/tools/release/output
+
 # android: java build system
 /android/bin
 /android/data

apps/SOURCES

@@ -299,4 +299,10 @@ keymaps/keymap-fiiom3k.c
 keymaps/keymap-erosq.c
 #elif CONFIG_KEYPAD == SHANLING_Q1_PAD
 keymaps/keymap-shanlingq1.c
+#elif CONFIG_KEYPAD == ECHO_R1_PAD
+keymaps/keymap-echor1.c
+#elif CONFIG_KEYPAD == SURFANS_F28_PAD
+keymaps/keymap-surfansf28.c
+#elif CONFIG_KEYPAD == RG_NANO_PAD
+keymaps/keymap-rgnano.c
 #endif

apps/action.c

@@ -488,7 +488,7 @@ static inline void button_flip_horizontally(int context, int *button)
     {
         newbutton |= BUTTON_LEFT;
     }
-#else
+#elif !defined(NO_BUTTON_LR)
 #warning "BUTTON_LEFT / BUTTON_RIGHT not defined!"
 #endif
 
@@ -770,7 +770,7 @@ static inline int do_auto_softlock(action_last_t *last, action_cur_t *cur)
 #if defined(HAVE_TOUCHSCREEN)
             const int touch_fakebuttons =
                 BUTTON_TOPLEFT    | BUTTON_TOPMIDDLE    | BUTTON_TOPRIGHT    |
-                BUTTON_LEFT       | BUTTON_CENTER       | BUTTON_RIGHT       |
+                BUTTON_MIDLEFT    | BUTTON_CENTER       | BUTTON_MIDRIGHT    |
                 BUTTON_BOTTOMLEFT | BUTTON_BOTTOMMIDDLE | BUTTON_BOTTOMRIGHT;
             if (has_flag(cur->button, BUTTON_TOUCHSCREEN))
                 cur->button = BUTTON_NONE;
@@ -1318,7 +1318,11 @@ int get_custom_action(int context,int timeout,
     action_cur_t current;
     init_act_cur(&current, context, timeout, get_context_map);
 
-    return get_action_worker(&action_last, &current);
+    int action = get_action_worker(&action_last, &current);
+
+    action = do_backlight(&action_last, &current, action);
+
+    return action;
 }
 
 intptr_t get_action_data(void)

apps/alarm_menu.c

@@ -74,6 +74,7 @@ int alarm_screen(void)
                     talk_value(mins_togo % 60, UNIT_MIN, true);
                     talk_force_enqueue_next();
                 }
+                /* (voiced above) */
                 splashf(HZ*2, str(LANG_ALARM_MOD_TIME_TO_GO),
                                mins_togo / 60, mins_togo % 60);
             } else {

apps/bitmaps/native/SOURCES

@@ -46,7 +46,7 @@ toolsicon.130x130x16.bmp
 hibyicon.70x70x16.bmp
 rockboxicon.70x70x16.bmp
 toolsicon.70x70x16.bmp
-#elif (defined(XDUOO_X3II) || defined(XDUOO_X20) || defined(EROS_Q))
+#elif (defined(XDUOO_X3II) || defined(XDUOO_X20) || defined(EROS_Q) || defined(SURFANS_F28))
 hibyicon.130x130x16.bmp
 rockboxicon.130x130x16.bmp
 toolsicon.130x130x16.bmp

apps/buffering.c

@@ -1408,6 +1408,16 @@ ssize_t bufread(int handle_id, size_t size, void *dest)
     return size;
 }
 
+off_t bufstripsize(int handle_id, off_t size)
+{
+    struct memory_handle *h = find_handle(handle_id);
+    if (!h || h->filesize < size)
+        return ERR_INVALID_VALUE;
+
+    h->filesize = size;
+    return size;
+}
+
 /* Update the "data" pointer to make the handle's data available to the caller.
    Return the length of the available linear data or < 0 for failure (handle
    not found).

apps/buffering.h

@@ -81,6 +81,7 @@ int bufseek(int handle_id, size_t newpos);
 int bufadvance(int handle_id, off_t offset);
 off_t bufftell(int handle_id);
 ssize_t bufread(int handle_id, size_t size, void *dest);
+off_t bufstripsize(int handle_id, off_t size);
 ssize_t bufgetdata(int handle_id, size_t size, void **data);
 
 /***************************************************************************

apps/codec_thread.c

@@ -269,6 +269,7 @@ static bool codec_advance_buffer_counters(size_t amount)
 {
     if (bufadvance(ci.audio_hid, amount) < 0)
     {
+        bufseek(ci.audio_hid, ci.filesize);
         ci.curpos = ci.filesize;
         return false;
     }
@@ -440,6 +441,11 @@ static bool codec_loop_track_callback(void)
     return global_settings.repeat_mode == REPEAT_ONE;
 }
 
+void codec_strip_filesize_callback(off_t size)
+{
+    if (bufstripsize(ci.audio_hid, size) >= 0)
+        ci.filesize = size;
+}
 
 /** --- CODEC THREAD --- **/
 
@@ -647,6 +653,7 @@ void INIT_ATTR codec_thread_init(void)
     ci.configure        = codec_configure_callback;
     ci.get_command      = codec_get_command_callback;
     ci.loop_track       = codec_loop_track_callback;
+    ci.strip_filesize = codec_strip_filesize_callback;
 
     /* Init threading */
     queue_init(&codec_queue, false);

apps/codecs.c

@@ -89,9 +89,10 @@ struct codec_api ci = {
     NULL, /* configure */
     NULL, /* get_command */
     NULL, /* loop_track */
+    NULL, /* strip_filesize */
 
     /* kernel/ system */
-#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
+#if defined(ARM_NEED_DIV0)
     __div0,
 #endif
     sleep,

apps/debug_menu.c

@@ -118,10 +118,6 @@
 #include "usb_core.h"
 #endif
 
-#if defined(IPOD_ACCESSORY_PROTOCOL)
-#include "iap.h"
-#endif
-
 #include "talk.h"
 
 #if defined(HAVE_DEVICEDATA)// && !defined(SIMULATOR)
@@ -140,6 +136,10 @@
 #include "norboot-target.h"
 #endif
 
+#if defined(IPOD_ACCESSORY_PROTOCOL)
+#include "iap.h"
+#endif
+
 #define SCREEN_MAX_CHARS (LCD_WIDTH / SYSFONT_WIDTH)
 
 static const char* threads_getname(int selected_item, void *data,
@@ -1347,7 +1347,7 @@ static int disk_callback(int btn, struct gui_synclist *lists)
             simplelist_addline(
                     "Nsac: %d clk", card->nsac);
             simplelist_addline(
-                    "R2W: *%d", card->r2w_factor);
+                    "R2W: *%d", 1 << card->r2w_factor);
 #if (CONFIG_STORAGE & STORAGE_SD)
             int csd_structure = card_extract_bits(card->csd, 127, 2);
             const char *ver;
@@ -1482,6 +1482,9 @@ static int disk_callback(int btn, struct gui_synclist *lists)
     i = identify_info[83] & (1<<9);
     simplelist_addline(
              "Noise mgmt: %s", i ? "enabled" : "unsupported");
+    i = identify_info[85] & (1<<0);
+    simplelist_addline(
+             "SMART: %s", i ? "enabled" : "unsupported");
     simplelist_addline(
              "Flush cache: %s", identify_info[83] & (1<<13) ? "extended" : identify_info[83] & (1<<12) ? "standard" : identify_info[80] >= (1<<5) ? "ATA-5" : "unsupported");
     i = identify_info[82] & (1<<6);
@@ -1750,7 +1753,7 @@ static int ata_smart_callback(int btn, struct gui_synclist *lists)
     {
         int rc;
         memset(&smart_data, 0, sizeof(struct ata_smart_values));
-        rc = ata_read_smart(&smart_data);
+        rc = ata_read_smart(&smart_data, ATA_SMART_READ_DATA);
         simplelist_reset_lines();
         if (rc == 0)
         {
@@ -2714,6 +2717,37 @@ static bool dbg_syscfg(void) {
 
     return simplelist_show_list(&info);
 }
+
+#define FLASH_PAGES (FLASH_SIZE >> 12)
+#define FLASH_PAGE_SIZE (FLASH_SIZE >> 8)
+
+static bool dbg_bootflash_dump(void) {
+    splashf(HZ, "Please wait...");
+
+    int fd;
+
+    fd = creat("/bootflash.bin", 0666);
+
+    if (fd < 0)
+    {
+        splashf(HZ * 3, "Error opening file");
+        return false;
+    }
+
+    uint8_t page[FLASH_PAGE_SIZE];
+    bootflash_init(SPI_PORT);
+
+    for (int i = 0; i < FLASH_PAGES; i++) {
+        bootflash_read(SPI_PORT, i << 12, FLASH_PAGE_SIZE, page);
+        write(fd, page, FLASH_PAGE_SIZE);
+    }
+
+    bootflash_close(SPI_PORT);
+    close(fd);
+    splashf(HZ * 3, "Dump saved to /bootflash.bin");
+
+    return false;
+}
 #endif
 
 /****** The menu *********/
@@ -2821,6 +2855,9 @@ static const struct {
 #if (defined(HAVE_WHEEL_ACCELERATION) && (CONFIG_KEYPAD==IPOD_4G_PAD) \
      && !defined(IPOD_MINI) && !defined(SIMULATOR))
         {"Debug scrollwheel", dbg_scrollwheel },
+#endif
+#if defined(IPOD_ACCESSORY_PROTOCOL)
+        {"Debug IAP", dbg_iap },
 #endif
         {"Talk engine stats", dbg_talk },
 #if defined(HAVE_BOOTDATA) && !defined(SIMULATOR)
@@ -2833,6 +2870,7 @@ static const struct {
 
 #if defined(IPOD_6G) && !defined(SIMULATOR)
         {"View SysCfg", dbg_syscfg },
+        {"Dump bootflash to file", dbg_bootflash_dump },
 #endif
 };
 

apps/features.txt

@@ -182,7 +182,7 @@ depth_3d
 #endif
 
 /* This should be AUDIOHW_HAVE_FILTER_ROLL_OFF but that is only defined later */
-#if defined(DX50) || defined(HAVE_DF1704_CODEC) || defined(HAVE_PCM1792_CODEC) || defined(HAVE_CS4398) || defined(HAVE_WM8740) || defined(HAVE_ES9018)|| defined(HAVE_EROS_QN_CODEC) || defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_AK4376) || defined(HAVE_ES9218)
+#if defined(DX50) || defined(HAVE_DF1704_CODEC) || defined(HAVE_PCM1792_CODEC) || defined(HAVE_CS4398) || defined(HAVE_WM8740) || defined(HAVE_ES9018)|| defined(HAVE_EROS_QN_CODEC) || defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_AK4376) || defined(HAVE_ES9218) || defined(HAVE_SURFANS_LINUX_CODEC)
 filter_roll_off
 #endif
 

apps/fileop.c

@@ -510,7 +510,9 @@ int copy_move_fileobject(const char *src_path, const char *dst_path, unsigned in
         int rc;
         if (file_exists(dst.path)) {
             /* If user chooses not to overwrite, cancel */
-            if (!yesno_pop(ID2P(LANG_REALLY_OVERWRITE))) {
+            if (!yesno_pop(ID2P(LANG_REALLY_OVERWRITE)))
+            {
+                splash(HZ, ID2P(LANG_CANCEL));
                 return FORC_NOOVERWRT;
             }
 
@@ -611,6 +613,7 @@ int rename_file(const char *selected_file)
 {
     int rc;
     char newname[MAX_PATH];
+    char *newext = NULL;
     const char *oldbase, *selection = selected_file;
 
     path_basename(selection, &oldbase);
@@ -620,11 +623,20 @@ int rename_file(const char *selected_file)
     if (strmemccpy(newname, selection, sizeof (newname)) == NULL)
         return FORC_PATH_TOO_LONG;
 
+    if ((*tree_get_context()->dirfilter > NUM_FILTER_MODES) &&
+        (newext = strrchr(newbase, '.')))
+        /* hide extension when renaming in lists restricted to a
+        single file format, such as in the Playlists menu */
+        *newext = '\0';
+
     rc = prompt_name(newbase, sizeof (newname) - pathlen);
 
     if (rc != FORC_SUCCESS)
         return rc;
 
+    if (newext) /* re-add original extension */
+        strlcat(newbase, strrchr(selection, '.'), sizeof (newname) - pathlen);
+
     if (!strcmp(oldbase, newbase))
         return FORC_NOOP; /* No change at all */
 

apps/filetree.c

@@ -58,6 +58,7 @@
 static struct compare_data
 {
     int sort_dir; /* qsort key for sorting directories */
+    int sort_file; /*       ...for sorting files       */
     int(*_compar)(const char*, const char*, size_t);
 } cmp_data;
 
@@ -234,7 +235,7 @@ static int compare(const void* p1, const void* p2)
 
     if (cmp_data.sort_dir == SORT_AS_FILE)
     {   /* treat as two files */
-        criteria = global_settings.sort_file;
+        criteria = cmp_data.sort_file;
     }
     else if (e1->attr & ATTR_DIRECTORY && e2->attr & ATTR_DIRECTORY)
     {   /* two directories */
@@ -253,7 +254,7 @@ static int compare(const void* p1, const void* p2)
     }
     else if (!(e1->attr & ATTR_DIRECTORY) && !(e2->attr & ATTR_DIRECTORY))
     {   /* two files */
-        criteria = global_settings.sort_file;
+        criteria = cmp_data.sort_file;
     }
     else /* dir and file, dir goes first */
         return (e2->attr & ATTR_DIRECTORY) - (e1->attr & ATTR_DIRECTORY);
@@ -425,6 +426,10 @@ int ft_load(struct tree_context* c, const char* tempdir)
     /* allow directories to be sorted into file list */
     cmp_data.sort_dir = (*c->dirfilter == SHOW_PLUGINS) ? SORT_AS_FILE : c->sort_dir;
 
+    /* playlist catalog uses sorting independent from file browser */
+    cmp_data.sort_file = (*c->dirfilter == SHOW_M3U) ?
+                         global_settings.sort_playlists : global_settings.sort_file;
+
     if (global_settings.sort_case)
     {
         if (global_settings.interpret_numbers == SORT_INTERPRET_AS_NUMBER)
@@ -560,7 +565,7 @@ int ft_enter(struct tree_context* c)
     struct entry* file = tree_get_entry_at(c, c->selected_item);
     if (!file)
     {
-        splashf(HZ, str(LANG_READ_FAILED), str(LANG_UNKNOWN));
+        splashf(HZ, ID2P(LANG_READ_FAILED), str(LANG_UNKNOWN));
         return rc;
     }
 
@@ -768,7 +773,7 @@ int ft_enter(struct tree_context* c)
                 file = tree_get_entry_at(c, c->selected_item);
                 if (!file)
                 {
-                    splashf(HZ, str(LANG_READ_FAILED), str(LANG_UNKNOWN));
+                    splashf(HZ, ID2P(LANG_READ_FAILED), str(LANG_UNKNOWN));
                     return rc;
                 }
 

apps/gui/quickscreen.c

@@ -39,9 +39,7 @@
 #include "option_select.h"
 #include "debug.h"
 #include "shortcuts.h"
-#ifdef HAVE_ALBUMART
-#include "playback.h"
-#endif
+#include "appevents.h"
 
  /* 1 top, 1 bottom, 2 on either side, 1 for the icons
   * if enough space, top and bottom have 2 lines */
@@ -52,6 +50,18 @@
 #define MARGIN 10
 #define CENTER_ICONAREA_SIZE (MARGIN+8*2)
 
+static bool redraw;
+
+static void quickscreen_update_callback(unsigned short id,
+                                        void *data, void *userdata)
+{
+    (void)id;
+    (void)data;
+    (void)userdata;
+
+    redraw = true;
+}
+
 static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
                                         struct screen *display,
                                         struct viewport *parent,
@@ -335,6 +345,8 @@ static int gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter
 
     push_current_activity(ACTIVITY_QUICKSCREEN);
 
+    add_event_ex(GUI_EVENT_NEED_UI_UPDATE, false, quickscreen_update_callback, NULL);
+
     FOR_NB_SCREENS(i)
     {
         screens[i].set_viewport(NULL);
@@ -355,6 +367,13 @@ static int gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter
     if (qs->items[QUICKSCREEN_LEFT] != qs->items[QUICKSCREEN_RIGHT])
         talk_qs_option(qs->items[QUICKSCREEN_RIGHT], true);
     while (true) {
+        if (redraw)
+        {
+            redraw = false;
+            FOR_NB_SCREENS(i)
+                gui_quickscreen_draw(qs, &screens[i], &parent[i],
+                                     vps[i], &vp_icons[i]);
+        }
         button = get_action(CONTEXT_QUICKSCREEN, HZ/5);
 #ifdef HAVE_TOUCHSCREEN
         if (button == ACTION_TOUCHSCREEN)
@@ -369,11 +388,7 @@ static int gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter
         {
             ret |= QUICKSCREEN_CHANGED;
             can_quit = true;
-            FOR_NB_SCREENS(i)
-                gui_quickscreen_draw(qs, &screens[i], &parent[i],
-                                     vps[i], &vp_icons[i]);
-            if (qs->callback)
-                qs->callback(qs);
+            redraw = true;
         }
         else if (button == button_enter)
             can_quit = true;
@@ -412,15 +427,14 @@ static int gui_syncquickscreen_run(struct gui_quickscreen * qs, int button_enter
     else
         pop_current_activity();
 
+    remove_event_ex(GUI_EVENT_NEED_UI_UPDATE, quickscreen_update_callback, NULL);
+
     return ret;
 }
 
 int quick_screen_quick(int button_enter)
 {
     struct gui_quickscreen qs;
-#ifdef HAVE_ALBUMART
-    int old_album_art = global_settings.album_art;
-#endif
     bool usb = false;
 
     for (int i = 0; i < 4; ++i)
@@ -431,16 +445,9 @@ int quick_screen_quick(int button_enter)
             qs.items[i] = NULL;
     }
 
-    qs.callback = NULL;
     int ret = gui_syncquickscreen_run(&qs, button_enter, &usb);
     if (ret & QUICKSCREEN_CHANGED)
-    {
         settings_save();
-#ifdef HAVE_ALBUMART
-        if (old_album_art != global_settings.album_art)
-            set_albumart_mode(global_settings.album_art);
-#endif
-    }
     if (usb)
         return QUICKSCREEN_IN_USB;
     return ret & QUICKSCREEN_GOTO_SHORTCUTS_MENU ? QUICKSCREEN_GOTO_SHORTCUTS_MENU :

apps/gui/quickscreen.h

@@ -46,8 +46,6 @@ enum quickscreen_return {
 struct gui_quickscreen
 {
     const struct settings_list *items[QUICKSCREEN_ITEM_COUNT];
-    void (*callback)(struct gui_quickscreen * qs); /* called after a
-                                                    item is changed */
 };
 
 extern int quick_screen_quick(int button_enter);

apps/gui/skin_engine/skin_parser.c

@@ -829,19 +829,12 @@ static int parse_setting_and_lang(struct skin_element *element,
     }
     else
     {
-    /* NOTE: The string validations that happen here will
-     * automatically PASS on checkwps because its too hard to get
-     * settings_list.c built for a specific target.
-     * If that ever changes remove the #ifndef __PCTOOL__ here
-     */
-#ifndef __PCTOOL__
         const struct settings_list *setting = find_setting_by_cfgname(temp);
         if (!setting) {
             DEBUGF("Invalid setting [%s]\n", temp);
             return WPS_ERROR_INVALID_PARAM;
         }
         token->value.xdata = (void *)setting;
-#endif
     }
     return 0;
 }
@@ -2173,7 +2166,7 @@ static bool skin_load_fonts(struct wps_data *data)
         {
             if (success)
             {
-                splashf(HZ, str(LANG_FONT_LOAD_ERROR), "(no name)");
+                splashf(HZ, ID2P(LANG_FONT_LOAD_ERROR), "(no name)");
                 DEBUGF("font %d not specified\n", font_id);
             }
             success = false;
@@ -2198,7 +2191,7 @@ static bool skin_load_fonts(struct wps_data *data)
 
         if (font->id < 0)
         {
-            splashf(HZ, str(LANG_FONT_LOAD_ERROR), font->name);
+            splashf(HZ, ID2P(LANG_FONT_LOAD_ERROR), font->name);
             DEBUGF("Unable to load font %d: '%s'\n", font_id, font->name);
             font->name = NULL; /* to stop trying to load it again if we fail */
             success = false;

apps/gui/splash.c

@@ -36,7 +36,7 @@
 #include "misc.h" /* get_current_activity */
 #endif
 
-static long progress_next_tick = 0;
+static long progress_next_tick, talked_tick;
 
 #define MAXLINES  (LCD_HEIGHT/6)
 #define MAXBUFFER 512
@@ -215,6 +215,13 @@ void splashf(int ticks, const char *fmt, ...)
 {
     va_list ap;
 
+    /* fmt may be a so called virtual pointer. See settings.h. */
+    long id;
+    if((id = P2ID((const unsigned char*)fmt)) >= 0)
+        /* If fmt specifies a voicefont ID, and voice menus are
+           enabled, then speak it. */
+        cond_talk_ids_fq(id);
+
     /* If fmt is a lang ID then get the corresponding string (which
        still might contain % place holders). */
     fmt = P2STR((unsigned char *)fmt);
@@ -236,23 +243,11 @@ void splashf(int ticks, const char *fmt, ...)
         sleep(ticks);
 }
 
-void splash(int ticks, const char *str)
-{
-#if !defined(SIMULATOR)
-    long id;
-    /* fmt may be a so called virtual pointer. See settings.h. */
-    if((id = P2ID((const unsigned char*)str)) >= 0)
-        /* If fmt specifies a voicefont ID, and voice menus are
-           enabled, then speak it. */
-        cond_talk_ids_fq(id);
-#endif
-    splashf(ticks, "%s", P2STR((const unsigned char*)str));
-}
-
 /* set delay before progress meter is shown */
 void splash_progress_set_delay(long delay_ticks)
 {
     progress_next_tick = current_tick + delay_ticks;
+    talked_tick = 0;
 }
 
 /* splash a progress meter */
@@ -272,6 +267,15 @@ void splash_progress(int current, int total, const char *fmt, ...)
         vp_flag = 0; /* don't mark vp dirty to prevent flashing */
     }
 
+    if (global_settings.talk_menu &&
+        total > 0 &&
+        TIME_AFTER(current_tick, talked_tick + HZ*5))
+    {
+        talked_tick = current_tick;
+        talk_ids(false, LANG_LOADING_PERCENT,
+                 TALK_ID(current * 100 / total, UNIT_PERCENT));
+    }
+
     /* If fmt is a lang ID then get the corresponding string (which
        still might contain % place holders). */
     fmt = P2STR((unsigned char *)fmt);

apps/gui/splash.h

@@ -38,7 +38,7 @@ extern void splashf(int ticks, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
  *  - str : what to say, if this is a LANG_* string (from ID2P)
  *          it will be voiced
  */
-extern void splash(int ticks, const char *str);
+#define splash(__ticks, __str) splashf(__ticks, __str)
 
 /* set a delay before displaying the progress meter the first time */
 extern void splash_progress_set_delay(long delay_ticks);

apps/gui/statusbar.c

@@ -192,7 +192,7 @@ static struct screen * sb_fill_bar_info(struct gui_statusbar * bar)
 
         /* zero battery run time if charging */
         if (charge_state > DISCHARGING)
-            reset_runtime();
+            zero_runtime();
 
         /* animate battery if charging */
         if ((charge_state == DISCHARGING) || (charge_state == TRICKLE))
@@ -202,7 +202,7 @@ static struct screen * sb_fill_bar_info(struct gui_statusbar * bar)
         else
         {
 #else /* CONFIG_CHARGING < CHARGING_MONITOR */
-            reset_runtime();
+            zero_runtime();
         {
 #endif /* CONFIG_CHARGING < CHARGING_MONITOR */
             /* animate in (max.) 4 steps, starting near the current charge level */

apps/gui/yesno.c

@@ -368,14 +368,35 @@ enum yesno_res gui_syncyesno_run(const struct text_message * main_message,
                              main_message, yes_message, no_message);
 }
 
-/* Function to manipulate all yesno dialogues.
-   This function needs the prompt text as an argument. */
-bool yesno_pop(const char* text)
+static bool yesno_pop_lines(const char *lines[], int line_cnt)
 {
-    const char *lines[]={text};
-    const struct text_message message={lines, 1};
+    const struct text_message message={lines, line_cnt};
     bool ret = (gui_syncyesno_run(&message,NULL,NULL)== YESNO_YES);
     FOR_NB_SCREENS(i)
         screens[i].clear_viewport();
     return ret;
 }
+
+/* YES/NO dialog, uses text parameter as prompt */
+bool yesno_pop(const char* text)
+{
+    const char *lines[]= {text};
+    return yesno_pop_lines(lines, 1);
+}
+
+/* YES/NO dialog, asks "Are you sure?", displays
+   text parameter on second line.
+
+   Says "Cancelled" if answered negatively.
+*/
+bool yesno_pop_confirm(const char* text)
+{
+    bool confirmed;
+    const char *lines[] = {ID2P(LANG_ARE_YOU_SURE), text};
+    confirmed = yesno_pop_lines(lines, 2);
+
+    if (!confirmed)
+        splash(HZ, ID2P(LANG_CANCEL));
+
+    return confirmed;
+}

apps/gui/yesno.h

@@ -57,5 +57,6 @@ extern enum yesno_res gui_syncyesno_run_w_tmo(
                                      const struct text_message * no_message);
 
 bool yesno_pop(const char* text);
+bool yesno_pop_confirm(const char* text);
 
 #endif /* _GUI_YESNO_H_ */

apps/hosted/android/keyboard.c

@@ -82,7 +82,7 @@ static void kdb_init(void)
         sleep(HZ/10);
 }
 
-int kbd_input(char* text, int buflen, unsigned short *kbd)
+int kbd_input(char* text, int buflen, ucschar_t *kbd)
 {
 	(void)kbd;
     JNIEnv e            = *env_ptr;

apps/hosted/android/yesno.c

@@ -28,6 +28,7 @@
 #include "settings.h"
 #include "lang.h"
 #include "kernel.h"
+#include "splash.h"
 
 extern JNIEnv   *env_ptr;
 static jobject   RockboxYesno_instance = NULL;
@@ -130,14 +131,35 @@ enum yesno_res gui_syncyesno_run_w_tmo(int ticks, enum yesno_res tmo_default_res
 
 #endif
 
-/* Function to manipulate all yesno dialogues.
-   This function needs the output text as an argument. */
-bool yesno_pop(const char* text)
+static bool yesno_pop_lines(const char *lines[], int line_cnt)
 {
-    const char *lines[]={text};
-    const struct text_message message={lines, 1};
+    const struct text_message message={lines, line_cnt};
     bool ret = (gui_syncyesno_run(&message,NULL,NULL)== YESNO_YES);
     FOR_NB_SCREENS(i)
         screens[i].clear_viewport();
     return ret;
 }
+
+/* YES/NO dialog, uses text parameter as prompt */
+bool yesno_pop(const char* text)
+{
+    const char *lines[]= {text};
+    return yesno_pop_lines(lines, 1);
+}
+
+/* YES/NO dialog, asks "Are you sure?", displays
+   text parameter on second line.
+
+   Says "Cancelled" if answered negatively.
+*/
+bool yesno_pop_confirm(const char* text)
+{
+    bool confirmed;
+    const char *lines[] = {ID2P(LANG_ARE_YOU_SURE), text};
+    confirmed = yesno_pop_lines(lines, 2);
+
+    if (!confirmed)
+        splash(HZ, ID2P(LANG_CANCEL));
+
+    return confirmed;
+}

apps/iap/iap-core.c

@@ -177,7 +177,7 @@ unsigned char lingo_versions[32][2] = {
 
 /* states of the iap de-framing state machine */
 enum fsm_state {
-    ST_SYNC,    /* wait for 0xFF sync byte */
+    ST_SYNC = 0,    /* wait for 0xFF sync byte */
     ST_SOF,     /* wait for 0x55 start-of-frame byte */
     ST_LEN,     /* receive length byte (small packet) */
     ST_LENH,    /* receive length high byte (large packet) */
@@ -210,6 +210,17 @@ static struct buflib_callbacks iap_buflib_callbacks = {
 
 static void iap_malloc(void);
 
+static void iap_reset_buffers(void)
+{
+    iap_txstart = iap_buffers;
+    iap_txpayload = iap_txstart+5;
+    iap_txnext = iap_txpayload;
+    iap_rxstart = iap_buffers+(TX_BUFLEN+6);
+    iap_rxpayload = iap_rxstart;
+    iap_rxnext = iap_rxpayload;
+    iap_rxlen = RX_BUFLEN+2;
+}
+
 void put_u16(unsigned char *buf, const uint16_t data)
 {
     buf[0] = (data >>  8) & 0xFF;
@@ -295,6 +306,27 @@ void iap_reset_auth(struct auth_t* auth)
     auth->next_section = 0;
 }
 
+void iap_reset_state(IF_IAP_MP_NONVOID(int port))
+{
+    if (!iap_running)
+        return;
+
+    /* 0 is dock, 1 is headphone.  This is for
+       when we eventually maintain independent state */
+    IF_IAP_MP((void)port);
+
+    iap_reset_device(&device);
+    iap_bitrate_set(global_settings.serial_bitrate);
+
+#if 0  // XXX this is still screwed up
+    memset(&frame_state, 0, sizeof(frame_state));
+    interface_state = IST_STANDARD;
+    frame_state.state = ST_SYNC;
+
+    iap_reset_buffers();
+#endif
+}
+
 void iap_reset_device(struct device_t* device)
 {
     iap_reset_auth(&(device->auth));
@@ -326,7 +358,6 @@ void iap_set_remote_volume(void)
     iap_send_tx();
 }
 
-
 /* This thread is waiting for events posted to iap_queue and calls
  * the appropriate subroutines in response
  */
@@ -460,13 +491,8 @@ static void iap_malloc(void)
 #else
     iap_buffers = serbuf;
 #endif
-    iap_txstart = iap_buffers;
-    iap_txpayload = iap_txstart+5;
-    iap_txnext = iap_txpayload;
-    iap_rxstart = iap_buffers+(TX_BUFLEN+6);
-    iap_rxpayload = iap_rxstart;
-    iap_rxnext = iap_rxpayload;
-    iap_rxlen = RX_BUFLEN+2;
+
+    iap_reset_buffers();
     iap_running = true;
 }
 
@@ -567,7 +593,7 @@ void iap_send_pkt(const unsigned char * data, const int len)
     iap_send_tx();
 }
 
-bool iap_getc(const unsigned char x)
+bool iap_getc(IF_IAP_MP(int port,) const unsigned char x)
 {
     struct state_t *s = &frame_state;
     static long pkt_timeout;
@@ -580,7 +606,7 @@ bool iap_getc(const unsigned char x)
         /* Packet timeouts only make sense while not waiting for the
          * sync byte */
          s->state = ST_SYNC;
-         return iap_getc(x);
+         return iap_getc(IF_IAP_MP(port,) x);
     }
 
 
@@ -607,7 +633,7 @@ bool iap_getc(const unsigned char x)
             s->state = ST_LEN;
         } else {
             s->state = ST_SYNC;
-            return iap_getc(x);
+            return iap_getc(IF_IAP_MP(port,) x);
         }
         break;
     case ST_LEN:
@@ -1418,3 +1444,32 @@ void iap_fill_power_state(void)
         IAP_TX_PUT(0x00);
     }
 }
+
+#include "lcd.h"
+#include "font.h"
+bool dbg_iap(void)
+{
+    lcd_setfont(FONT_SYSFIXED);
+
+    while (1)
+    {
+        if (action_userabort(HZ/10))
+            break;
+
+        lcd_clear_display();
+
+        /* show internal state of IAP subsystem */
+        lcd_putsf(0, 0, "auth: %d acc: %d", device.auth.state, device.accinfo);
+        lcd_putsf(0, 1, "lin: %08x", device.lingoes);
+        lcd_putsf(0, 2, "notif: %08x", device.notifications);
+        lcd_putsf(0, 3, "cap: %08x/%08x", device.capabilities, device.capabilities_queried);
+
+        // frame_state.state
+        // serial state
+
+        lcd_update();
+    }
+
+    lcd_setfont(FONT_UI);
+    return false;
+}

apps/keyboard.h

@@ -23,7 +23,7 @@
 
 /* '*kbd', same format as https://www.rockbox.org/wiki/LoadableKeyboardLayouts */
 
-int kbd_input(char* buffer, int buflen, unsigned short *kbd);
+int kbd_input(char* buffer, int buflen, ucschar_t *kbd);
 
 int load_kbd(unsigned char* filename);
 

apps/keymaps/keymap-echor1.c

@@ -0,0 +1,42 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2025 Aidan MacDonald
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for Echo R1 */
+
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+
+/* {Action Code,    Button code,    Prereq button code } */
+
+static const struct button_mapping button_context_standard[] = {
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+const struct button_mapping* get_context_mapping(int context)
+{
+    switch (context)
+    {
+    default:
+        return button_context_standard;
+    }
+}

apps/keymaps/keymap-erosq.c

@@ -140,7 +140,7 @@ static const struct button_mapping button_context_settings_time[] = {
     { ACTION_STD_PREVREPEAT,     BUTTON_PREV|BUTTON_REPEAT,  BUTTON_PREV },
     { ACTION_STD_NEXT,           BUTTON_NEXT|BUTTON_REL,     BUTTON_NEXT },
     { ACTION_STD_NEXTREPEAT,     BUTTON_NEXT|BUTTON_REPEAT,  BUTTON_NEXT },
-    { ACTION_STD_CANCEL,         BUTTON_BACK|BUTTON_REPEAT,  BUTTON_BACK },
+    { ACTION_STD_CANCEL,         BUTTON_BACK|BUTTON_REL,     BUTTON_BACK },
     { ACTION_STD_OK,             BUTTON_PLAY|BUTTON_REL,     BUTTON_PLAY },
     { ACTION_SETTINGS_INC,       BUTTON_SCROLL_FWD,          BUTTON_NONE },
     { ACTION_SETTINGS_DEC,       BUTTON_SCROLL_BACK,         BUTTON_NONE },
@@ -191,6 +191,65 @@ static const struct button_mapping button_context_bmark[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
 }; /* button_context_bmark */
 
+static const struct button_mapping button_context_usb_hid[] = {
+    {ACTION_USB_HID_MODE_SWITCH_NEXT,               BUTTON_POWER,        BUTTON_NONE},
+    LAST_ITEM_IN_LIST,
+}; /* button_context_usb_hid */
+
+static const struct button_mapping button_context_usb_hid_mode_multimedia[] = {
+    {ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_VOL_UP,                  BUTTON_NONE},
+    {ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_VOL_UP|BUTTON_REPEAT,    BUTTON_NONE},
+    {ACTION_USB_HID_MULTIMEDIA_VOLUME_UP,           BUTTON_SCROLL_FWD,              BUTTON_NONE}, // might be annoying
+    {ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_VOL_DOWN,                BUTTON_NONE},
+    {ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_VOL_DOWN|BUTTON_REPEAT,  BUTTON_NONE},
+    {ACTION_USB_HID_MULTIMEDIA_VOLUME_DOWN,         BUTTON_SCROLL_BACK,             BUTTON_NONE}, // might be annoying
+    {ACTION_USB_HID_MULTIMEDIA_VOLUME_MUTE,         BUTTON_MENU|BUTTON_REL,         BUTTON_MENU},
+    {ACTION_USB_HID_MULTIMEDIA_PLAYBACK_PLAY_PAUSE, BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY},
+    {ACTION_USB_HID_MULTIMEDIA_PLAYBACK_STOP,       BUTTON_POWER|BUTTON_REPEAT,     BUTTON_POWER},
+    {ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_PREV, BUTTON_PREV,                    BUTTON_NONE},
+    {ACTION_USB_HID_MULTIMEDIA_PLAYBACK_TRACK_NEXT, BUTTON_NEXT,                    BUTTON_NONE},
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_multimedia */
+
+static const struct button_mapping button_context_usb_hid_mode_presentation[] = {
+    // TODO
+    // {ACTION_USB_HID_PRESENTATION_SLIDESHOW_START,   BUTTON_PLAY|BUTTON_REL,         BUTTON_PLAY},
+    // {ACTION_USB_HID_PRESENTATION_SLIDESHOW_LEAVE,   BUTTON_PLAY|BUTTON_REPEAT,      BUTTON_PLAY},
+    // {ACTION_USB_HID_PRESENTATION_SLIDE_PREV,        BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT},
+    // {ACTION_USB_HID_PRESENTATION_SLIDE_NEXT,        BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT},
+    // {ACTION_USB_HID_PRESENTATION_SLIDE_FIRST,       BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_LEFT},
+    // {ACTION_USB_HID_PRESENTATION_SLIDE_LAST,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_RIGHT},
+    // {ACTION_USB_HID_PRESENTATION_SCREEN_BLACK,      BUTTON_VOL_UP,                  BUTTON_NONE},
+    // {ACTION_USB_HID_PRESENTATION_SCREEN_WHITE,      BUTTON_VOL_DOWN,                BUTTON_NONE},
+    // {ACTION_USB_HID_PRESENTATION_LINK_PREV,         BUTTON_MENU,                    BUTTON_NONE},
+    // {ACTION_USB_HID_PRESENTATION_LINK_NEXT,         BUTTON_BACK,                    BUTTON_NONE},
+    // {ACTION_USB_HID_PRESENTATION_MOUSE_CLICK,       BUTTON_SELECT|BUTTON_REL,       BUTTON_SELECT},
+    // {ACTION_USB_HID_PRESENTATION_MOUSE_OVER,        BUTTON_SELECT|BUTTON_REPEAT,    BUTTON_SELECT},
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_presentation */
+
+static const struct button_mapping button_context_usb_hid_mode_browser[] = {
+    // TODO
+    // {ACTION_USB_HID_BROWSER_SCROLL_UP,              BUTTON_SCROLL_BACK,                 BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_SCROLL_UP,              BUTTON_SCROLL_BACK|BUTTON_REPEAT,   BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_SCROLL_DOWN,            BUTTON_SCROLL_FWD,                  BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_SCROLL_DOWN,            BUTTON_SCROLL_FWD|BUTTON_REPEAT,    BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN,       BUTTON_DOWN,                        BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP,         BUTTON_UP,                          BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_SCROLL_PAGE_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,          BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_SCROLL_PAGE_UP,         BUTTON_UP|BUTTON_REPEAT,            BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_ZOOM_IN,                BUTTON_VOL_UP,                      BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_ZOOM_OUT,               BUTTON_VOL_DOWN,                    BUTTON_NONE},
+    // {ACTION_USB_HID_BROWSER_ZOOM_RESET,             BUTTON_PLAY|BUTTON_REL,             BUTTON_PLAY},
+    // {ACTION_USB_HID_BROWSER_TAB_PREV,               BUTTON_LEFT|BUTTON_REL,             BUTTON_LEFT},
+    // {ACTION_USB_HID_BROWSER_TAB_NEXT,               BUTTON_RIGHT|BUTTON_REL,            BUTTON_RIGHT},
+    // {ACTION_USB_HID_BROWSER_TAB_CLOSE,              BUTTON_SELECT|BUTTON_REPEAT,        BUTTON_SELECT},
+    // {ACTION_USB_HID_BROWSER_HISTORY_BACK,           BUTTON_LEFT|BUTTON_REPEAT,          BUTTON_LEFT},
+    // {ACTION_USB_HID_BROWSER_HISTORY_FORWARD,        BUTTON_RIGHT|BUTTON_REPEAT,         BUTTON_RIGHT},
+    // {ACTION_USB_HID_BROWSER_VIEW_FULL_SCREEN,       BUTTON_PLAY|BUTTON_REPEAT,          BUTTON_PLAY},
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_USB_HID)
+}; /* button_context_usb_hid_mode_browser */
+
 /* get_context_mapping returns a pointer to one of the above defined arrays depending on the context */
 const struct button_mapping* get_context_mapping(int context)
 {
@@ -235,6 +294,18 @@ const struct button_mapping* get_context_mapping(int context)
         case CONTEXT_MORSE_INPUT:
             return button_context_keyboard;
 
+        case CONTEXT_USB_HID:
+            return button_context_usb_hid;
+
+        case CONTEXT_USB_HID_MODE_MULTIMEDIA:
+            return button_context_usb_hid_mode_multimedia;
+
+        case CONTEXT_USB_HID_MODE_PRESENTATION:
+            return button_context_usb_hid_mode_presentation;
+
+        case CONTEXT_USB_HID_MODE_BROWSER:
+            return button_context_usb_hid_mode_browser;
+
         default:
             return button_context_standard;
     }

apps/keymaps/keymap-h1x0_h3x0.c

@@ -703,7 +703,6 @@ static const struct button_mapping button_context_radio_h300lcdremote[] = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
 };
 
-
 static const struct button_mapping button_context_time_remote[]  = {
     { ACTION_STD_CANCEL,       BUTTON_OFF,  BUTTON_NONE },
     { ACTION_STD_OK,           BUTTON_ON,   BUTTON_NONE },
@@ -881,6 +880,7 @@ static const struct button_mapping* get_context_mapping_remote(int context)
         case CONTEXT_CUSTOM|CONTEXT_TREE:
             return remote_btn_ctxt_tree;
         case CONTEXT_SETTINGS_TIME:
+            return button_context_time_remote;
         case CONTEXT_SETTINGS_RECTRIGGER:
             return remote_btn_ctxt_settingsgrph;
 

apps/keymaps/keymap-rgnano.c

@@ -0,0 +1,274 @@
+/***************************************************************************
+ *             __________               __   ___.
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ * $Id$
+ *
+ * Copyright (C) 2025 Hairo R. Carela
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+/* Button Code Definitions for Android targets */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+
+/*
+ * The format of the list is as follows
+ * { Action Code,   Button code,    Prereq button code }
+ * if there's no need to check the previous button's value, use BUTTON_NONE
+ * Insert LAST_ITEM_IN_LIST at the end of each mapping
+ */
+
+static const struct button_mapping button_context_standard[]  = {
+    { ACTION_STD_PREV,          BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,    BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,          BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_CANCEL,        BUTTON_B,                   BUTTON_NONE },
+    { ACTION_STD_OK,            BUTTON_A,                   BUTTON_NONE },
+    { ACTION_STD_MENU,          BUTTON_Y|BUTTON_REL,        BUTTON_Y },
+    { ACTION_STD_CONTEXT,       BUTTON_START|BUTTON_REL,    BUTTON_START },
+    { ACTION_STD_QUICKSCREEN,   BUTTON_R|BUTTON_REL,        BUTTON_R },
+    { ACTION_STD_KEYLOCK,       BUTTON_FN|BUTTON_START,     BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_standard */
+
+static const struct button_mapping button_context_wps[]  = {
+    { ACTION_WPS_PLAY,              BUTTON_A|BUTTON_REL,            BUTTON_A },
+    { ACTION_WPS_STOP,              BUTTON_A|BUTTON_REPEAT,         BUTTON_A },
+    { ACTION_WPS_STOP,              BUTTON_L|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_WPS_SKIPPREV,          BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT },
+    { ACTION_WPS_SKIPNEXT,          BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT },
+    { ACTION_WPS_SEEKBACK,          BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,           BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK,          BUTTON_LEFT|BUTTON_REL,         BUTTON_LEFT|BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK,          BUTTON_RIGHT|BUTTON_REL,        BUTTON_RIGHT|BUTTON_REPEAT },
+    { ACTION_WPS_VOLDOWN,           BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,           BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_WPS_VOLUP,             BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_WPS_VOLUP,             BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_WPS_MENU,              BUTTON_B|BUTTON_REL,            BUTTON_B },
+    { ACTION_WPS_CONTEXT,           BUTTON_START|BUTTON_REL,        BUTTON_START },
+    { ACTION_WPS_HOTKEY,            BUTTON_L|BUTTON_REL,            BUTTON_L },
+    { ACTION_WPS_QUICKSCREEN,       BUTTON_R|BUTTON_REL,            BUTTON_R },
+    { ACTION_WPS_BROWSE,            BUTTON_Y|BUTTON_REL,            BUTTON_Y },
+    { ACTION_WPS_ID3SCREEN,         BUTTON_X|BUTTON_REL,            BUTTON_X },
+    { ACTION_WPS_PITCHSCREEN,       BUTTON_R|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_WPS_ABSETA_PREVDIR,    BUTTON_A|BUTTON_LEFT,           BUTTON_A },
+    { ACTION_WPS_ABSETB_NEXTDIR,    BUTTON_A|BUTTON_RIGHT,          BUTTON_A },
+    { ACTION_WPS_ABRESET,           BUTTON_A|BUTTON_UP,             BUTTON_A },
+    { ACTION_WPS_ABRESET,           BUTTON_A|BUTTON_DOWN,           BUTTON_A },
+    { ACTION_STD_KEYLOCK,           BUTTON_FN|BUTTON_START,         BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+}; /* button_context_wps */
+
+static const struct button_mapping button_context_list[] = {
+    { ACTION_LIST_VOLUP,      BUTTON_FN|BUTTON_A,                  BUTTON_NONE },
+    { ACTION_LIST_VOLUP,      BUTTON_FN|BUTTON_A|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,    BUTTON_FN|BUTTON_Y,                  BUTTON_NONE },
+    { ACTION_LIST_VOLDOWN,    BUTTON_FN|BUTTON_Y|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,   BUTTON_LEFT,                         BUTTON_NONE },
+    { ACTION_LISTTREE_PGUP,   BUTTON_LEFT|BUTTON_REPEAT,           BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN, BUTTON_RIGHT,                        BUTTON_NONE },
+    { ACTION_LISTTREE_PGDOWN, BUTTON_RIGHT|BUTTON_REPEAT,          BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_list */
+
+static const struct button_mapping button_context_tree[]  = {
+    { ACTION_TREE_WPS,    BUTTON_X|BUTTON_REL,         BUTTON_X },
+    { ACTION_TREE_HOTKEY, BUTTON_L|BUTTON_REL,         BUTTON_L },
+    { ACTION_TREE_STOP,   BUTTON_L|BUTTON_REPEAT,      BUTTON_NONE},
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST)
+}; /* button_context_tree */
+
+static const struct button_mapping button_context_listtree_scroll_with_combo[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
+};
+
+static const struct button_mapping button_context_listtree_scroll_without_combo[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_TREE),
+};
+
+static const struct button_mapping button_context_settings[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,          BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_PREV,              BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_STD_NEXT,              BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings */
+
+static const struct button_mapping button_context_settings_right_is_inc[]  = {
+    { ACTION_SETTINGS_INC,          BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,    BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,          BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_PREV,              BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_STD_NEXT,              BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settingsgraphical */
+
+static const struct button_mapping button_context_yesno[]  = {
+    { ACTION_YESNO_ACCEPT,  BUTTON_A,  BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_settings_yesno */
+
+static const struct button_mapping button_context_colorchooser[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_colorchooser */
+
+static const struct button_mapping button_context_eq[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
+}; /* button_context_eq */
+
+/** Bookmark Screen **/
+static const struct button_mapping button_context_bmark[]  = {
+    { ACTION_BMS_DELETE,    BUTTON_Y,         BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+}; /* button_context_bmark */
+
+static const struct button_mapping button_context_time[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+}; /* button_context_time */
+
+static const struct button_mapping button_context_quickscreen[]  = {
+    { ACTION_QS_TOP,        BUTTON_UP,                        BUTTON_NONE },
+    { ACTION_QS_TOP,        BUTTON_UP|BUTTON_REPEAT,          BUTTON_NONE },
+    { ACTION_QS_DOWN,       BUTTON_DOWN,                      BUTTON_NONE },
+    { ACTION_QS_DOWN,       BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_LEFT,       BUTTON_LEFT,                      BUTTON_NONE },
+    { ACTION_QS_LEFT,       BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT,                     BUTTON_NONE },
+    { ACTION_QS_RIGHT,      BUTTON_RIGHT|BUTTON_REPEAT,       BUTTON_NONE },
+    { ACTION_QS_VOLUP,      BUTTON_FN|BUTTON_A,               BUTTON_NONE },
+    { ACTION_QS_VOLUP,      BUTTON_FN|BUTTON_A|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_QS_VOLDOWN,    BUTTON_FN|BUTTON_Y,               BUTTON_NONE },
+    { ACTION_QS_VOLDOWN,    BUTTON_FN|BUTTON_Y|BUTTON_REPEAT, BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_quickscreen */
+
+static const struct button_mapping button_context_pitchscreen[]  = {
+    { ACTION_PS_INC_SMALL,      BUTTON_UP,                  BUTTON_NONE },
+    { ACTION_PS_INC_BIG,        BUTTON_UP|BUTTON_REPEAT,    BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL,      BUTTON_DOWN,                BUTTON_NONE },
+    { ACTION_PS_DEC_BIG,        BUTTON_DOWN|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFT,     BUTTON_LEFT,                BUTTON_NONE },
+    { ACTION_PS_NUDGE_LEFTOFF,  BUTTON_LEFT|BUTTON_REL,     BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHT,    BUTTON_RIGHT,               BUTTON_NONE },
+    { ACTION_PS_NUDGE_RIGHTOFF, BUTTON_RIGHT|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_PS_TOGGLE_MODE,    BUTTON_A,                   BUTTON_NONE },
+    { ACTION_PS_RESET,          BUTTON_Y,                   BUTTON_NONE },
+    { ACTION_PS_EXIT,           BUTTON_B,                   BUTTON_NONE },
+    { ACTION_PS_SLOWER,         BUTTON_LEFT|BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_PS_FASTER,         BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_pitchcreen */
+
+static const struct button_mapping button_context_keyboard[]  = {
+    { ACTION_KBD_LEFT,         BUTTON_LEFT,                    BUTTON_NONE },
+    { ACTION_KBD_LEFT,         BUTTON_LEFT|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT,                   BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_RIGHT|BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP,                      BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_UP|BUTTON_REPEAT,        BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN,                    BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_DOWN|BUTTON_REPEAT,      BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_L,                       BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_L|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_R,                       BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_R|BUTTON_REPEAT,         BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_A,                       BUTTON_NONE },
+    { ACTION_KBD_BACKSPACE,    BUTTON_Y|BUTTON_REL,            BUTTON_Y },
+    { ACTION_KBD_PAGE_FLIP,    BUTTON_X,                       BUTTON_NONE },
+    { ACTION_KBD_DONE,         BUTTON_START|BUTTON_REL,        BUTTON_START },
+    { ACTION_KBD_ABORT,        BUTTON_B|BUTTON_REL,            BUTTON_B },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+}; /* button_context_keyboard */
+
+static const struct button_mapping button_context_radio[]  = {
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
+}; /* button_context_radio */
+
+const struct button_mapping* get_context_mapping(int context)
+{
+    switch (context & ~CONTEXT_LOCKED)
+    {
+        case CONTEXT_STD:
+            return button_context_standard;
+        case CONTEXT_WPS:
+            return button_context_wps;
+
+        case CONTEXT_LIST:
+            return button_context_list;
+        case CONTEXT_MAINMENU:
+        case CONTEXT_TREE:
+            if (global_settings.hold_lr_for_scroll_in_list)
+                return button_context_listtree_scroll_without_combo;
+            else
+                return button_context_listtree_scroll_with_combo;
+        case CONTEXT_CUSTOM|CONTEXT_TREE:
+            return button_context_tree;
+
+        case CONTEXT_SETTINGS:
+            return button_context_settings;
+        case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
+        case CONTEXT_SETTINGS_RECTRIGGER:
+            return button_context_settings_right_is_inc;
+
+        case CONTEXT_SETTINGS_COLOURCHOOSER:
+            return button_context_colorchooser;
+        case CONTEXT_SETTINGS_EQ:
+            return button_context_eq;
+
+        case CONTEXT_SETTINGS_TIME:
+            return button_context_time;
+
+        case CONTEXT_YESNOSCREEN:
+            return button_context_yesno;
+        case CONTEXT_FM:
+            return button_context_radio;
+        case CONTEXT_BOOKMARKSCREEN:
+            return button_context_bmark;
+        case CONTEXT_QUICKSCREEN:
+            return button_context_quickscreen;
+        case CONTEXT_PITCHSCREEN:
+            return button_context_pitchscreen;
+        case CONTEXT_KEYBOARD:
+            return button_context_keyboard;
+    }
+    return button_context_standard;
+}

apps/keymaps/keymap-surfansf28.c

@@ -0,0 +1,215 @@
+/***************************************************************************
+ *             __________               __   ___
+ *   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
+ *   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
+ *   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
+ *   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
+ *                     \/            \/     \/    \/            \/
+ *
+ * Copyright (C) 2025 Solomon Peachy
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+ * KIND, either express or implied.
+ *
+ ****************************************************************************/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "config.h"
+#include "action.h"
+#include "button.h"
+#include "settings.h"
+
+static const struct button_mapping button_context_standard[] =
+{
+    { ACTION_STD_CONTEXT,    BUTTON_PLAY | BUTTON_REPEAT,  BUTTON_PLAY },
+    { ACTION_STD_OK,         BUTTON_PLAY | BUTTON_REL,     BUTTON_PLAY },
+    { ACTION_STD_PREV,       BUTTON_PREV,                  BUTTON_NONE },
+    { ACTION_STD_NEXT,       BUTTON_NEXT ,                 BUTTON_NONE },
+    { ACTION_STD_PREVREPEAT, BUTTON_PREV | BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_NEXTREPEAT, BUTTON_NEXT | BUTTON_REPEAT,  BUTTON_NONE },
+    { ACTION_STD_CANCEL,     BUTTON_POWER,                 BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+};
+
+
+static const struct button_mapping button_context_wps[] =
+{
+    { ACTION_WPS_MENU,     BUTTON_POWER,                    BUTTON_NONE },
+    { ACTION_WPS_CONTEXT,  BUTTON_PLAY | BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_PLAY,     BUTTON_PLAY | BUTTON_REL,        BUTTON_NONE },
+    { ACTION_WPS_SEEKBACK, BUTTON_PREV | BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_SEEKFWD,  BUTTON_NEXT | BUTTON_REPEAT,     BUTTON_NONE },
+    { ACTION_WPS_STOPSEEK, BUTTON_PREV | BUTTON_REL,        BUTTON_PREV | BUTTON_REPEAT },
+    { ACTION_WPS_STOPSEEK, BUTTON_NEXT | BUTTON_REL,        BUTTON_NEXT | BUTTON_REPEAT },
+    { ACTION_WPS_SKIPNEXT, BUTTON_NEXT | BUTTON_REL,        BUTTON_NONE },
+    { ACTION_WPS_SKIPPREV, BUTTON_PREV | BUTTON_REL,        BUTTON_NONE },
+    { ACTION_WPS_VOLUP,    BUTTON_SCROLL_FWD,               BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,  BUTTON_SCROLL_BACK,              BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+};
+
+
+static const struct button_mapping button_context_list[] =
+{
+    { ACTION_WPS_VOLUP,    BUTTON_SCROLL_FWD,               BUTTON_NONE },
+    { ACTION_WPS_VOLDOWN,  BUTTON_SCROLL_BACK,              BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+};
+
+
+static const struct button_mapping button_context_tree[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+};
+
+
+static const struct button_mapping button_context_listtree_scroll_with_combo[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM | CONTEXT_TREE),
+};
+
+
+static const struct button_mapping button_context_listtree_scroll_without_combo[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM | CONTEXT_TREE),
+};
+
+
+static const struct button_mapping button_context_settings[] =
+{
+    { ACTION_SETTINGS_INC,       BUTTON_SCROLL_FWD,      BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,       BUTTON_SCROLL_BACK,     BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+};
+
+
+static const struct button_mapping button_context_settings_right_is_inc[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+};
+
+
+static const struct button_mapping button_context_mainmenu[] =
+{
+    { ACTION_TREE_WPS, BUTTON_POWER, BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_TREE),
+};
+
+
+static const struct button_mapping button_context_yesno[] =
+{
+    { ACTION_YESNO_ACCEPT, BUTTON_PLAY, BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
+};
+
+
+static const struct button_mapping button_context_colorchooser[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+};
+
+
+static const struct button_mapping button_context_eq[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+};
+
+
+static const struct button_mapping button_context_keyboard[] =
+{
+    { ACTION_KBD_LEFT,         BUTTON_SCROLL_BACK,                       BUTTON_NONE },
+    { ACTION_KBD_RIGHT,        BUTTON_SCROLL_FWD,                        BUTTON_NONE },
+    { ACTION_KBD_CURSOR_LEFT,  BUTTON_PLAY | BUTTON_SCROLL_BACK,         BUTTON_NONE },
+    { ACTION_KBD_CURSOR_RIGHT, BUTTON_PLAY | BUTTON_SCROLL_FWD,          BUTTON_NONE },
+    { ACTION_KBD_SELECT,       BUTTON_PLAY,                              BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_PREV,                              BUTTON_NONE },
+    { ACTION_KBD_UP,           BUTTON_PREV | BUTTON_REPEAT,              BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_NEXT,                              BUTTON_NONE },
+    { ACTION_KBD_DOWN,         BUTTON_NEXT | BUTTON_REPEAT,              BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST
+};
+
+
+
+static const struct button_mapping button_context_bmark[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),
+};
+
+
+static const struct button_mapping button_context_time[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS),
+};
+
+
+static const struct button_mapping button_context_quickscreen[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
+
+
+static const struct button_mapping button_context_pitchscreen[] =
+{
+    { ACTION_PS_INC_SMALL, BUTTON_SCROLL_FWD,  BUTTON_NONE },
+    { ACTION_PS_DEC_SMALL, BUTTON_SCROLL_BACK, BUTTON_NONE },
+    { ACTION_PS_EXIT,      BUTTON_POWER,       BUTTON_NONE },
+
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+};
+
+
+static const struct button_mapping button_context_radio[] =
+{
+    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
+};
+
+
+const struct button_mapping* target_get_context_mapping(int context)
+{
+    switch(context)
+    {
+        case CONTEXT_STD:                       { return button_context_standard; }
+        case CONTEXT_WPS:                       { return button_context_wps; }
+        case CONTEXT_LIST:                      { return button_context_list; }
+        case CONTEXT_MAINMENU:                  { return button_context_mainmenu; }
+        case CONTEXT_CUSTOM | CONTEXT_TREE:     { return button_context_tree; }
+        case CONTEXT_SETTINGS:                  { return button_context_settings; }
+        case CONTEXT_SETTINGS_COLOURCHOOSER:    { return button_context_colorchooser; }
+        case CONTEXT_SETTINGS_EQ:               { return button_context_eq; }
+        case CONTEXT_SETTINGS_TIME:             { return button_context_time; }
+        case CONTEXT_YESNOSCREEN:               { return button_context_yesno; }
+        case CONTEXT_KEYBOARD:                  { return button_context_keyboard; }
+        case CONTEXT_FM:                        { return button_context_radio; }
+        case CONTEXT_BOOKMARKSCREEN:            { return button_context_bmark; }
+        case CONTEXT_QUICKSCREEN:               { return button_context_quickscreen; }
+        case CONTEXT_PITCHSCREEN:               { return button_context_pitchscreen; }
+        case CONTEXT_CUSTOM | CONTEXT_SETTINGS:
+        case CONTEXT_SETTINGS_RECTRIGGER:       { return button_context_settings_right_is_inc; }
+        case CONTEXT_TREE:
+        {
+            if(global_settings.hold_lr_for_scroll_in_list)
+            {
+                return button_context_listtree_scroll_without_combo;
+            }
+            return button_context_listtree_scroll_with_combo;
+        }
+    }
+
+    return button_context_standard;
+}

apps/keymaps/keymap-ypr1.c

@@ -99,7 +99,7 @@ static const struct button_mapping button_context_settings_right_is_inc[]  = {
 static const struct button_mapping button_context_yesno[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
 }; /* button_context_settings_yesno */
-
+#if 0
 static const struct button_mapping button_context_colorchooser[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_colorchooser */
@@ -107,7 +107,7 @@ static const struct button_mapping button_context_colorchooser[]  = {
 static const struct button_mapping button_context_eq[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_eq */
-
+#endif
 /** Bookmark Screen **/
 static const struct button_mapping button_context_bmark[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_LIST),

apps/lang/SOURCES

@@ -21,6 +21,7 @@ italiano.lang
 latviesu.lang
 lietuviu.lang
 magyar.lang
+moldoveneste.lang
 nederlands.lang
 norsk.lang
 norsk-nynorsk.lang

apps/lang/afrikaans.lang

@@ -581,7 +581,7 @@
   desc: in display_settings_menu
   user: core
   <source>
-    *: "Backlight On When Plugged"
+    *: "Backlight on When Plugged"
   </source>
   <dest>
     *: "Beligting Tydens Laai"

apps/lang/arabic.lang

@@ -2534,20 +2534,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -2948,7 +2948,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -3194,8 +3194,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -4149,7 +4149,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -4157,7 +4157,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Same As Source"
+    recording: "Same as Source"
   </voice>
 </phrase>
 <phrase>
@@ -5350,7 +5350,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "بحث في قائمة التشغيل"
@@ -6070,7 +6070,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -6379,6 +6379,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -6387,12 +6388,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx: "طاقة = إاغاء الأمر"
     gigabeats: "خلف = إاغاء الأمر"
     gogearsa9200: "يسار = إاغاء الأمر"
@@ -6401,7 +6402,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "السابق = إاغاء الأمر"
     iriverh100,iriverh120,iriverh300: "عرض = إاغاء الأمر"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </dest>
@@ -6749,7 +6749,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none

apps/lang/basque.lang

@@ -227,8 +227,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2935,7 +2935,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Pantailatik Kanpoko Korritzea"
@@ -3262,7 +3262,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3279,7 +3279,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3775,22 +3775,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Ezarri"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ezarri"
     gogearsa9200,samsungyh*: "PLAY = Ezarri"
     iriverh100,iriverh120,iriverh300: "NAVI = Ezarri"
     mpiohd300: "ENTER = Ezarri"
     mrobe500: "HEART = Ezarri"
-    rtc: "ON = Ezarri"
     vibe500: "OK = Ezarri"
   </dest>
   <voice>
@@ -3804,6 +3804,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3812,12 +3813,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Itzuli"
     gigabeatfx,mrobe500: "POWER = Itzuli"
     gigabeats,sansafuzeplus: "BACK = Itzuli"
     gogearsa9200: "LEFT = Itzuli"
@@ -3826,7 +3827,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Itzuli"
     iriverh100,iriverh120,iriverh300: "STOP = Itzuli"
     mrobe100: "DISPLAY = Itzuli"
-    rtc: "OFF = Itzuli"
     samsungyh*: "REW = Itzuli"
     vibe500: "CANCEL = Itzuli"
   </dest>
@@ -4266,7 +4266,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5435,7 +5435,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5693,7 +5693,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6698,7 +6698,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Zerrendan Bilatu"
@@ -7076,10 +7076,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7329,7 +7329,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9410,20 +9410,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Uneko denbora"
   </dest>
   <voice>
     *: none
-    rtc: "Uneko denbora:"
+    rtc: "Uneko denbora"
   </voice>
 </phrase>
 <phrase>
@@ -10273,7 +10273,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10291,7 +10291,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -12233,7 +12233,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Berrekin automatikoki"
@@ -12289,7 +12289,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Ezarri Zerrenda Katalogo Direktorio Gisa"
@@ -12483,7 +12483,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Lotarako Denbora Berrasi Botoiak Sakatzean"
@@ -12511,7 +12511,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Abiaraztean Hasi Lotarako Denbora"

apps/lang/bulgarian.lang

@@ -231,8 +231,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2747,7 +2747,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Скролиране на екрана извън изгледа"
@@ -3033,7 +3033,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Минимален обхват"
@@ -3047,7 +3047,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Максимален обхват"
@@ -3361,59 +3361,53 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Battery Type"
+    battery_types: ""
   </source>
   <dest>
     *: none
-    battery_types: "Тип на батерията"
+    battery_types: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Тип на батерията"
+    battery_types: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "Алкална"
-    xduoox3: "Нов модел (2000 mAh)"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Алкална"
-    xduoox3: "Нов модел 2000 милиампер часа"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "NiMH "
-    xduoox3: "Стар модел (1500 mAh)"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Никел Метал Хидридна"
-    xduoox3: "Стар модел 1500 милиампер часа"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
@@ -3546,22 +3540,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Запази"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Запази"
-    gogearsa9200,samsungyh*: "PLAY = Запази"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Запази"
     iriverh100,iriverh120,iriverh300: "NAVI = Запази"
     mpiohd300: "ENTER = Запази"
     mrobe500: "HEART = Запази"
-    rtc: "ON = Запази"
     vibe500: "OK = Запази"
   </dest>
   <voice>
@@ -3575,29 +3569,29 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = отказ"
     gigabeatfx,mrobe500: "POWER = отказ"
-    gigabeats,sansafuzeplus: "BACK = отказ"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = отказ"
     gogearsa9200: "LEFT = отказ"
     iaudiom5,iaudiox5: "RECORD = отказ"
     ipod*,mpiohd300,sansac200*: "MENU = отказ"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = отказ"
     iriverh100,iriverh120,iriverh300: "STOP = отказ"
     mrobe100: "DISPLAY = отказ"
-    rtc: "OFF = отказ"
     samsungyh*: "REW = отказ"
     vibe500: "CANCEL = отказ"
   </dest>
@@ -4037,7 +4031,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5044,7 +5038,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5795,16 +5789,16 @@
 </phrase>
 <phrase>
   id: LANG_CATALOG
-  desc: in main menu and onplay menu
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist Catalogue"
+    *: ""
   </source>
   <dest>
-    *: "Каталог с плейлисти"
+    *: ""
   </dest>
   <voice>
-    *: "Каталог с плейлисти"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6168,7 +6162,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Търсене в плейлиста"
@@ -6518,10 +6512,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6757,7 +6751,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -8695,16 +8689,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Часът е"
   </dest>
   <voice>
     *: none
@@ -8739,20 +8733,6 @@
     *: "Честота на отрязване"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_SYSFONT_GAIN
-  desc: in the equalizer settings menu
-  user: core
-  <source>
-    *: "Gain"
-  </source>
-  <dest>
-    *: "Усилване"
-  </dest>
-  <voice>
-    *: "Усилване"
-  </voice>
-</phrase>
 <phrase>
   id: VOICE_OF
   desc: spoken only, as in 3/8 => 3 of 8
@@ -9323,7 +9303,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9341,7 +9321,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10753,23 +10733,6 @@
     histogram: "Интервал на хистограмата"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_LINEOUT_ONOFF
-  desc: in system settings menu
-  user: core
-  <source>
-    *: none
-    lineout_poweroff: "Line Out"
-  </source>
-  <dest>
-    *: none
-    lineout_poweroff: "Линеен изход"
-  </dest>
-  <voice>
-    *: none
-    lineout_poweroff: "Линеен изход"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_HOTKEY
   desc: hotkey menu
@@ -11227,7 +11190,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Автоматично възобновяване"
@@ -11373,7 +11336,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Стартирай таймера на заспиване при включване"
@@ -11477,7 +11440,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Рестартирай таймера на заспиване при натискане на бутон"
@@ -11615,20 +11578,6 @@
     *: "Време за нападение"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_SYSFONT_EQUALIZER_BAND_Q
-  desc: in the equalizer settings menu
-  user: core
-  <source>
-    *: "Q"
-  </source>
-  <dest>
-    *: "Q"
-  </dest>
-  <voice>
-    *: "Q"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_FILTER_SLOW
   desc: in sound settings
@@ -11929,7 +11878,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Сила на гласовите съобщения"
@@ -12543,16 +12492,16 @@
 </phrase>
 <phrase>
   id: LANG_PLAYTIME_REMAINING
-  desc: playing time screen
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist remaining:"
+    *: ""
   </source>
   <dest>
-    *: "Оставащо време в плейлистата:"
+    *: ""
   </dest>
   <voice>
-    *: "Оставащо време в плейлистата"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13295,48 +13244,6 @@
     *: "Ниво 7, 40 хода за 240 минути"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Ниво 8: 1 ход / 15 мин"
-  </dest>
-  <voice>
-    *: "Ниво 8, 1 ход за 15 минути"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Ниво 9: 1 ход / 60 мин"
-  </dest>
-  <voice>
-    *: "Ниво 9, 1 ход за 60 минути"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Ниво 10: 1 ход / 600 мин"
-  </dest>
-  <voice>
-    *: "Ниво 10, 1 ход за 600 минути"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_PGN_PARSE_ERROR
   desc: in the chessbox game viewer
@@ -14730,16 +14637,16 @@
 </phrase>
 <phrase>
   id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
+  desc: deprecated
   user: core
   <source>
-    *: "Cache will be rebuilt on next restart"
+    *: ""
   </source>
   <dest>
-    *: "Кешът ще се прегенерира при следващия рестарт"
+    *: ""
   </dest>
   <voice>
-    *: "Кешът ще се прегенерира при следващия рестарт"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15150,7 +15057,7 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
     *: "Избери плъгин за WPS контекст"
@@ -16244,62 +16151,6 @@
     *: "Експертно"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_STEREOSW_MODE
-  desc: Stereo Switch Mode
-  user: core
-  <source>
-    *: "Stereo Switch Mode"
-  </source>
-  <dest>
-    *: "Разменяне на стерео"
-  </dest>
-  <voice>
-    *: "Разменяне на стерео"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_REVERSE
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Reverse"
-  </source>
-  <dest>
-    *: "Обърнато"
-  </dest>
-  <voice>
-    *: "Обърнато"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_ALWAYS_ZERO
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Always 0"
-  </source>
-  <dest>
-    *: "Винаги 0"
-  </dest>
-  <voice>
-    *: "Винаги 0"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_ALWAYS_ONE
-  desc: in settings_menu
-  user: core
-  <source>
-    *: "Always 1"
-  </source>
-  <dest>
-    *: "Винаги 1"
-  </dest>
-  <voice>
-    *: "Винаги 1"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_LEGAL_NOTICES
   desc: in system menu

apps/lang/catala.lang

@@ -229,8 +229,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2935,7 +2935,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Desplaçament fora de la pantalla"
@@ -3260,7 +3260,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3277,7 +3277,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3773,22 +3773,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Desa"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: " SELECT = Desa"
     gogearsa9200,samsungyh*: "PLAY = Desa"
     iriverh100,iriverh120,iriverh300: "NAVI = Desa"
     mpiohd300: "ENTER = Desa"
     mrobe500: "HEART = Desa"
-    rtc: "ON = Desa"
     vibe500: "OK = Desa"
   </dest>
   <voice>
@@ -3801,6 +3801,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3809,12 +3810,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Cancel·la"
     gigabeatfx,mrobe500: "POWER = Cancel·la"
     gigabeats,sansafuzeplus: "BACK = Cancel·la"
     gogearsa9200: "LEFT = Cancel·la"
@@ -3823,7 +3824,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Cancel·la"
     iriverh100,iriverh120,iriverh300: "STOP = Cancel·la"
     mrobe100: "DISPLAY = Cancel·la"
-    rtc: "OFF = Cancel·la"
     samsungyh*: "REW = Cancel·la"
     vibe500: "CANCEL = Cancel·la"
   </dest>
@@ -4261,7 +4261,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5429,7 +5429,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5687,7 +5687,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6693,7 +6693,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Cercar a la llista de reproducció"
@@ -7071,10 +7071,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7324,7 +7324,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9404,20 +9404,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Hora actual"
   </dest>
   <voice>
     *: none
-    rtc: "Hora actual:"
+    rtc: "Hora actual"
   </voice>
 </phrase>
 <phrase>
@@ -10267,7 +10267,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10285,7 +10285,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -12162,7 +12162,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Reprendre la reproducció automàticament"
@@ -12300,13 +12300,13 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </dest>
   <voice>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </voice>
 </phrase>
 <phrase>
@@ -12491,7 +12491,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Reiniciar el temporitzador al prémer una tecla"
@@ -12564,7 +12564,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Inicia el temportzador al arrancar"

apps/lang/chinese-simp.lang

@@ -2862,7 +2862,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "允许列表查看时滚动全屏"
@@ -3086,7 +3086,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "量程最小值"
@@ -3100,7 +3100,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "量程最大值"
@@ -3123,63 +3123,6 @@
     *: "电池容量"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Battery Type"
-  </source>
-  <dest>
-    *: none
-    battery_types: "电池类型"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "电池类型"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "碱性"
-    xduoox3: "新电池 (2000 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "碱性"
-    xduoox3: "新电池"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "锂镁氢"
-    xduoox3: "旧电池 (1500 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "锂镁氢"
-    xduoox3: "旧电池"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SPINDOWN
   desc: in settings_menu
@@ -3444,7 +3387,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -3631,7 +3574,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "在播放列表中查找"
@@ -3804,16 +3747,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "现在时间"
   </dest>
   <voice>
     *: none
@@ -3930,22 +3873,23 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF:取消"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK:取消"
     gigabeatfx: "POWER:取消"
-    gigabeats,sansafuzeplus: "BACK:取消"
     gogearsa9200: "LEFT:取消"
     iaudiom5,iaudiox5: "RECORD:取消"
     ipod*,mpiohd300,sansac200*: "MENU:取消"
@@ -3953,13 +3897,11 @@
     iriverh100,iriverh120,iriverh300: "STOP:取消"
     mrobe100: "DISPLAY:取消"
     mrobe500: "电源:取消"
-    rtc: "OFF:取消"
     samsungyh*: "REW:取消"
     vibe500: "CANCEL:取消"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4112,7 +4054,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4339,7 +4281,7 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
     *: "(VBR)"
@@ -6292,7 +6234,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "正在扫描"
   </voice>
 </phrase>
 <phrase>
@@ -6562,7 +6504,7 @@
     *: "无法打开%s"
   </dest>
   <voice>
-    *: ""
+    *: "无法打开插件"
   </voice>
 </phrase>
 <phrase>
@@ -6576,7 +6518,7 @@
     *: "读取%s失败"
   </dest>
   <voice>
-    *: ""
+    *: "读取文件失败"
   </voice>
 </phrase>
 <phrase>
@@ -7133,7 +7075,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -7453,27 +7395,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON:设置"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY:设置"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT:设置"
-    gogearsa9200,samsungyh*: "PLAY:设置"
     iriverh100,iriverh120,iriverh300: "NAVI=设置"
     mpiohd300: "ENTER:设置"
     mrobe500: "HEART:设置"
-    rtc: "ON:设置"
     vibe500: "OK:设置"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -7986,20 +7927,6 @@
     headphone_detection: "拔出耳机后自动暂停"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: in main menu and onplay menu
-  user: core
-  <source>
-    *: "Playlist Catalogue"
-  </source>
-  <dest>
-    *: "播放列表目录"
-  </dest>
-  <voice>
-    *: "播放列表目录"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SPLIT_MEASURE
   desc: in record timesplit options
@@ -8763,8 +8690,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -9379,7 +9306,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -9581,7 +9508,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -11101,7 +11028,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "自动断点续播"
@@ -11478,7 +11405,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "按键时重置睡眠计时器"
@@ -11551,7 +11478,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "开机即启动睡眠计时器"
@@ -11871,7 +11798,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "语音提示音量"
@@ -12500,20 +12427,6 @@
     *: "曲目已播放"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -13254,48 +13167,6 @@
     *: "Level 7, 40 步 每240 分钟"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Level 8: 1 步 / 15 分钟"
-  </dest>
-  <voice>
-    *: "Level 8, 1 步 每15 分钟"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Level 9: 1 步 / 60 分钟"
-  </dest>
-  <voice>
-    *: "Level 9, 1 步 每60 分钟"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Level 10: 1 步 / 600 分钟"
-  </dest>
-  <voice>
-    *: "Level 10, 1 步 每 600 分钟"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_PGN_PARSE_ERROR
   desc: in the chessbox game viewer
@@ -14108,16 +13979,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "切换项目"
+    *: ""
   </dest>
   <voice>
-    *: "切换项目"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14178,13 +14049,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox主屏幕菜单定制"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14687,20 +14558,6 @@
     *: "未找到专辑艺术"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Cache will be rebuilt on next restart"
-  </source>
-  <dest>
-    *: "下次启动时重建缓存"
-  </dest>
-  <voice>
-    *: "下次启动时重建缓存"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -15110,7 +14967,7 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
     *: "设置播放屏幕上下文插件"
@@ -17039,3 +16896,31 @@
     *: "无法加载字体"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "排序播放列表"
+  </dest>
+  <voice>
+    *: "排序播放列表"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[按专辑排序]"
+  </dest>
+  <voice>
+    *: "按专辑排序的所有乐曲"
+  </voice>
+</phrase>

apps/lang/chinese-trad.lang

@@ -2863,7 +2863,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "畫面範圍外捲動"
@@ -3087,7 +3087,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "最小範圍"
@@ -3101,7 +3101,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "最大範圍"
@@ -3405,7 +3405,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -3648,7 +3648,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "在播放清單內搜尋"
@@ -3835,20 +3835,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -3961,6 +3961,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3969,12 +3970,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = 返回"
     gigabeatfx: "POWER = 返回"
     gigabeats,sansafuzeplus: "BACK = 返回"
     gogearsa9200,ipod*,mpiohd300,sansac200*: "MENU = 返回"
@@ -3983,7 +3984,6 @@
     iriverh100,iriverh120,iriverh300: "STOP = 返回"
     mrobe100: "DISPLAY = 返回"
     mrobe500: "POWER = Revert"
-    rtc: "OFF = 返回"
     samsungyh*: "REW = 返回"
     vibe500: "CANCEL = 返回"
   </dest>
@@ -4159,7 +4159,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4432,7 +4432,7 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
     *: " (變動位元率)"
@@ -7254,7 +7254,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -7577,22 +7577,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = 設定"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = 設定"
     gogearsa9200,samsungyh*: "PLAY = 設定"
     iriverh100,iriverh120,iriverh300: "NAVI = 設定"
     mpiohd300: "ENTER = 設定"
     mrobe500: "HEART = Set"
-    rtc: "ON = 設定"
     sansaclip*,sansaconnect,sansafuze*: "SELECT = Set"
     vibe500: "OK = 設定"
   </dest>
@@ -8944,8 +8944,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -9022,7 +9022,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -9724,7 +9724,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10050,7 +10050,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10287,7 +10287,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "偵測到按鍵時重置睡眠計時器"
@@ -10301,7 +10301,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "開機即啓動睡眠計時"
@@ -10329,7 +10329,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "單檔案斷點續撥"
@@ -10792,7 +10792,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "設定為播放清單目錄位置"
@@ -10876,7 +10876,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "開機即啓動睡眠計時"
@@ -10890,7 +10890,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "偵測到按鍵時重置睡眠計時器"
@@ -10904,7 +10904,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "單檔案斷點續撥"

apps/lang/czech.lang

@@ -231,8 +231,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2923,7 +2923,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Rolování obrazovky mimo"
@@ -3250,7 +3250,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3267,7 +3267,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3763,22 +3763,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Nastavit"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Nastavit"
     gogearsa9200,samsungyh*: "PLAY = Nastavit"
     iriverh100,iriverh120,iriverh300: "NAVI = Nastavit"
     mpiohd300: "ENTER = Nastavit"
     mrobe500: "HEART = Nastavit"
-    rtc: "ON = Nastavit"
     vibe500: "OK = Nastavit"
   </dest>
   <voice>
@@ -3792,6 +3792,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3800,12 +3801,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Vrátit zpět"
     gigabeatfx,mrobe500: "POWER = Vrátit zpět"
     gigabeats,sansafuzeplus: "BACK = Vrátit zpět"
     gogearsa9200: "LEFT = Vrátit zpět"
@@ -3814,7 +3815,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Vrátit zpět"
     iriverh100,iriverh120,iriverh300: "STOP = Vrátit zpět"
     mrobe100: "DISPLAY = Vrátit zpět"
-    rtc: "OFF = Vrátit zpět"
     samsungyh*: "REW = Vrátit zpět"
     vibe500: "CANCEL = Vrátit zpět"
   </dest>
@@ -4271,7 +4271,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5426,7 +5426,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5684,7 +5684,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6706,7 +6706,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Hledat v playlistu"
@@ -7084,10 +7084,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "vé bé er"
@@ -7337,7 +7337,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9427,20 +9427,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Aktuální čas"
   </dest>
   <voice>
     *: none
-    rtc: "Aktuální čas:"
+    rtc: "Aktuální čas"
   </voice>
 </phrase>
 <phrase>
@@ -10290,7 +10290,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10308,7 +10308,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -12250,7 +12250,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Pokračování přehrávání u všech skladeb"
@@ -12306,7 +12306,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Nastavit jako složku pro katalog playlistů"
@@ -12424,7 +12424,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Aktivovat časovač vypnutí při startu přehrávače"
@@ -12528,7 +12528,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Stisk klávesy restartuje časovač vypnutí"

apps/lang/dansk.lang

@@ -2857,7 +2857,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -2874,7 +2874,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3533,16 +3533,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Klokken er"
   </dest>
   <voice>
     *: none
@@ -3659,6 +3659,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3667,12 +3668,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "SLUK = Fortryd"
     gigabeatfx,mrobe500: "TÆND/SLUK = Fortryd"
     gigabeats: "TILBAGE = Fortryd"
     gogearsa9200: "VENSTRE = Fortryd"
@@ -3681,7 +3682,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "FORRIGE = Fortryd"
     iriverh100,iriverh120,iriverh300: "STOP = Fortryd"
     mrobe100: "VIS = Fortryd"
-    rtc: "SLUK = Fortryd"
     samsungyh*: "REW = Fortryd"
     vibe500: "C = Fortryd"
   </dest>
@@ -3856,7 +3856,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4064,10 +4064,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6841,7 +6841,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Skærm ruller ud"
@@ -6900,7 +6900,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Søg i sætliste"
@@ -7292,7 +7292,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -8238,7 +8238,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -9164,7 +9164,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -9347,22 +9347,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "Tænd = Indstil"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "VÆLG = Indstil"
     gogearsa9200,samsungyh*: "SPIL = Indstil"
     iriverh100,iriverh120,iriverh300: "NAVI = Indstil"
     mpiohd300: "ENTER = Indstil"
     mrobe500: "HJERTE = Indstil"
-    rtc: "Tænd = Indstil"
     vibe500: "OK = Indstil"
   </dest>
   <voice>
@@ -9785,8 +9785,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -10263,7 +10263,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10304,7 +10304,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -12230,7 +12230,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatisk fortsættelse"
@@ -12424,7 +12424,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Vælg mappe til sætliste katalog"
@@ -12567,7 +12567,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Nulstil auto-sluk ved tastetryk"
@@ -12640,7 +12640,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Start auto-sluk ved opstart"

apps/lang/deutsch.lang

@@ -36,6 +36,7 @@
 # - Johannes Rauh
 # - Wilfried Winkler
 # - Karl Huber
+# - Yannic Schmidt
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -247,8 +248,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2733,7 +2734,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Über Bildschirmrand scrollen"
@@ -3019,7 +3020,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Kleinster Wert"
@@ -3033,7 +3034,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Größter Wert"
@@ -3345,63 +3346,6 @@
     *: "Batteriekapazität"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Battery Type"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Batterietyp"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Batterietyp"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "~Alkaline"
-    xduoox3: "Neuer (2000 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "~Alkaline"
-    xduoox3: "Nuwer 2000 milliamp hour"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "~NiMH"
-    xduoox3: "Älter (1500 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Nickel-Metallhydrid"
-    xduoox3: "Älter 1500 Milliamperestunden"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3532,27 +3476,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Speichern"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Speichern"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Speichern"
-    gogearsa9200,samsungyh*: "PLAY = Speichern"
     iriverh100,iriverh120,iriverh300: "NAVI = Speichern"
     mpiohd300: "ENTER = Speichern"
     mrobe500: "HEART = Speichern"
-    rtc: "ON = Speichern"
     vibe500: "OK = Speichern"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3561,35 +3504,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Abbrechen"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Abbrechen"
     gigabeatfx,mrobe500: "POWER = Abbrechen"
-    gigabeats,sansafuzeplus: "BACK = Abbrechen"
     gogearsa9200: "LEFT = Abbrechen"
     iaudiom5,iaudiox5: "RECORD = Abbrechen"
     ipod*,mpiohd300,sansac200*: "MENU = Abbrechen"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Abbrechen"
     iriverh100,iriverh120,iriverh300: "STOP = Abbrechen"
     mrobe100: "DISPLAY = Abbrechen"
-    rtc: "OFF = Abbrechen"
     samsungyh*: "REW = Abbrechen"
     vibe500: "CANCEL = Abbrechen"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4023,7 +3965,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4667,7 +4609,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Suche"
   </voice>
 </phrase>
 <phrase>
@@ -5030,7 +4972,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5779,20 +5721,6 @@
     *: "Titel abgespeichert"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: in main menu and onplay menu
-  user: core
-  <source>
-    *: "Playlist Catalogue"
-  </source>
-  <dest>
-    *: "Wiedergabelisten-Katalog"
-  </dest>
-  <voice>
-    *: "Wiedergabelisten-Katalog"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6154,7 +6082,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Wiedergabeliste durchsuchen"
@@ -6465,10 +6393,10 @@
     *: "Album Artist"
   </source>
   <dest>
-    *: "Album-Künstler"
+    *: "Album Künstler"
   </dest>
   <voice>
-    *: "Album-Künstler"
+    *: "Album Künstler"
   </voice>
 </phrase>
 <phrase>
@@ -6504,10 +6432,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6743,7 +6671,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7229,7 +7157,7 @@
     *: "Kann %s nicht öffnen"
   </dest>
   <voice>
-    *: ""
+    *: "Kann das Plugin nicht öffnen"
   </voice>
 </phrase>
 <phrase>
@@ -7243,7 +7171,7 @@
     *: "Fehler beim Lesen von %s"
   </dest>
   <voice>
-    *: ""
+    *: "Fehler beim Lesen von Datei"
   </voice>
 </phrase>
 <phrase>
@@ -8681,16 +8609,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Uhrzeit"
   </dest>
   <voice>
     *: none
@@ -9302,7 +9230,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -9385,7 +9313,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -11199,7 +11127,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatisches Fortsetzen"
@@ -11407,7 +11335,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Einschlaftimer bei Tastendruck zurücksetzen"
@@ -11449,7 +11377,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Einschlaftimer automatisch starten"
@@ -13013,20 +12941,6 @@
     recording: "Aufnahmeverzeichnis"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Level 9: 1 Züge / 60 min"
-  </dest>
-  <voice>
-    *: "Level 9, 1 Züge pro 60 Minuten"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHANGE_VOLUME
   desc: in playback control menu
@@ -13340,13 +13254,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox Anordnung Hauptmenü"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -13532,20 +13446,6 @@
     *: "Größe"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RESTART_PLAYBACK
   desc: in the mpegplayer settings menu
@@ -13681,20 +13581,6 @@
     *: "Nächster Titel"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Cache will be rebuilt on next restart"
-  </source>
-  <dest>
-    *: "Zwischenspeicher wird bei Neustart neu erstellt"
-  </dest>
-  <voice>
-    *: "Zwischenspeicher wird bei Neustart neu erstellt"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_THINKING
   desc: in chessbox
@@ -13975,16 +13861,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Element umschalten"
+    *: ""
   </dest>
   <voice>
-    *: "Element umschalten"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14279,20 +14165,6 @@
     *: "Dateien"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Level 10: 1 Zug / 600 min"
-  </dest>
-  <voice>
-    *: "Level 10, 1 Zug pro 600 Minuten"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_MENU_NEW_GAME
   desc: in the chessbox menu
@@ -14349,20 +14221,6 @@
     *: "Wormlet spielen!"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Level 8: 1 Zug / 15 min"
-  </dest>
-  <voice>
-    *: "Level 8, 1 Zug pro 15 Minuten"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SLIDESHOW_MODE
   desc: in the imageviewer settings menu
@@ -14466,7 +14324,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Lautstärke Sprachansage"
@@ -15120,7 +14978,7 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
     *: "Setze WPS Kontext Zusatzprogramm"
@@ -16573,3 +16431,507 @@
     *: "Wiedergabliste beendet. Erneut abspielen?"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_DISPLAY_SPECIAL_CHARACTER
+  desc: Special character (japanese, accents, etc)
+  user: core
+  <source>
+    *: "Special character"
+  </source>
+  <dest>
+    *: "Sonderzeichen"
+  </dest>
+  <voice>
+    *: "Sonderzeichen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ID3_ALBUMARTISTS
+  desc: in tag viewer
+  user: core
+  <source>
+    *: "Album Artists"
+  </source>
+  <dest>
+    *: "Album Künstler"
+  </dest>
+  <voice>
+    *: "Album Künstler"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_FIRST_LETTER
+  desc: Database menu
+  user: core
+  <source>
+    *: "First Letter"
+  </source>
+  <dest>
+    *: "Anfangsbuchstabe"
+  </dest>
+  <voice>
+    *: "Anfangsbuchstabe"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_BY_FIRST_LETTER
+  desc: Database menu
+  user: core
+  <source>
+    *: "By First Letter..."
+  </source>
+  <dest>
+    *: "Nach Anfangsbuchstaben"
+  </dest>
+  <voice>
+    *: "Nach Anfangsbuchstaben"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ARTISTS_BY_FIRST_LETTER
+  desc: Database menu
+  user: core
+  <source>
+    *: "Artists by First Letter"
+  </source>
+  <dest>
+    *: "Künstler nach Anfangsbuchstaben"
+  </dest>
+  <voice>
+    *: "Künstler nach Anfangsbuchstaben"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALBUM_ARTISTS_BY_FIRST_LETTER
+  desc: Database menu
+  user: core
+  <source>
+    *: "Album Artists by First Letter"
+  </source>
+  <dest>
+    *: "Album Künstler nach Anfangsbuchstaben"
+  </dest>
+  <voice>
+    *: "Album Künstler nach Anfangsbuchstaben"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_ALBUMS_BY_FIRST_LETTER
+  desc: Database menu
+  user: core
+  <source>
+    *: "Albums by First Letter"
+  </source>
+  <dest>
+    *: "Alben nach Anfangsbuchstaben"
+  </dest>
+  <voice>
+    *: "Alben nach Anfangsbuchstaben"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHOW_TRACKS_BY_FIRST_LETTER
+  desc: Database menu
+  user: core
+  <source>
+    *: "Tracks by First Letter"
+  </source>
+  <dest>
+    *: "Lieder nach Anfangsbuchstaben"
+  </dest>
+  <voice>
+    *: "Lieder nach Anfangsbuchstaben"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTISTS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Artists"
+  </source>
+  <dest>
+    *: "Künstler"
+  </dest>
+  <voice>
+    *: "Künstler"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUMS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Albums"
+  </source>
+  <dest>
+    *: "Alben"
+  </dest>
+  <voice>
+    *: "Alben"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACKS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Tracks"
+  </source>
+  <dest>
+    *: "Lieder"
+  </dest>
+  <voice>
+    *: "Lieder"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SHUFFLE_SONGS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Shuffle Songs"
+  </source>
+  <dest>
+    *: "Zufallswiedergabe"
+  </dest>
+  <voice>
+    *: "Zufallswiedergabe"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_FILENAME
+  desc: Database and recording menus
+  user: core
+  <source>
+    *: "Filename"
+  </source>
+  <dest>
+    *: "Dateinamen"
+  </dest>
+  <voice>
+    *: "Dateinamen"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TITLE_WITH_DURATION
+  desc: Database menu
+  user: core
+  <source>
+    *: "Title (with track duration)"
+  </source>
+  <dest>
+    *: "Titel (mit Spieldauer)"
+  </dest>
+  <voice>
+    *: "Titel mit Spieldauer"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USER_RATING
+  desc: Database menu
+  user: core
+  <source>
+    *: "User Rating"
+  </source>
+  <dest>
+    *: "Benutzerbewertung"
+  </dest>
+  <voice>
+    *: "Benutzerbewertung"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH
+  desc: Database menu
+  user: core
+  <source>
+    *: "Search"
+  </source>
+  <dest>
+    *: "Suche"
+  </dest>
+  <voice>
+    *: "Suche"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH_BY
+  desc: Database menu
+  user: core
+  <source>
+    *: "Search by..."
+  </source>
+  <dest>
+    *: "Suche nach"
+  </dest>
+  <voice>
+    *: "Suche nach"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECENTLY_ADDED
+  desc: Database menu
+  user: core
+  <source>
+    *: "Recently Added"
+  </source>
+  <dest>
+    *: "Kürzlich hinzugefügt"
+  </dest>
+  <voice>
+    *: "Kürzlich hinzugefügt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PLAYBACK_HISTORY
+  desc: Database menu
+  user: core
+  <source>
+    *: "Playback History"
+  </source>
+  <dest>
+    *: "Wiedergabeverlauf"
+  </dest>
+  <voice>
+    *: "Wiedergabeverlauf"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CUSTOM_MENU
+  desc: Database menu
+  user: core
+  <source>
+    *: "Custom menu"
+  </source>
+  <dest>
+    *: "individuelles Menü"
+  </dest>
+  <voice>
+    *: "individuelles Menü"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAME_AS_CURRENT
+  desc: Database menu
+  user: core
+  <source>
+    *: "Same as currently played track"
+  </source>
+  <dest>
+    *: "Gleich wie der aktuell gespielte Titel"
+  </dest>
+  <voice>
+    *: "Gleich wie der aktuell gespielte Titel"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_DIRECTORY
+  desc: Database menu
+  user: core
+  <source>
+    *: "Directory"
+  </source>
+  <dest>
+    *: "Verzeichnis"
+  </dest>
+  <voice>
+    *: "Verzeichnis"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUMS_BY_YEAR
+  desc: Database menu
+  user: core
+  <source>
+    *: "Albums by Year"
+  </source>
+  <dest>
+    *: "Alben nach Jahr"
+  </dest>
+  <voice>
+    *: "Alben nach Jahr"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ALBUMS_BETWEEN_YEARS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Albums between Years"
+  </source>
+  <dest>
+    *: "Alben zwischen den Jahren"
+  </dest>
+  <voice>
+    *: "Alben zwischen den Jahren"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_ARTISTS_BETWEEN_YEARS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Artists between Years"
+  </source>
+  <dest>
+    *: "Künstler zwischen den Jahren"
+  </dest>
+  <voice>
+    *: "Künstler zwischen den Jahren"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_MOST_PLAYED
+  desc: Database menu
+  user: core
+  <source>
+    *: "Most played (Plays|Score)"
+  </source>
+  <dest>
+    *: "Meistgespielt (Anzahl|Punktzahl)"
+  </dest>
+  <voice>
+    *: "Meistgespielt nach Anzahl dann nach Punktzahl"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_RECENTLY_PLAYED_TRACKS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Recently played tracks"
+  </source>
+  <dest>
+    *: "Kürzlich gespielt"
+  </dest>
+  <voice>
+    *: "Kürzlich gespielt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_NEVER_PLAYED_TRACKS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Never played tracks"
+  </source>
+  <dest>
+    *: "Noch nie gespielt"
+  </dest>
+  <voice>
+    *: "Noch nie gespielt"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_FAVOURITE_ARTISTS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Favourite artists"
+  </source>
+  <dest>
+    *: "Lieblingskünstler"
+  </dest>
+  <voice>
+    *: "Lieblingskünstler"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_FAVOURITE_ALBUMS
+  desc: Database menu
+  user: core
+  <source>
+    *: "Favourite albums"
+  </source>
+  <dest>
+    *: "Lieblingsalben"
+  </dest>
+  <voice>
+    *: "Lieblingsalben"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_RECENT_FAVOURITES
+  desc: Database menu
+  user: core
+  <source>
+    *: "Recent favourites"
+  </source>
+  <dest>
+    *: "Aktuelle Favoriten"
+  </dest>
+  <voice>
+    *: "Aktuelle Favoriten"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_NEW_FAVOURITES
+  desc: Database menu
+  user: core
+  <source>
+    *: "New favourites"
+  </source>
+  <dest>
+    *: "Neue Favoriten"
+  </dest>
+  <voice>
+    *: "Neue Favoriten"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_HISTORY_FORGOTTEN_FAVOURITES
+  desc: Database menu
+  user: core
+  <source>
+    *: "Forgotten favourites"
+  </source>
+  <dest>
+    *: "Vergessene Favoriten"
+  </dest>
+  <voice>
+    *: "Vergessene Favoriten"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TRACKS_BY
+  desc: Database menu
+  user: core
+  <source>
+    *: "Tracks by"
+  </source>
+  <dest>
+    *: "Titel nach"
+  </dest>
+  <voice>
+    *: "Titel nach"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[Nach Album]"
+  </dest>
+  <voice>
+    *: "Alle Titel sortiert nach Album"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Playlists sortieren"
+  </dest>
+  <voice>
+    *: "playlists sortieren"
+  </voice>
+</phrase>

apps/lang/eesti.lang

@@ -2961,7 +2961,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Kerimiseribad vaateväljast väljas"
@@ -3199,7 +3199,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Väikseim ulatus"
@@ -3213,7 +3213,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Suurim ulatus"
@@ -3549,7 +3549,7 @@
   desc: text for onplay menu entry
   user: core
   <source>
-    *: "Set As Backdrop"
+    *: "Set as Backdrop"
   </source>
   <dest>
     *: "Sea backdropina"
@@ -3787,7 +3787,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Otsi esitusloendist"
@@ -3984,17 +3984,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
-    *: ""
+    *: none
+    rtc: "Current Time"
   </source>
   <dest>
-    *: ""
+    *: none
+    rtc: "Kellaaeg"
   </dest>
   <voice>
-    *: "Kellaaeg:"
+    *: none
+    rtc: "Kellaaeg"
   </voice>
 </phrase>
 <phrase>
@@ -4304,10 +4307,10 @@
   desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
   user: core
   <source>
-    *: "Waking Up In %d:%02d"
+    *: "Waking Up in %d:%02d"
   </source>
   <dest>
-    *: "Waking Up In %d:%02d"
+    *: "Waking Up in %d:%02d"
   </dest>
   <voice>
     *: ""
@@ -4550,10 +4553,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"

apps/lang/english-us.lang

@@ -225,8 +225,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -1265,7 +1265,7 @@
     *: "Fade on Stop/Pause"
   </dest>
   <voice>
-    *: "Fade On Stop and Pause"
+    *: "Fade on Stop and Pause"
   </voice>
 </phrase>
 <phrase>
@@ -2741,13 +2741,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </dest>
   <voice>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </voice>
 </phrase>
 <phrase>
@@ -3027,13 +3027,13 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </dest>
   <voice>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </voice>
 </phrase>
 <phrase>
@@ -3041,13 +3041,13 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </dest>
   <voice>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </voice>
 </phrase>
 <phrase>
@@ -3353,63 +3353,6 @@
     *: "Battery Capacity"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Battery Type"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Battery Type"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Battery type"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer 2000 milliamp hour"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Nickel metal hydride"
-    xduoox3: "Older 1500 milliamp hour"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3540,27 +3483,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3569,35 +3511,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4031,11 +3972,11 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </dest>
   <voice>
     *: none
@@ -4675,7 +4616,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Scanning"
   </voice>
 </phrase>
 <phrase>
@@ -5038,15 +4979,15 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </dest>
   <voice>
     *: none
-    recording: "Same As Source"
+    recording: "Same as Source"
   </voice>
 </phrase>
 <phrase>
@@ -5787,20 +5728,6 @@
     *: "tracks saved"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: in main menu and onplay menu
-  user: core
-  <source>
-    *: "Playlist Catalogue"
-  </source>
-  <dest>
-    *: "Playlist Catalog"
-  </dest>
-  <voice>
-    *: "Playlist Catalog"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6162,13 +6089,13 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </dest>
   <voice>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </voice>
 </phrase>
 <phrase>
@@ -6512,10 +6439,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6751,15 +6678,15 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -7237,7 +7164,7 @@
     *: "Can't open %s"
   </dest>
   <voice>
-    *: ""
+    *: "Can't open plugin"
   </voice>
 </phrase>
 <phrase>
@@ -7251,7 +7178,7 @@
     *: "Failed reading %s"
   </dest>
   <voice>
-    *: ""
+    *: "Failed reading file"
   </voice>
 </phrase>
 <phrase>
@@ -8689,16 +8616,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
@@ -9157,13 +9084,13 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </dest>
   <voice>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </voice>
 </phrase>
 <phrase>
@@ -9317,7 +9244,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9335,15 +9262,15 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </dest>
   <voice>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </voice>
 </phrase>
 <phrase>
@@ -11235,13 +11162,13 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </dest>
   <voice>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </voice>
 </phrase>
 <phrase>
@@ -11381,13 +11308,13 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </dest>
   <voice>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </voice>
 </phrase>
 <phrase>
@@ -11513,13 +11440,13 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </dest>
   <voice>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </voice>
 </phrase>
 <phrase>
@@ -12490,20 +12417,6 @@
     *: "Track elapsed"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -13244,48 +13157,6 @@
     *: "Level 7, 40 moves per 240 minutes"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Level 8: 1 move / 15 min"
-  </dest>
-  <voice>
-    *: "Level 8, 1 move per 15 minutes"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Level 9: 1 move / 60 min"
-  </dest>
-  <voice>
-    *: "Level 9, 1 move per 60 minutes"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Level 10: 1 move / 600 min"
-  </dest>
-  <voice>
-    *: "Level 10, 1 move per 600 minutes"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_PGN_PARSE_ERROR
   desc: in the chessbox game viewer
@@ -14098,16 +13969,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Toggle Item"
+    *: ""
   </dest>
   <voice>
-    *: "Toggle Item"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14168,13 +14039,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14677,20 +14548,6 @@
     *: "No album art found"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Cache will be rebuilt on next restart"
-  </source>
-  <dest>
-    *: "Cache will be rebuilt on next restart"
-  </dest>
-  <voice>
-    *: "Cache will be rebuilt on next restart"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -15099,10 +14956,10 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </dest>
   <voice>
     *: "Set WPS Context Plugin"
@@ -15514,7 +15371,7 @@
     *: "Artist + Name"
   </dest>
   <voice>
-    *: "Artist And Name"
+    *: "Artist and Name"
   </voice>
 </phrase>
 <phrase>
@@ -15528,7 +15385,7 @@
     *: "Artist + Year"
   </dest>
   <voice>
-    *: "Artist And Year"
+    *: "Artist and Year"
   </voice>
 </phrase>
 <phrase>
@@ -17028,3 +16885,31 @@
     *: "Tracks by"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Sort Playlists"
+  </dest>
+  <voice>
+    *: "sort playlists"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[By album]"
+  </dest>
+  <voice>
+    *: "All tracks sorted by album"
+  </voice>
+</phrase>

apps/lang/english.lang

@@ -4,7 +4,6 @@
 #   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
 #   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
 #                     \/            \/     \/    \/            \/
-# $Id$
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -14,83 +13,80 @@
 # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
 # KIND, either express or implied.
 #
-# This is the master of the language files. This is the original, the one with
-# all the existing strings Rockbox features.
+# This is the root source of truth for Rockbox's translatable strings,
+# contianing all strings for all Rockbox features.  All other languages
+# overlay on top of this one.
 #
-# The target names used for target-specific strings are set in the ARCHOS
-# variable in the root Makefile
+# IMPORTANT NOTES:
 #
-# *WARNING*
+# * If you want to add a new string, add it to the end of this file!
+# * Removing strings will break the numbering of strings in binary lang
+#   and voice files, so instead of removing a unused <phrase>, change the
+#   desc field to "deprecated" (without quotes) and blank the strings.
+#   Do *not* change the targets.
+# * Due to strict run-time checks, binary lang and voice files are not
+#   portable from one device to another.  They may not even be compatible
+#   from one build to another on the same device, especially if phrases
+#   or strings were added (or removed) from this file, or if the features
+#   list for your device have changed.
 #
-# If you want to add a new string, add it to the end of this file!
-# Removing strings will break the numbering of strings in binary lang files and
-# voice files so instead of removing a unused <phrase>, change the desc field
-# to "deprecated" (without quotes) and either blank the strings or change them to
-# "deprecated" (without quotes) and do *not* change the targets.
+# As this file is both the master for the language system, as well as the
+# source for generating english strings, all <source> strings *must* be
+# *identical* to the <dest> strings within the english.lang file. The
+# <source> strings are referenced by other languages when doing updates,
+# while the <dest> strings are used when this file is used to as the
+# source of english strings for a particular target.  In other files,
+# the <dest> string is the translated text.
 #
-# If you re-order things or remove entries, you must bump the binary language
-# file version number in both the 'genlang' tool and the language loader code.
+# 'Targets' refer to both the unique device name (as specified in the
+# configure file and stored in MODELNAME of the top-level Makefile) and
+# to various common features that are shared between more than one
+# device. If mixed, the feature string must be placed at the top as a
+# default, so it gets overwritten by subsequent device strings.
+# See apps/features.txt for all available features that can be used
+# instead of or in addition to the device name itself.
 #
-# The "voice" entry contains how we want the speech UI to pronounce the phrase.
+# All phrases have a default string, designated with a target
+# of '*' (eg: *: "default text") that will be used if no other target
+# matches the particular device you are building for. If you want to
+# designate a particular string for a specific target, you would write
+# it like:
+#   target: "target-specific string"
+# and locate it below the the default line. If the phrase will not be
+# used for all targets, set the default to none, eg:
+#   *: none
+# to ensure it will not be included when it is not needed.
 #
-# Since this file is both the master for the language system, as well as the
-# source for generating english strings, make sure that all <source> strings
-# are *identical* to the <dest> strings within the english.lang file. The
-# <source> strings are the ones that'll be exposed and used by other languages
-# when doing updates etc, while the <dest> ones are used when this file is
-# used to simply get the full set of english strings for a particular target.
+# Phrases starting with LANG_ are displayed in the UI, and are usually
+# voiced as well. Phrases starting with VOICE_ are only voiced. They
+# *must* have empty (ie "") <source> and <dest> strings, and non-empty
+# <voice> strings.
 #
-# All phrases have a default string like: *: "default" that will be used if no
-# other string matches for the particular model you build the language for. If
-# you want a particular string for the iriver iriverh300 series you'd write it like:
-# iriverh300: "iriverh300-specific string" (below the default line). If your string isn't
-# used for all targets set the default to none like: *: none (no quotes!) this
-# will not include the string for target that will not need it, see
-# apps/features.txt for available categories that can be used instead of the
-# target name, for example: swcodec: "swcodec-specific string".
+# The individual entries under the <voice> section of a phrase contain
+# the text the speech UI will use to pronounce the phrase.  This is
+# usually the same as the <dest> section, albeit with some limitations.
+# For example, most punctuation and any dynamic strings (ie with with C
+# format specifiers) are not allowed.  If a phrase is not intended to be
+# voiced, you may use either an empty string (ie "") or 'none' under its
+# <voice> section.
 #
-# The target names used are picked from the configure script and are set in the
-# MODELNAME variable in the root makefile. This is an incomplete list:
-# Target        Target string
-# iriver
-# H100/H110/H115    iriverh100
-# H120/H140         iriverh120
-# H320/H340         iriverh300
-# H10               iriverh10
-# iaudio/Cowon
-# X5                iaudiox5
-# M5                iaudiom5
-# D2                cowond2*
-# ipod
-# All iPods         ipod*
-# 4G Color/Photo    ipodcolor
-# Nano              ipodnano1g
-# Video (5G)        ipodvideo
-# 3G                ipod3g
-# 4G gray           ipod4g
-# mini              ipodmini1g
-# mini 2G           ipodmini2g
-# Toshiba
-# All gigabeats     gigabeat*
-# Gigabeat Fxx      gigabeatfx
-# Gigabeat Sxx      gigabeats
-# Sandisk
-# Sansa E200        sansae200*
-# Sansa C200        sansac200*
-# Sansa Fuze        sansafuze*
-# Sansa Clip        sansaclip*
-# Olympus
-# m:robe 100        mrobe100
-# m:robe 500        mrobe500
-# Mpio
-# HD200             mpiohd200
-# HD300             mpiohd300
-# Packard Bell
-# Vibe 500          vibe500
-# Philips
-# GoGear SA9200     gogearsa9200
-# Samsung
-# YH820/YH920/YH925 samsungyh*
+# In <voice> sections, keep in mind that the text will be spoken by TTS
+# engines, so some changes from the <dest> may be necessary for clarity.
+# For example, you may want to separate acronyms into their individual
+# letters so they are spoken separately, or expand abbreviations into
+# their full form.  Some adjustments are made automatically; please see
+# tools/voice-corrections.txt for further details.
+#
+# To validate the contents of a translation, you can use the Rockbox
+# translation site at https://translate.rockbox.org.  Alternatively, you
+# can use the command-line 'updatelang' tool as follows:
+#
+#  tools/updatelang apps/lang/english.lang path/to/translation.lang path/to/updated.lang
+#
+# You can then examine the updated file. All problematic areas will be marked with '###'
+#
+####
+# This is the first item, and will be shown when P2STR is passed a NULL pointer
 <phrase>
   id: LANG_ROCKBOX_TITLE
   desc: main menu title
@@ -105,7 +101,6 @@
     *: "Rockbox"
   </voice>
 </phrase>
-# First item will be shown when P2STR is passed a NULL pointer
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -317,8 +312,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -1357,7 +1352,7 @@
     *: "Fade on Stop/Pause"
   </dest>
   <voice>
-    *: "Fade On Stop and Pause"
+    *: "Fade on Stop and Pause"
   </voice>
 </phrase>
 <phrase>
@@ -2875,13 +2870,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </dest>
   <voice>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </voice>
 </phrase>
 <phrase>
@@ -3175,13 +3170,13 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </dest>
   <voice>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </voice>
 </phrase>
 <phrase>
@@ -3189,13 +3184,13 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </dest>
   <voice>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </voice>
 </phrase>
 <phrase>
@@ -3501,63 +3496,6 @@
     *: "Battery Capacity"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-    xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-    xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-    xduoox3: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-    xduoox3: ""
-  </source>
-  <dest>
-    *: none
-    battery_types: ""
-    xduoox3: ""
-  </dest>
-  <voice>
-    *: none
-    battery_types: ""
-    xduoox3: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3688,27 +3626,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3717,35 +3654,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4179,11 +4115,11 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </dest>
   <voice>
     *: none
@@ -4823,7 +4759,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Scanning"
   </voice>
 </phrase>
 <phrase>
@@ -5186,15 +5122,15 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </dest>
   <voice>
     *: none
-    recording: "Same As Source"
+    recording: "Same as Source"
   </voice>
 </phrase>
 <phrase>
@@ -5935,20 +5871,6 @@
     *: "tracks saved"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6310,13 +6232,13 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </dest>
   <voice>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </voice>
 </phrase>
 <phrase>
@@ -6674,10 +6596,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6913,15 +6835,15 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -6994,7 +6916,6 @@
     *: "Add Current to Shortcuts"
   </voice>
 </phrase>
-
 <phrase>
   id: LANG_PITCH
   desc: "pitch" in the pitch screen
@@ -7414,7 +7335,7 @@
     *: "Can't open %s"
   </dest>
   <voice>
-    *: ""
+    *: "Can't open plugin"
   </voice>
 </phrase>
 <phrase>
@@ -7428,7 +7349,7 @@
     *: "Failed reading %s"
   </dest>
   <voice>
-    *: ""
+    *: "Failed reading file"
   </voice>
 </phrase>
 <phrase>
@@ -8866,16 +8787,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
@@ -9334,13 +9255,13 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </dest>
   <voice>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </voice>
 </phrase>
 <phrase>
@@ -9494,7 +9415,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9512,15 +9433,15 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </dest>
   <voice>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </voice>
 </phrase>
 <phrase>
@@ -11426,13 +11347,13 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </dest>
   <voice>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </voice>
 </phrase>
 <phrase>
@@ -11572,13 +11493,13 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </dest>
   <voice>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </voice>
 </phrase>
 <phrase>
@@ -11704,13 +11625,13 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </dest>
   <voice>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </voice>
 </phrase>
 <phrase>
@@ -12681,20 +12602,6 @@
     *: "Track elapsed"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -14247,16 +14154,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Toggle Item"
+    *: ""
   </dest>
   <voice>
-    *: "Toggle Item"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14317,13 +14224,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14826,20 +14733,6 @@
     *: "No album art found"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -15248,10 +15141,10 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </dest>
   <voice>
     *: "Set WPS Context Plugin"
@@ -15663,7 +15556,7 @@
     *: "Artist + Name"
   </dest>
   <voice>
-    *: "Artist And Name"
+    *: "Artist and Name"
   </voice>
 </phrase>
 <phrase>
@@ -15677,7 +15570,7 @@
     *: "Artist + Year"
   </dest>
   <voice>
-    *: "Artist And Year"
+    *: "Artist and Year"
   </voice>
 </phrase>
 <phrase>
@@ -16958,6 +16851,20 @@
     *: "View Album Art"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[By album]"
+  </dest>
+  <voice>
+    *: "All tracks sorted by album"
+  </voice>
+</phrase>
 <phrase>
   id: LANG_HP_LO_SELECT
   desc: Output Select
@@ -16998,15 +16905,15 @@
   user: core
   <source>
     *: none
-    lineout_poweroff,erosqnative: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
   </source>
   <dest>
     *: none
-    lineout_poweroff,erosqnative: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
   </dest>
   <voice>
     *: none
-    lineout_poweroff,erosqnative: "Line Out"
+    erosqnative,lineout_poweroff: "Line Out"
   </voice>
 </phrase>
 <phrase>
@@ -17065,3 +16972,17 @@
     *: "Playlist finished. Play again?"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Sort Playlists"
+  </dest>
+  <voice>
+    *: "sort playlists"
+  </voice>
+</phrase>

apps/lang/esperanto.lang

@@ -3104,7 +3104,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Ekrano Rulumas Ekster Vido"
@@ -3342,7 +3342,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Ampleksa Minimumo"
@@ -3356,7 +3356,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Ampleksa Maksimumo"
@@ -3678,7 +3678,7 @@
   desc: text for onplay menu entry
   user: core
   <source>
-    *: "Set As Backdrop"
+    *: "Set as Backdrop"
   </source>
   <dest>
     *: "Uzi kiel Fono"
@@ -3916,7 +3916,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Serĉi En Leglisto"
@@ -4109,17 +4109,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
-    *: ""
+    *: none
+    rtc: "Current Time"
   </source>
   <dest>
-    *: ""
+    *: none
+    rtc: "Nuna Tempo"
   </dest>
   <voice>
-    *: "Nuna Tempo:"
+    *: none
+    rtc: "Nuna Tempo"
   </voice>
 </phrase>
 <phrase>
@@ -4415,7 +4418,7 @@
   desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
   user: core
   <source>
-    *: "Waking Up In %d:%02d"
+    *: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: "Vekonta Je %d:%02d"
@@ -4659,10 +4662,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"

apps/lang/finnish.lang

@@ -3116,7 +3116,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Rivien vieritys pois näytöstä"
@@ -3378,7 +3378,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3395,7 +3395,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3736,7 +3736,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -3979,7 +3979,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Etsi soittolistalta"
@@ -4185,20 +4185,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Nykyinen aika"
   </dest>
   <voice>
     *: none
-    rtc: "Nykyinen aika:"
+    rtc: "Nykyinen aika"
   </voice>
 </phrase>
 <phrase>
@@ -4311,6 +4311,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -4319,12 +4320,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Peruuta"
     gigabeatfx,mrobe500: "POWER = Peruuta"
     gigabeats,sansafuzeplus: "BACK = Peruuta"
     gogearsa9200: "VASEN = Peruuta"
@@ -4333,7 +4334,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Peruuta"
     iriverh100,iriverh120,iriverh300: "STOP = Peruuta"
     mrobe100: "DISPLAY = Peruuta"
-    rtc: "OFF = Peruuta"
     samsungyh*: "REW = Peruuta"
     vibe500: "CANCEL = Peruuta"
   </dest>
@@ -4508,7 +4508,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4781,10 +4781,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -8362,7 +8362,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -9137,7 +9137,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -9320,22 +9320,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Aseta"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Aseta"
     gogearsa9200,samsungyh*: "PLAY = Aseta"
     iriverh100,iriverh120,iriverh300: "NAVI = Aseta"
     mpiohd300: "ENTER = Aseta"
     mrobe500: "HEART = Aseta"
-    rtc: "ON = Aseta"
     vibe500: "OK = Aseta"
   </dest>
   <voice>
@@ -9675,8 +9675,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -10258,7 +10258,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10276,7 +10276,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11437,7 +11437,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Jatka automaattisesti"
@@ -11755,7 +11755,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Aseta soittolistaluettelon hakemistoksi"
@@ -12282,7 +12282,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Käynnistä uniajastin uudelleen näppäinpainalluksesta"
@@ -12496,7 +12496,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Käynnistä uniajastin laitetta käynnistettäessä"

apps/lang/francais.lang

@@ -258,8 +258,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -830,10 +830,10 @@
     *: "Crossfeed"
   </source>
   <dest>
-    *: "Crossfeed"
+    *: "Diffusion croisée (Crossfeed)"
   </dest>
   <voice>
-    *: "Crossfeed"
+    *: "Diffusion croisée dite Crossfeed"
   </voice>
 </phrase>
 <phrase>
@@ -2194,6 +2194,20 @@
     *: "Toutes les pistes"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[Par album]"
+  </dest>
+  <voice>
+    *: "Toutes les pistes triées par album"
+  </voice>
+</phrase>
 <phrase>
   id: LANG_DISPLAY
   desc: in settings_menu()
@@ -2802,7 +2816,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Défilement hors de l'écran"
@@ -3102,7 +3116,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Minimum de l'intervalle"
@@ -3116,7 +3130,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Maximum de l'intervalle"
@@ -3430,59 +3444,53 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Battery Type"
+    battery_types: ""
   </source>
   <dest>
     *: none
-    battery_types: "Type de batterie"
+    battery_types: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Type de batterie"
+    battery_types: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "Alcaline"
-    xduoox3: "Nouveau (2000 mAh)"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Alcaline"
-    xduoox3: "Nouveau 2000 milliampère heure"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "~NiMH"
-    xduoox3: "Ancien (1500 mAh)"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Nickel-Métal Hydrure"
-    xduoox3: "Ancien 1500 milliampère heure"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
@@ -3615,22 +3623,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Valider"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Valider"
-    gogearsa9200,samsungyh*: "PLAY = Valider"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Valider"
     iriverh100,iriverh120,iriverh300: "NAVI = Valider"
     mpiohd300: "ENTER = Valider"
     mrobe500: "HEART = Valider"
-    rtc: "ON = Valider"
     vibe500: "OK = Valider"
   </dest>
   <voice>
@@ -3644,29 +3652,29 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Annuler"
     gigabeatfx,mrobe500: "POWER = Annuler"
-    gigabeats,sansafuzeplus: "BACK = Annuler"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Annuler"
     gogearsa9200: "LEFT = Annuler"
     iaudiom5,iaudiox5: "RECORD = Annuler"
     ipod*,mpiohd300,sansac200*: "MENU = Annuler"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annuler"
     iriverh100,iriverh120,iriverh300: "STOP = Annuler"
     mrobe100: "DISPLAY = Annuler"
-    rtc: "OFF = Annuler"
     samsungyh*: "REW = Annuler"
     vibe500: "C = Annuler"
   </dest>
@@ -4106,7 +4114,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4981,11 +4989,11 @@
   </source>
   <dest>
     *: none
-    recording: "MPEG Layer 3"
+    recording: "~MPEG Layer 3"
   </dest>
   <voice>
     *: none
-    recording: "MPEG Layer 3"
+    recording: "~MPEG Layer 3"
   </voice>
 </phrase>
 <phrase>
@@ -5113,7 +5121,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5862,16 +5870,16 @@
 </phrase>
 <phrase>
   id: LANG_CATALOG
-  desc: in main menu and onplay menu
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist Catalogue"
+    *: ""
   </source>
   <dest>
-    *: "Catalogue de listes de lecture"
+    *: ""
   </dest>
   <voice>
-    *: "Catalogue de listes de lecture"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6235,7 +6243,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Rechercher dans liste de lecture"
@@ -6599,10 +6607,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6838,7 +6846,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -8758,7 +8766,7 @@
     *: ""
   </dest>
   <voice>
-    *: "cuesheet"
+    *: "~cuesheet"
   </voice>
 </phrase>
 <phrase>
@@ -8776,16 +8784,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Temps actuel"
   </dest>
   <voice>
     *: none
@@ -9390,7 +9398,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9408,7 +9416,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -9663,7 +9671,7 @@
   </source>
   <dest>
     *: none
-    recording: "CLIP:"
+    recording: "~CLIP:"
   </dest>
   <voice>
     *: none
@@ -11277,7 +11285,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Reprise automatique"
@@ -11437,7 +11445,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Lancer la minuterie d'arrêt au démarrage"
@@ -11527,7 +11535,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Redémarrer la mise en veille programmable sur pression d'une touche"
@@ -13204,11 +13212,11 @@
     lowmem: none
   </source>
   <dest>
-    *: "Panning Separation"
+    *: "Séparation Panoramique"
     lowmem: none
   </dest>
   <voice>
-    *: "Panning Separation"
+    *: "Séparation Panoramique"
     lowmem: none
   </voice>
 </phrase>
@@ -13753,16 +13761,16 @@
 </phrase>
 <phrase>
   id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
+  desc: deprecated
   user: core
   <source>
-    *: "Cache will be rebuilt on next restart"
+    *: ""
   </source>
   <dest>
-    *: "Le cache sera reconstruit au prochain redémarrage"
+    *: ""
   </dest>
   <voice>
-    *: "Le cache sera reconstruit au prochain redémarrage"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14152,20 +14160,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Niveau 10: 1 mouvement / 600 minutes"
-  </dest>
-  <voice>
-    *: "Niveau 10, 1 mouvement par 600 minutes"
-  </voice>
-</phrase>
 <phrase>
   id: VOICE_BAT_BENCH_KEYS
   desc: Battery bench start up message
@@ -14180,20 +14174,6 @@
     *: "Appuyer sur lecture pour lancer le test batterie ou sur stop pour annuler"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Niveau 8: 1 mouvement / 15 minutes"
-  </dest>
-  <voice>
-    *: "Niveau 8, 1 mouvement par 15 minutes"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_AVG_TRACK_SIZE
   desc: playing time screen
@@ -14452,20 +14432,6 @@
     *: "Taille de la nourriture"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Niveau 9: 1 mouvement / 60 minutes"
-  </dest>
-  <voice>
-    *: "Niveau 9, 1 mouvement par 60 minutes"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_MENU_SELECT_OTHER_GAME
   desc: in the chessbox menu
@@ -14578,7 +14544,7 @@
     *: ""
   </dest>
   <voice>
-    *: "Battery bench is already running"
+    *: "La mesure des performances de la batterie est déjà en cours d'exécution"
   </voice>
 </phrase>
 <phrase>
@@ -14592,7 +14558,7 @@
     *: ""
   </dest>
   <voice>
-    *: "GNU Chess"
+    *: "GNU Échecs"
   </voice>
 </phrase>
 <phrase>
@@ -14656,7 +14622,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Volume des messages vocaux"
@@ -14675,11 +14641,11 @@
   </source>
   <dest>
     *: none
-    filter_roll_off: "Short Sharp"
+    filter_roll_off: "Rapide court"
   </dest>
   <voice>
     *: none
-    filter_roll_off: "Short Sharp"
+    filter_roll_off: "Rapide court"
   </voice>
 </phrase>
 <phrase>
@@ -14967,7 +14933,7 @@
   </source>
   <dest>
     *: "Appuyer sur GAUCHE pour annuler."
-    android,hifietma*,zenvision,vibe500: "Appuyer sur RETOUR pour annuler."
+    android,hifietma*,vibe500,zenvision: "Appuyer sur RETOUR pour annuler."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Appuyer sur ETEINDRE pour annuler."
     ihifi760,ihifi960: "Double appuis sur RETOURNER pour annuler."
     ihifi770,ihifi770c,ihifi800: "Appuyer sur ACCEUIL pour annuler."
@@ -14981,7 +14947,7 @@
   </dest>
   <voice>
     *: "Appuyer sur GAUCHE pour annuler."
-    android,hifietma*,zenvision,vibe500: "Appuyer sur RETOUR pour annuler."
+    android,hifietma*,vibe500,zenvision: "Appuyer sur RETOUR pour annuler."
     cowond2,creativezenxfi2,ibassodx50,ibassodx90,mrobe500,ondavx747: "Appuyer sur ETEINDRE pour annuler."
     ihifi760,ihifi960: "Double appuis sur RETOURNER pour annuler."
     ihifi770,ihifi770c,ihifi800: "Appuyer sur ACCEUIL pour annuler."
@@ -15226,7 +15192,7 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
     *: "Définir le Plugin de Contexte WPS"
@@ -15495,10 +15461,10 @@
     *: "List Wraparound"
   </source>
   <dest>
-    *: "List Wraparound"
+    *: "Navigation des listes d'un bout à l'autre"
   </dest>
   <voice>
-    *: "List Wraparound"
+    *: "Navigation des listes d'un bout à l'autre"
   </voice>
 </phrase>
 <phrase>
@@ -16550,10 +16516,10 @@
     *: "Albums"
   </source>
   <dest>
-    *: "Albums"
+    *: "~Albums"
   </dest>
   <voice>
-    *: "Albums"
+    *: "~Albums"
   </voice>
 </phrase>
 <phrase>
@@ -16586,7 +16552,7 @@
 </phrase>
 <phrase>
   id: LANG_FILENAME
-  desc: Database menu
+  desc: Database and recording menus
   user: core
   <source>
     *: "Filename"

apps/lang/galego.lang

@@ -2120,7 +2120,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -2137,7 +2137,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -2778,20 +2778,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Hora actual"
   </dest>
   <voice>
     *: none
-    rtc: "Hora actual:"
+    rtc: "Hora actual"
   </voice>
 </phrase>
 <phrase>
@@ -2904,6 +2904,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -2912,12 +2913,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = desfacer"
     gigabeatfx,mrobe500: "POWER = desfacer"
     gigabeats,sansafuzeplus: "BACK = desfacer"
     gogearsa9200: "LEFT = desfacer"
@@ -2926,12 +2927,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = desfacer"
     iriverh100,iriverh120,iriverh300: "STOP = desfacer"
     mrobe100: "DISPLAY = desfacer"
-    rtc: "OFF = desfacer"
     samsungyh*: "REW = desfacer"
     vibe500: "CANCEL = desfacer"
   </dest>
   <voice>
     *: none
+    rtc: "OFF = desfacer"
     gigabeatfx,mrobe500: "POWER = desfacer"
     gigabeats,sansafuzeplus: "BACK = desfacer"
     gogearsa9200: "LEFT = desfacer"
@@ -2940,7 +2941,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = desfacer"
     iriverh100,iriverh120,iriverh300: "STOP = desfacer"
     mrobe100: "DISPLAY = desfacer"
-    rtc: "OFF = desfacer"
     samsungyh*: "REW = desfacer"
     vibe500: "CANCEL = desfacer"
   </voice>
@@ -3133,7 +3133,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -6155,10 +6155,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6697,7 +6697,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -6910,7 +6910,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Reanudación automática"
@@ -7673,22 +7673,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Aceptar"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Aceptar"
     gogearsa9200,samsungyh*: "PLAY = Aceptar"
     iriverh100,iriverh120,iriverh300: "NAVI = Aceptar"
     mpiohd300: "ENTER = Aceptar"
     mrobe500: "HEART = Aceptar"
-    rtc: "ON = Aceptar"
     vibe500: "OK = Aceptar"
   </dest>
   <voice>
@@ -8546,7 +8546,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -9250,7 +9250,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Desprazar a liñas fóra da pantalla"
@@ -9464,7 +9464,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Buscar na lista de repr."
@@ -11654,7 +11654,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -11731,15 +11731,15 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -11934,8 +11934,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -12105,7 +12105,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -12395,7 +12395,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Establecer como o directorio de catálogo de listas de reprodución"
@@ -12510,7 +12510,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Iniciar o temporizador de apagado no encendido"

apps/lang/greek.lang

@@ -231,8 +231,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2906,7 +2906,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Κύλιση εκτός ορίων οθόνης"
@@ -3233,7 +3233,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3250,7 +3250,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3746,22 +3746,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Ρύθμιση"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ρύθμιση"
     gogearsa9200,samsungyh*: "PLAY = Ρύθμιση"
     iriverh100,iriverh120,iriverh300: "NAVI = Ρύθμιση"
     mpiohd300: "ENTER = Ρύθμιση"
     mrobe500: "HEART = Ρύθμιση"
-    rtc: "ON = Ρύθμιση"
     vibe500: "OK = Ρύθμιση"
   </dest>
   <voice>
@@ -3774,6 +3774,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3782,12 +3783,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Ακύρωση"
     gigabeatfx,mrobe500: "POWER = Ακύρωση"
     gigabeats,sansafuzeplus: "BACK = Ακύρωση"
     gogearsa9200: "LEFT = Ακύρωση"
@@ -3796,7 +3797,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Ακύρωση"
     iriverh100,iriverh120,iriverh300: "STOP = Ακύρωση"
     mrobe100: "DISPLAY = Ακύρωση"
-    rtc: "OFF = Ακύρωση"
     samsungyh*: "REW = Ακύρωση"
     vibe500: "C = Ακύρωση"
   </dest>
@@ -4235,7 +4235,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5389,7 +5389,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5647,7 +5647,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6652,7 +6652,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Αναζήτηση στην λίστα αναπαραγωγής"
@@ -7030,10 +7030,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7283,7 +7283,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9322,20 +9322,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Τρέχουσα ώρα"
   </dest>
   <voice>
     *: none
-    rtc: "Τρέχουσα ώρα:"
+    rtc: "Τρέχουσα ώρα"
   </voice>
 </phrase>
 <phrase>
@@ -10212,7 +10212,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10456,7 +10456,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10820,7 +10820,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Ορισμός ως καταλόγου λιστών αναπαραγωγής"
@@ -11096,7 +11096,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Αυτόματη επαναφορά"
@@ -11172,7 +11172,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Επανεκίνηση χρονοδιακόπτη ύπνου με το πάτημα πλήκτρου"
@@ -12184,7 +12184,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Έναρξη χρονοδιακόπτη ύπνου στην εκίνηση"

apps/lang/hebrew.lang

@@ -233,8 +233,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2969,7 +2969,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "מסך נגלל מחוץ לתצוגה"
@@ -3296,7 +3296,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3313,7 +3313,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3809,22 +3809,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "קבע = ON"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansae200*,sansafuze*: "קבע = SELECT"
     gogearsa9200,samsungyh*: "קבע = PLAY"
     iriverh100,iriverh120,iriverh300: "קבע = NAVI"
     mpiohd300: "קבע = ENTER"
     mrobe500: "קבע = HEART"
-    rtc: "קבע = ON"
     vibe500: "קבע = OK"
   </dest>
   <voice>
@@ -3838,6 +3838,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3846,12 +3847,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "החזר = OFF"
     gigabeatfx,mrobe500: "החזר = POWER"
     gigabeats: "החזר = BACK"
     gogearsa9200: "החזר = LEFT"
@@ -3860,7 +3861,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "החזר = PREV"
     iriverh100,iriverh120,iriverh300: "החזר = STOP"
     mrobe100: "החזר = DISPLAY"
-    rtc: "החזר = OFF"
     samsungyh*: "החזר = Revert"
     vibe500: "החזר = C"
   </dest>
@@ -4300,7 +4300,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5468,7 +5468,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5726,7 +5726,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6731,7 +6731,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "חפש ברשימת שירים"
@@ -7109,10 +7109,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7362,7 +7362,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9443,20 +9443,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "זמן נוכחי"
   </dest>
   <voice>
     *: none
-    rtc: "זמן נוכחי:"
+    rtc: "זמן נוכחי"
   </voice>
 </phrase>
 <phrase>
@@ -10306,7 +10306,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10324,7 +10324,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none

apps/lang/hindi.lang

@@ -3070,7 +3070,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Search In पलेलिसट"

apps/lang/hrvatski.lang

@@ -227,8 +227,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2933,7 +2933,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Ekran se skliže van pogleda"
@@ -3260,7 +3260,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3277,7 +3277,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3773,22 +3773,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Postavi"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Postavi"
     gogearsa9200,samsungyh*: "PLAY = Postavi"
     iriverh100,iriverh120,iriverh300: "NAVI = Postavi"
     mpiohd300: "ENTER = Postavi"
     mrobe500: "HEART = Postavi"
-    rtc: "ON = Postavi"
     vibe500: "OK = Postavi"
   </dest>
   <voice>
@@ -3802,6 +3802,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3810,12 +3811,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Povrati"
     gigabeatfx,mrobe500: "POWER = Povrati"
     gigabeats,sansafuzeplus: "BACK = Povrati"
     gogearsa9200: "LEFT = Povrati"
@@ -3824,7 +3825,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Povrati"
     iriverh100,iriverh120,iriverh300: "STOP = Povrati"
     mrobe100: "DISPLAY = Povrati"
-    rtc: "OFF = Povrati"
     samsungyh*: "REW = Povrati"
     vibe500: "CANCEL = Povrati"
   </dest>
@@ -4263,7 +4263,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5432,7 +5432,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5690,7 +5690,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6695,7 +6695,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Traži u popisu izvođenja"
@@ -7073,10 +7073,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7326,7 +7326,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9407,20 +9407,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Trenutno vrijeme"
   </dest>
   <voice>
     *: none
-    rtc: "Trenutno vrijeme:"
+    rtc: "Trenutno vrijeme"
   </voice>
 </phrase>
 <phrase>
@@ -10270,7 +10270,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10288,7 +10288,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -12240,7 +12240,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatsko nastavljanje"
@@ -12285,7 +12285,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Postavi kao direktorij kataloga popisa izvođenja"
@@ -12476,7 +12476,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Pokreni tajmer spavanja pri paljenju "

apps/lang/islenska.lang

@@ -943,7 +943,7 @@
     *: "Dofnun við Stop/Pásu"
   </dest>
   <voice>
-    *: "Fade On Stop and Pause"
+    *: "Fade on Stop and Pause"
   </voice>
 </phrase>
 <phrase>
@@ -2436,7 +2436,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -2444,7 +2444,7 @@
     masd: none
   </dest>
   <voice>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </voice>
 </phrase>
@@ -2453,7 +2453,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -2461,7 +2461,7 @@
     masd: none
   </dest>
   <voice>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </voice>
 </phrase>
@@ -3094,20 +3094,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -3220,6 +3220,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3228,12 +3229,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3242,7 +3243,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </dest>
@@ -3435,7 +3435,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -3643,10 +3643,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"

apps/lang/italiano.lang

@@ -229,8 +229,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2731,7 +2731,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Scorrimento schermo fuori visione"
@@ -3017,7 +3017,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Livello minimo"
@@ -3031,7 +3031,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Livello massimo"
@@ -3343,63 +3343,6 @@
     *: "Capacità Batteria"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Battery Type"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Tipo batteria"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Tipo batteria"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Alcalina"
-    xduoox3: "Nuovo tipo (2000 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Alcalina"
-    xduoox3: "Nuovo tipo 2000 milliamp ora"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Nickel metal idrato"
-    xduoox3: "Vecchio tipo (1500 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Nickel metal idrato"
-    xduoox3: "Vecchio tipo 1500 milliamp ora"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3530,27 +3473,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Imposta"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Imposta"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Imposta"
-    gogearsa9200,samsungyh*: "PLAY = Imposta"
     iriverh100,iriverh120,iriverh300: "NAVI = Imposta"
     mpiohd300: "ENTER = Imposta"
     mrobe500: "HEART = Imposta"
-    rtc: "ON = Imposta"
     vibe500: "OK = Imposta"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3559,35 +3501,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Annulla"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Annulla"
     gigabeatfx,mrobe500: "POWER = Annulla"
-    gigabeats,sansafuzeplus: "BACK = Annulla"
     gogearsa9200: "LEFT = Annulla"
     iaudiom5,iaudiox5: "RECORD = Annulla"
     ipod*,mpiohd300,sansac200*: "MENU = Annulla"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Annulla"
     iriverh100,iriverh120,iriverh300: "STOP = Annulla"
     mrobe100: "DISPLAY = Annulla"
-    rtc: "OFF = Annulla"
     samsungyh*: "REW = Annulla"
     vibe500: "CANCEL = Annulla"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4021,7 +3962,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4665,7 +4606,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Ricerca"
   </voice>
 </phrase>
 <phrase>
@@ -5028,7 +4969,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5777,20 +5718,6 @@
     *: "Traccie salvate"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: in main menu and onplay menu
-  user: core
-  <source>
-    *: "Playlist Catalogue"
-  </source>
-  <dest>
-    *: "Catalogo Playlist"
-  </dest>
-  <voice>
-    *: "Catalogo playlist"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6152,7 +6079,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Ricerca nella playlist"
@@ -6502,10 +6429,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6741,7 +6668,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7224,10 +7151,10 @@
     *: "Can't open %s"
   </source>
   <dest>
-    *: "Non riesco ad aprire %s"
+    *: "Impossibile aprire %s"
   </dest>
   <voice>
-    *: ""
+    *: "Impossibile aprire il plugin"
   </voice>
 </phrase>
 <phrase>
@@ -7241,7 +7168,7 @@
     *: "Errore in lettura di %s"
   </dest>
   <voice>
-    *: ""
+    *: "Errore nella lettura del file"
   </voice>
 </phrase>
 <phrase>
@@ -8679,16 +8606,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "ora attuale"
   </dest>
   <voice>
     *: none
@@ -9293,7 +9220,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9311,7 +9238,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11180,7 +11107,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Riprendi Automaticamente"
@@ -11326,7 +11253,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Avvio Tempo Spegnimento All'accensione"
@@ -11430,7 +11357,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Riavvia Tempo Spegnimento Al Tocco"
@@ -12407,34 +12334,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Livello 9: 1 mossa / 60 min"
-  </dest>
-  <voice>
-    *: "Livello 9, 1 mossa ogni 60 minuti"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Livello 8: 1 mossa / 15 min"
-  </dest>
-  <voice>
-    *: "Livello 8, 1 mossa ogni 15 minuti"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_UNAVAILABLE
   desc: in mpegplayer settings
@@ -12850,13 +12749,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Ordine Menu Principale Rockbox"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -12921,20 +12820,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Cache will be rebuilt on next restart"
-  </source>
-  <dest>
-    *: "La cache sarà ricostruita al prossimo riavvio"
-  </dest>
-  <voice>
-    *: "La cache sarà ricostruita al prossimo riavvio"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_LEVEL_2
   desc: in the chessbox game level selection
@@ -13216,20 +13101,6 @@
     *: "Visualizza Partite Giocate"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Livello 10: 1 mossa / 600 min"
-  </dest>
-  <voice>
-    *: "Livello 10, 1 mossa ogni 600 minuti"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_GAMES
   desc: in chessbox
@@ -13530,20 +13401,6 @@
     *: "Livello 7, 40 mosse ogni 240 minuti"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PROPERTIES_PATH
   desc: in properties plugin
@@ -13852,16 +13709,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Commuta l'elemento"
+    *: ""
   </dest>
   <voice>
-    *: "Commuta l'elemento"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14828,10 +14685,10 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
-    *: "Imposta un Plugin Contestuale per Wps"
+    *: "Imposta un Plugin Contestuale per WPS"
   </dest>
   <voice>
     *: "Imposta un Plugin Contestuale per WPS"
@@ -14954,7 +14811,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Volume dei prompt vocali"
@@ -17032,3 +16889,31 @@
     *: "Tracce per"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Ordina Playlist"
+  </dest>
+  <voice>
+    *: "Ordina Playlist"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[Per album]"
+  </dest>
+  <voice>
+    *: "Ordina tutte le tracce per album"
+  </voice>
+</phrase>

apps/lang/japanese.lang

@@ -234,8 +234,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2751,7 +2751,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "画面範囲外スクロール"
@@ -3037,7 +3037,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "レベルメータの最小値"
@@ -3051,7 +3051,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "レベルメータの最大値"
@@ -3365,59 +3365,53 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Battery Type"
+    battery_types: ""
   </source>
   <dest>
     *: none
-    battery_types: "電源の種類"
+    battery_types: ""
   </dest>
   <voice>
     *: none
-    battery_types: "電源の種類"
+    battery_types: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "アルカリ"
-    xduoox3: "新しい方（2000 mAh）"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "アルカリ"
-    xduoox3: "新しい二千ミリアンペア・アワー"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "ニッケル水素"
-    xduoox3: "旧型（1500 mAh）"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "ニッケル水素"
-    xduoox3: "年長 千五百ミリアンペア時"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
@@ -3550,22 +3544,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = 設定"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = 設定"
-    gogearsa9200,samsungyh*: "PLAY = 設定"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = 設定"
     iriverh100,iriverh120,iriverh300: "NAVI = 設定"
     mpiohd300: "ENTER = 設定"
     mrobe500: "HEART = 設定"
-    rtc: "ON = 設定"
     vibe500: "OK = 設定"
   </dest>
   <voice>
@@ -3579,29 +3573,29 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = 元に戻す"
     gigabeatfx,mrobe500: "POWER = 元に戻す"
-    gigabeats,sansafuzeplus: "BACK = 元に戻す"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = 元に戻す"
     gogearsa9200: "LEFT = 元に戻す"
     iaudiom5,iaudiox5: "RECORD = 元に戻す"
     ipod*,mpiohd300,sansac200*: "MENU = 元に戻す"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = 元に戻す"
     iriverh100,iriverh120,iriverh300: "STOP = 元に戻す"
     mrobe100: "DISPLAY = 元に戻す"
-    rtc: "OFF = 元に戻す"
     samsungyh*: "REW = 元に戻す"
     vibe500: "CANCEL = 元に戻す"
   </dest>
@@ -4041,7 +4035,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5048,7 +5042,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5799,16 +5793,16 @@
 </phrase>
 <phrase>
   id: LANG_CATALOG
-  desc: in main menu and onplay menu
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist Catalogue"
+    *: ""
   </source>
   <dest>
-    *: "プレイリスト カタログ"
+    *: ""
   </dest>
   <voice>
-    *: "プレイリスト カタログ"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6172,7 +6166,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "プレイリスト内の検索"
@@ -6522,10 +6516,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6761,7 +6755,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -8699,16 +8693,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "現在時刻"
   </dest>
   <voice>
     *: none
@@ -9313,7 +9307,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9331,7 +9325,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11197,7 +11191,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "オートレジューム"
@@ -11346,7 +11340,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "ブートでスリープタイマーをスタート"
@@ -11492,7 +11486,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "キー押下でスリープ・タイマー再起動"
@@ -11958,7 +11952,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "音声プロンプトの音量"
@@ -13338,48 +13332,6 @@
     *: "レベル7、40手/240分"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Level 8: 1 move / 15 min"
-  </dest>
-  <voice>
-    *: "Level 8, 1 move per 15 minutes"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "レベル9、60分につき1手"
-  </dest>
-  <voice>
-    *: "レベル9、60分につき1手"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "レベル10、600分に1手"
-  </dest>
-  <voice>
-    *: "レベル10、600分に1手"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_PGN_PARSE_ERROR
   desc: in the chessbox game viewer
@@ -14773,16 +14725,16 @@
 </phrase>
 <phrase>
   id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
+  desc: deprecated
   user: core
   <source>
-    *: "Cache will be rebuilt on next restart"
+    *: ""
   </source>
   <dest>
-    *: "キャッシュは次回再起動時に再構築される"
+    *: ""
   </dest>
   <voice>
-    *: "キャッシュは次回再起動時に再構築される"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15193,7 +15145,7 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
     *: "再生中に画面のコンテキストを設定するプラグイン"

apps/lang/korean.lang

@@ -242,8 +242,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2758,7 +2758,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "화면 스크롤이 보이지 않음"
@@ -3044,7 +3044,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "최소 범위"
@@ -3058,7 +3058,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "최대 범위"
@@ -3370,63 +3370,6 @@
     *: "배터리 용량"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Battery Type"
-  </source>
-  <dest>
-    *: none
-    battery_types: "배터리 유형"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "배터리 유형"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "알카라인"
-    xduoox3: "최신 (2000 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "알카라인"
-    xduoox3: "최신 2000 밀리암페어 시간"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "~NiMH"
-    xduoox3: "오래됨 (1500 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "니켈 수소"
-    xduoox3: "오래됨 1500 밀리암페어 시간"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3557,27 +3500,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "켬 버튼 = 설정"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "재생 버튼 = 설정"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "선택 버튼 = 설정"
-    gogearsa9200,samsungyh*: "재생 버튼 = 설정"
     iriverh100,iriverh120,iriverh300: "탐색 버튼 = 설정"
     mpiohd300: "진입 버튼 = 설정"
     mrobe500: "하트 버튼 = 설정"
-    rtc: "켬 버튼 = 설정"
     vibe500: "확인 버튼 = 설정"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3586,35 +3528,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "끔 버튼 = 반복"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "뒤로가기 버튼 = 반복"
     gigabeatfx,mrobe500: "전원 버터느 = 반복"
-    gigabeats,sansafuzeplus: "뒤로가기 버튼 = 반복"
     gogearsa9200: "왼쪽 버튼 = 반복"
     iaudiom5,iaudiox5: "녹음 버튼 = 반복"
     ipod*,mpiohd300,sansac200*: "메뉴 버튼 = 반복"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "이전 버튼 = 반복"
     iriverh100,iriverh120,iriverh300: "정지 버튼 = 반복"
     mrobe100: "화면 버튼 = 반복"
-    rtc: "끔 버튼 = 반복"
     samsungyh*: "되감기 버튼 = 반복"
     vibe500: "취소 버튼 = 반복"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4048,7 +3989,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4692,7 +4633,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "검색 중"
   </voice>
 </phrase>
 <phrase>
@@ -5055,7 +4996,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5804,20 +5745,6 @@
     *: "트랙이 저장되었음"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: in main menu and onplay menu
-  user: core
-  <source>
-    *: "Playlist Catalogue"
-  </source>
-  <dest>
-    *: "재생목록 카탈로그"
-  </dest>
-  <voice>
-    *: "재생목록 카탈로그"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6179,7 +6106,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "재생목록에서 검색"
@@ -6529,10 +6456,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6768,7 +6695,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7254,7 +7181,7 @@
     *: "%s 을(를) 열 수 없음"
   </dest>
   <voice>
-    *: ""
+    *: "플러그인을 열 수 없음"
   </voice>
 </phrase>
 <phrase>
@@ -7268,7 +7195,7 @@
     *: "%s을(를) 읽기 실패함"
   </dest>
   <voice>
-    *: ""
+    *: "파일 읽기 실패함"
   </voice>
 </phrase>
 <phrase>
@@ -8706,16 +8633,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "현재 시간"
   </dest>
   <voice>
     *: none
@@ -9174,7 +9101,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "음성 안내 볼륨"
@@ -9334,7 +9261,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9352,7 +9279,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11252,7 +11179,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "자동 재시작"
@@ -11398,7 +11325,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "부팅 시 절전 타이머 시작"
@@ -11530,7 +11457,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "키를 누를 때 절전 타이머 다시 시작"
@@ -12507,20 +12434,6 @@
     *: "트랙 경과됨"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -13261,48 +13174,6 @@
     *: "레벨 7, 240 분당 40 이동"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "레벨 8: 1 이동 / 15 분"
-  </dest>
-  <voice>
-    *: "레벨 8, 15 분당 1 이동"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "레벨 9: 1 이동 / 60 분"
-  </dest>
-  <voice>
-    *: "레벨 9, 60 분당 1 이동"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "레벨 10: 1 이동 / 600 분"
-  </dest>
-  <voice>
-    *: "레벨 10, 600 분당 1 이동"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_PGN_PARSE_ERROR
   desc: in the chessbox game viewer
@@ -14115,16 +13986,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "전환 항목"
+    *: ""
   </dest>
   <voice>
-    *: "전환 항목"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14185,13 +14056,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "록박스 메인 메뉴 순서"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14694,20 +14565,6 @@
     *: "앨범 아트를 찾을 수 없음"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Cache will be rebuilt on next restart"
-  </source>
-  <dest>
-    *: "다음에 다시 시작할 때 캐시가 다시 작성됨"
-  </dest>
-  <voice>
-    *: "다음에 다시 시작할 때 캐시가 다시 작성됨"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -15116,13 +14973,13 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
-    *: "Wps 컨텍스트 플러그인 설정"
+    *: "WPS 컨텍스트 플러그인 설정"
   </dest>
   <voice>
-    *: "Wps 컨텍스트 플러그인 설정"
+    *: "WPS 컨텍스트 플러그인 설정"
   </voice>
 </phrase>
 <phrase>
@@ -15150,7 +15007,7 @@
     *: "이름"
   </dest>
   <voice>
-    *: "이름e"
+    *: "이름"
   </voice>
 </phrase>
 <phrase>
@@ -17045,3 +16902,31 @@
     *: "다음의 트랙"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "재생 목록 정렬"
+  </dest>
+  <voice>
+    *: "재생 목록 정렬"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[앨범별]"
+  </dest>
+  <voice>
+    *: "모든 트랙을 앨범별로 정렬"
+  </voice>
+</phrase>

apps/lang/lang.make

@@ -37,10 +37,9 @@ $(BUILDDIR)/lang/lang_core.o: $(BUILDDIR)/lang/lang.h $(BUILDDIR)/lang/lang_core
 # instead we pretend that genlang create lang_core.c and that lang.c depends from lang.h
 # it will work fine as long as one never manually removes lang.c and not lang.h, and it will avoid
 # race conditions such as running genlang twice or worse in parallel with other things!
-$(BUILDDIR)/lang/lang.h: $(APPSDIR)/lang/$(ENGLISH).lang $(BUILDDIR)/apps/features $(TOOLSDIR)/genlang
+$(BUILDDIR)/lang/lang.h: $(APPSDIR)/lang/$(ENGLISH).lang $(BUILDDIR)/apps/genlang-features $(TOOLSDIR)/genlang
 	$(call PRINTS,GEN lang.h)
-	$(SILENT)for f in `cat $(BUILDDIR)/apps/features`; do feat="$$feat:$$f" ; done; \
-		perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(MODELNAME)$$feat $<
+	$(SILENT)$(TOOLSDIR)/genlang -e=$(APPSDIR)/lang/$(ENGLISH).lang -p=$(BUILDDIR)/lang -t=$(MODELNAME):`cat $(BUILDDIR)/apps/genlang-features` $<
 $(BUILDDIR)/lang/lang_core.c: $(BUILDDIR)/lang/lang.h $(TOOLSDIR)/genlang
 
 $(BUILDDIR)/lang_enum.h: $(BUILDDIR)/lang/lang.h $(TOOLSDIR)/genlang

apps/lang/lietuviu.lang

@@ -298,8 +298,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -3015,7 +3015,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Ekrano slinkimas už ribų"
@@ -3342,7 +3342,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3359,7 +3359,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3855,20 +3855,20 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Nustatyti"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansae200*: "SELECT = Nustatyti"
     gogearsa9200,samsungyh*: "PLAY = Nustatyti"
     iriverh100,iriverh120,iriverh300: "NAVI = Nustatyti"
     mpiohd300: "ENTER = Nustatyti"
-    rtc: "ON = Nustatyti"
     vibe500: "OK = Nustatyti"
   </dest>
   <voice>
@@ -3882,6 +3882,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200,ipod*,mpiohd300,sansac200*: "MENU = Revert"
@@ -3889,12 +3890,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Atstatyti"
     gigabeatfx: "POWER = Atstatyti"
     gigabeats,sansafuzeplus: "BACK = Atstatyti"
     gogearsa9200,ipod*,mpiohd300,sansac200*: "MENU = Atstatyti"
@@ -3902,7 +3903,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Atstatyti"
     iriverh100,iriverh120,iriverh300: "STOP = Atstatyti"
     mrobe100: "DISPLAY = Atstatyti"
-    rtc: "OFF = Atstatyti"
     samsungyh*: "REW = Atstatyti"
     vibe500: "CANCEL = Atstatyti"
   </dest>
@@ -4341,7 +4341,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5510,7 +5510,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5768,7 +5768,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6773,7 +6773,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Ieškoti grojaraštyje"
@@ -7151,10 +7151,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7404,7 +7404,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9485,20 +9485,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Dabartinis laikas"
   </dest>
   <voice>
     *: none
-    rtc: "Dabartinis laikas:"
+    rtc: "Dabartinis laikas"
   </voice>
 </phrase>
 <phrase>
@@ -10348,7 +10348,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10366,7 +10366,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none

apps/lang/nederlands.lang

@@ -2867,7 +2867,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Scherm schuift uit beeld"
@@ -3091,7 +3091,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Minimaal bereik"
@@ -3105,7 +3105,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Maximaal bereik"
@@ -3449,7 +3449,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -3692,7 +3692,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Zoeken in afspeellijst"
@@ -3882,20 +3882,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "huidige tijd"
   </dest>
   <voice>
     *: none
-    rtc: "huidige tijd:"
+    rtc: "huidige tijd"
   </voice>
 </phrase>
 <phrase>
@@ -4008,29 +4008,29 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Terugzetten"
     gigabeatfx,mrobe500: "POWER = Terugzetten"
-    gigabeats,sansafuzeplus: "BACK = Terugzetten"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Terugzetten"
     gogearsa9200: "LINKS = Terugzetten"
     iaudiom5,iaudiox5: "RECORD = Terugzetten"
     ipod*,mpiohd300,sansac200*: "MENU = Terugzetten"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Terugzetten"
     iriverh100,iriverh120,iriverh300: "STOP = Terugzetten"
     mrobe100: "DISPLAY = Terugzetten"
-    rtc: "OFF = Terugzetten"
     samsungyh*: "REW = Terugzetten"
     vibe500: "C = Terugzetten"
   </dest>
@@ -4206,7 +4206,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4464,10 +4464,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "Variabele bitrate"
@@ -7713,7 +7713,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -8660,22 +8660,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Instellen"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Instellen"
-    gogearsa9200,samsungyh*: "PLAY = Instellen"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Instellen"
     iriverh100,iriverh120,iriverh300: "NAVI = Instellen"
     mpiohd300: "ENTER = Instellen"
     mrobe500: "HEART = Instellen"
-    rtc: "ON = Instellen"
     vibe500: "OK = Instellen"
   </dest>
   <voice>
@@ -8965,8 +8965,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -9548,7 +9548,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9566,7 +9566,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11508,7 +11508,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatisch hervatten"
@@ -11713,7 +11713,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Slaaptimer starten bij opstarten"
@@ -11831,7 +11831,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Slaaptimer herstarten bij toetsklik"
@@ -15363,10 +15363,10 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
-    *: "Stel Wps Context Plugin in"
+    *: "Stel WPS Context Plugin in"
   </dest>
   <voice>
     *: "Stel WPS Context Plugin in"
@@ -15503,7 +15503,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Volume van gesproken prompt"

apps/lang/norsk-nynorsk.lang

@@ -3088,7 +3088,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Skjermen kan rulla ut av syne"
@@ -3348,7 +3348,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3365,7 +3365,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3704,7 +3704,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -3947,7 +3947,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Søk i speleliste"
@@ -4150,12 +4150,12 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
@@ -4163,6 +4163,7 @@
   </dest>
   <voice>
     *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -4273,6 +4274,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -4281,12 +4283,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = tilbakestill"
     gigabeatfx,mrobe500: "POWER = Tilbakestill"
     gigabeats,sansafuzeplus: "BACK = Tilbakestill"
     gogearsa9200: "LEFT = Tilbakestill"
@@ -4295,7 +4297,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Tilbakestill"
     iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
     mrobe100: "DISPLAY = Tilbakestill"
-    rtc: "OFF = tilbakestill"
     samsungyh*: "REW = Tilbakestill"
     vibe500: "CANCEL = Tilbakestill"
   </dest>
@@ -4465,7 +4466,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4731,10 +4732,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -8195,7 +8196,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -9062,22 +9063,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "PÅ = velg"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = velg"
     gogearsa9200,samsungyh*: "PLAY = velg"
     iriverh100,iriverh120,iriverh300: "NAVI = velg"
     mpiohd300: "ENTER = velg"
     mrobe500: "HEART = velg"
-    rtc: "PÅ = velg"
     vibe500: "OK = velg"
   </dest>
   <voice>
@@ -9779,8 +9780,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -9812,7 +9813,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -10237,7 +10238,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10481,7 +10482,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""

apps/lang/norsk.lang

@@ -2845,7 +2845,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -2862,7 +2862,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3521,20 +3521,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Gjeldende tid"
   </dest>
   <voice>
     *: none
-    rtc: "Gjeldende tid:"
+    rtc: "Gjeldende tid"
   </voice>
 </phrase>
 <phrase>
@@ -3647,6 +3647,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3655,12 +3656,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Tilbakestill"
     gigabeatfx,mrobe500: "POWER = Tilbakestill"
     gigabeats,sansafuzeplus: "BACK = Tilbakestill"
     gogearsa9200: "LEFT = Tilbakestill"
@@ -3669,7 +3670,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Tilbakestill"
     iriverh100,iriverh120,iriverh300: "STOP = Tilbakestill"
     mrobe100: "DISPLAY = Tilbakestill"
-    rtc: "OFF = Tilbakestill"
     samsungyh*: "REW = Tilbakestill"
     vibe500: "CANCEL = Tilbakestill"
   </dest>
@@ -3844,7 +3844,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4052,10 +4052,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6801,7 +6801,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Skal skjermen kunne rulle ut av syne?"
@@ -6860,7 +6860,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Søk i spillelisten"
@@ -7266,7 +7266,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7664,7 +7664,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -9215,22 +9215,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Sett"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Sett"
     gogearsa9200,samsungyh*: "PLAY = Sett"
     iriverh100,iriverh120,iriverh300: "NAVI = Sett"
     mpiohd300: "ENTER = Sett"
     mrobe500: "HEART = Sett"
-    rtc: "ON = Sett"
     vibe500: "OK = Sett"
   </dest>
   <voice>
@@ -10042,8 +10042,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -10075,7 +10075,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -10168,7 +10168,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10176,7 +10176,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </voice>
 </phrase>
 <phrase>
@@ -10293,7 +10293,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -11100,7 +11100,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Start sovenedtelling ved oppstart"
@@ -12097,7 +12097,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Start sovenedtelling på nytt ved knappetrykk"
@@ -12344,7 +12344,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatisk fortsettelse"
@@ -12392,7 +12392,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Bruk som spilleliste-katalogmappe"

apps/lang/polski.lang

@@ -235,8 +235,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2737,7 +2737,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Przesuwanie poza ekran"
@@ -3023,7 +3023,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Początek skali"
@@ -3037,7 +3037,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Koniec skali"
@@ -3349,63 +3349,6 @@
     *: "Pojemność baterii"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Battery Type"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Typ baterii"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Typ baterii"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Alkaliczna"
-    xduoox3: "Nowsza (2000 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Alkaliczna"
-    xduoox3: "Nowsza 2000 miliamperogodzin"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "~NiMH"
-    xduoox3: "Starsza (1500 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Niklowo metalowo wodorkowa"
-    xduoox3: "Starsza 1500 miliamperogodzin"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3536,27 +3479,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Ustaw"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Ustaw"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ustaw"
-    gogearsa9200,samsungyh*: "PLAY = Ustaw"
     iriverh100,iriverh120,iriverh300: "NAVI = Ustaw"
     mpiohd300: "ENTER = Ustaw"
     mrobe500: "HEART = Ustaw"
-    rtc: "ON = Ustaw"
     vibe500: "OK = Ustaw"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3565,35 +3507,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Przywróć"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Przywróć"
     gigabeatfx,mrobe500: "POWER = Przywróć"
-    gigabeats,sansafuzeplus: "BACK = Przywróć"
     gogearsa9200: "LEFT = Przywróć"
     iaudiom5,iaudiox5: "RECORD = Przywróć"
     ipod*,mpiohd300,sansac200*: "MENU = Przywróć"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Przywróć"
     iriverh100,iriverh120,iriverh300: "STOP = Przywróć"
     mrobe100: "DISPLAY = Przywróć"
-    rtc: "OFF = Przywróć"
     samsungyh*: "REW = Przywróć"
-    vibe500: "C = Przywróć"
+    vibe500: "CANCEL = Przywróć"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4027,7 +3968,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4667,11 +4608,11 @@
   </source>
   <dest>
     *: none
-    radio: "Szukam %d.%02d MHz"
+    radio: "Wyszukiwanie %d.%02d MHz"
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Wyszukiwanie"
   </voice>
 </phrase>
 <phrase>
@@ -5034,7 +4975,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5783,20 +5724,6 @@
     *: "Zachowano utwory"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: in main menu and onplay menu
-  user: core
-  <source>
-    *: "Playlist Catalogue"
-  </source>
-  <dest>
-    *: "Katalog list odtwarzania"
-  </dest>
-  <voice>
-    *: "Katalog list odtwarzania"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6158,7 +6085,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Szukaj na liście"
@@ -6508,10 +6435,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6747,7 +6674,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7230,10 +7157,10 @@
     *: "Can't open %s"
   </source>
   <dest>
-    *: "Nie mogę otworzyć %s"
+    *: "Nie można otworzyć %s"
   </dest>
   <voice>
-    *: ""
+    *: "Nie można otworzyć wtyczki"
   </voice>
 </phrase>
 <phrase>
@@ -7247,7 +7174,7 @@
     *: "Błąd odczytu %s"
   </dest>
   <voice>
-    *: ""
+    *: "Błąd odczytu pliku"
   </voice>
 </phrase>
 <phrase>
@@ -8685,16 +8612,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Aktualna godzina"
   </dest>
   <voice>
     *: none
@@ -9299,7 +9226,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9317,7 +9244,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11186,7 +11113,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatyczne wznawianie"
@@ -11408,7 +11335,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Zresetuj usypiacz przy naciśnięciu przycisku"
@@ -11436,7 +11363,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Uruchom usypiacz przy włączeniu"
@@ -12236,20 +12163,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_MENU_RESTORE_GAME
   desc: in the chessbox menu
@@ -12587,20 +12500,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Poziom 8: 1 ruch / 15 min"
-  </dest>
-  <voice>
-    *: "Poziom 8 1 ruch na 15 minut"
-  </voice>
-</phrase>
 <phrase>
   id: VOICE_PLAYER
   desc: spoken only, for announcing player's id
@@ -13555,16 +13454,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Przełącz element"
+    *: ""
   </dest>
   <voice>
-    *: "Przełącz element"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -13758,20 +13657,6 @@
     *: "Ładowanie pozycji"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Poziom 10: 1 ruch / 600 min"
-  </dest>
-  <voice>
-    *: "Poziom 10 1 ruch na 600 minut"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SPACING
   desc: in the pictureflow settings menu
@@ -14167,13 +14052,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Kolejność menu głównego Rockbox"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14266,20 +14151,6 @@
     *: "Podkatal."
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Poziom 9: 1 ruch / 60 min"
-  </dest>
-  <voice>
-    *: "Poziom 9 1 ruch na 60 minut"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_SLIDESHOW_MODE
   desc: in the imageviewer settings menu
@@ -14364,20 +14235,6 @@
     *: "Zamień kanały"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Cache will be rebuilt on next restart"
-  </source>
-  <dest>
-    *: "Pamięć podręczna zostanie odbudowana po restarcie"
-  </dest>
-  <voice>
-    *: "Pamięć podręczna zostanie odbudowana po restarcie"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_4_KEY_CONTROL
   desc: Item for menus
@@ -14834,7 +14691,7 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
     *: "Ustaw wtyczkę kontekstową WPS"
@@ -15008,7 +14865,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Głośność komunikatów głosowych"
@@ -17038,3 +16895,31 @@
     *: "Utwory według"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Sortuj listy odtwarzania"
+  </dest>
+  <voice>
+    *: "Sortuj listy odtwarzania"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[Według albumu]"
+  </dest>
+  <voice>
+    *: "Wszystkie utwory posortowane według albumu"
+  </voice>
+</phrase>

apps/lang/portugues.lang

@@ -2928,7 +2928,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Barras de Navegação Fora do Ecrã"
@@ -3173,7 +3173,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3190,7 +3190,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3475,7 +3475,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -3988,6 +3988,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3996,12 +3997,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Reverter"
     gigabeatfx,mrobe500: "POWER = Reverter"
     gigabeats,sansafuzeplus: "BACK = Reverter"
     gogearsa9200: "LEFT = Reverter"
@@ -4010,7 +4011,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Reverter"
     iriverh100,iriverh120,iriverh300: "STOP = Reverter"
     mrobe100: "DISPLAY = Reverter"
-    rtc: "OFF = Reverter"
     samsungyh*: "REW = Reverter"
     vibe500: "C = Reverter"
   </dest>
@@ -4218,7 +4218,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4431,10 +4431,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7400,22 +7400,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Definir"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Definir"
     gogearsa9200,samsungyh*: "PLAY = Definir"
     iriverh100,iriverh120,iriverh300: "NAVI = Definir"
     mpiohd300: "ENTER = Definir"
     mrobe500: "HEART = Definir"
-    rtc: "ON = Definir"
     vibe500: "OK = Definir"
   </dest>
   <voice>
@@ -7810,7 +7810,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -8189,7 +8189,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Procurar na Playlist"
@@ -9134,7 +9134,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9203,8 +9203,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -9264,7 +9264,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -9653,7 +9653,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -10479,20 +10479,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Tempo actual"
   </dest>
   <voice>
     *: none
-    rtc: "Tempo actual:"
+    rtc: "Tempo actual"
   </voice>
 </phrase>
 <phrase>
@@ -12234,7 +12234,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Retoma da reprodução automática"
@@ -12369,7 +12369,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Definir como pasta para Catálogo de Playlists"
@@ -12484,7 +12484,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Iniciar Temporizador no Arranque"
@@ -12512,7 +12512,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Reiniciar Temporizador ao Premir Teclas"

apps/lang/slovak.lang

@@ -227,8 +227,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2729,7 +2729,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Obrazovka Roluje Mimo Zobrazenia"
@@ -3015,7 +3015,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Minimum Rozsahu"
@@ -3029,7 +3029,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Maximum Rozsahu"
@@ -3341,51 +3341,6 @@
     *: "Kapacita batérie"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: deprecated
-  user: core
-  <source>
-    *: none
-    battery_types,xduoox3: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3516,27 +3471,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Nastaviť"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Nastaviť"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Nastaviť"
-    gogearsa9200,samsungyh*: "PLAY = Nastaviť"
     iriverh100,iriverh120,iriverh300: "NAVI = Nastaviť"
     mpiohd300: "ENTER = Nastaviť"
     mrobe500: "HEART = Nastaviť"
-    rtc: "ON = Nastaviť"
     vibe500: "OK = Nastaviť"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3545,35 +3499,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Vrátiť"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Vrátiť"
     gigabeatfx,mrobe500: "POWER = Vrátiť"
-    gigabeats,sansafuzeplus: "BACK = Vrátiť"
     gogearsa9200: "LEFT = Vrátiť"
     iaudiom5,iaudiox5: "RECORD = Vrátiť"
     ipod*,mpiohd300,sansac200*: "MENU = Vrátiť"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Vrátiť"
     iriverh100,iriverh120,iriverh300: "STOP = Vrátiť"
     mrobe100: "DISPLAY = Vrátiť"
-    rtc: "OFF = Vrátiť"
     samsungyh*: "REW = Vrátiť"
     vibe500: "C = Vrátiť"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4007,7 +3960,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4651,7 +4604,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Skenujem"
   </voice>
 </phrase>
 <phrase>
@@ -5014,7 +4967,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5763,20 +5716,6 @@
     *: "Stôp uložených"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6138,7 +6077,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Hľadať V Plejliste"
@@ -6488,10 +6427,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6727,7 +6666,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7213,7 +7152,7 @@
     *: "Nemožno otvoriť %s"
   </dest>
   <voice>
-    *: ""
+    *: "Nemožno otvoriť zásuvný modul"
   </voice>
 </phrase>
 <phrase>
@@ -7227,7 +7166,7 @@
     *: "Zlihalo čítanie %s"
   </dest>
   <voice>
-    *: ""
+    *: "Čítanie súboru zlihalo"
   </voice>
 </phrase>
 <phrase>
@@ -8665,16 +8604,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Aktuálny čas"
   </dest>
   <voice>
     *: none
@@ -9279,7 +9218,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9297,7 +9236,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11167,7 +11106,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatické Obnovenie Prehrávania"
@@ -11327,7 +11266,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Aktivovať Časovač Spánku Po Zapnutí"
@@ -11417,7 +11356,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Stlačenie Tlačidla Reštartuje Časovač Spánku"
@@ -12896,34 +12835,6 @@
     *: "Typ ovládania"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Úroveň 9: 1 ťah / 60 min"
-  </dest>
-  <voice>
-    *: "Úroveň 9: 1 ťah za 60 minút"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Úroveň 8: 1 ťah / 15 min"
-  </dest>
-  <voice>
-    *: "Úroveň 8: 1 ťah za 15 minút"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_MENU_PLAY_MODE
   desc: in mpegplayer menus
@@ -12957,13 +12868,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Rockbox poradie hlavnej ponuky"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -12983,20 +12894,6 @@
     *: "Strana kráľa"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RETURN
   desc: in various plugin menus
@@ -13805,16 +13702,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "prepnúť položku"
+    *: ""
   </dest>
   <voice>
-    *: "prepnúť položku"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14193,20 +14090,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: VOICE_BAT_BENCH_KEYS
   desc: Battery bench start up message
@@ -14314,20 +14197,6 @@
     lowmem: none
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Úroveň 10: 1 ťah / 600 min"
-  </dest>
-  <voice>
-    *: "Úroveň 10: 1 ťah za 600 minút"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_LOADING_POSITION
   desc: in chessbox
@@ -14803,7 +14672,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Hlasitosť ozvučenia"
@@ -15092,7 +14961,7 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
     *: "Nastaviť zásuvný modul pre kontext obrazovky Teraz hrá"
@@ -17021,3 +16890,31 @@
     *: "Plejlist sa skončil. Prehrať znova?"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Triediť plejlisty"
+  </dest>
+  <voice>
+    *: "Triediť plejlisty"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[Podľa albumu]"
+  </dest>
+  <voice>
+    *: "Všetky stopy zoradené podľa albumu"
+  </voice>
+</phrase>

apps/lang/slovenscina.lang

@@ -1170,7 +1170,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -1187,7 +1187,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -1593,6 +1593,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -1601,7 +1602,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
@@ -1687,7 +1687,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: "Bujenje cez %d:%02d"
@@ -3200,10 +3200,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -4020,15 +4020,15 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </dest>
   <voice>
     *: none
-    recording: "Same As Source"
+    recording: "Same as Source"
   </voice>
 </phrase>
 <phrase>
@@ -5238,22 +5238,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </dest>
   <voice>
@@ -6443,15 +6443,15 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </dest>
   <voice>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </voice>
 </phrase>
 <phrase>
@@ -7495,13 +7495,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </dest>
   <voice>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </voice>
 </phrase>
 <phrase>
@@ -7877,13 +7877,13 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </dest>
   <voice>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </voice>
 </phrase>
 <phrase>
@@ -10282,20 +10282,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -11116,7 +11116,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -11266,15 +11266,15 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -11553,8 +11553,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -11783,15 +11783,15 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </dest>
   <voice>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </voice>
 </phrase>
 <phrase>
@@ -11971,7 +11971,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Samodejno nadaljevanje"
@@ -12123,7 +12123,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Nastavi kot mapo za katalog seznamov predvajanj"
@@ -12373,7 +12373,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Ponovno zaženi časovnik stanja pripravljenosti ob pritisku na tipko"
@@ -12505,7 +12505,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Zaženi časovnik stanja pripravljenost ob zagonu"

apps/lang/srpski.lang

@@ -241,8 +241,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -1490,7 +1490,7 @@
     *: "Replaygain"
   </source>
   <dest>
-    *: "Replaygain"
+    *: "Риплејгејн"
   </dest>
   <voice>
     *: "Риплејгејн"
@@ -2799,7 +2799,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Екран скролује ван погледа"
@@ -3099,7 +3099,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "Минимум опсега"
@@ -3113,7 +3113,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "Максимум опсега"
@@ -3425,63 +3425,6 @@
     *: "Капацитет батерије"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Battery Type"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Тип батерије"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Тип батерије"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "Алкална"
-    xduoox3: "Новија (2000 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Алкална"
-    xduoox3: "Новија двехиљаде милиампер часова"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
-  user: core
-  <source>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
-  </source>
-  <dest>
-    *: none
-    battery_types: "NiMH"
-    xduoox3: "Старија (1500 mAh)"
-  </dest>
-  <voice>
-    *: none
-    battery_types: "Никл метал хидридна"
-    xduoox3: "Старија хиљадупетсто милиампер часова"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_DISK_MENU
   desc: in the system sub menu
@@ -3612,27 +3555,26 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Постави"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Постави"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Постави"
-    gogearsa9200,samsungyh*: "PLAY = Постави"
     iriverh100,iriverh120,iriverh300: "NAVI = Постави"
     mpiohd300: "ENTER = Постави"
     mrobe500: "HEART = Постави"
-    rtc: "ON = Постави"
     vibe500: "OK = Постави"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -3641,35 +3583,34 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Врати на старо"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Врати на старо"
     gigabeatfx,mrobe500: "POWER = Врати на старо"
-    gigabeats,sansafuzeplus: "BACK = Врати на старо"
     gogearsa9200: "LEFT = Врати на старо"
     iaudiom5,iaudiox5: "RECORD = Врати на старо"
     ipod*,mpiohd300,sansac200*: "MENU = Врати на старо"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Врати на старо"
     iriverh100,iriverh120,iriverh300: "STOP = Врати на старо"
     mrobe100: "DISPLAY = Врати на старо"
-    rtc: "OFF = Врати на старо"
     samsungyh*: "REW = Врати на старо"
     vibe500: "CANCEL = Врати на старо"
   </dest>
   <voice>
     *: none
-    gigabeat*,gogearsa9200,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh100,iriverh10_5gb,iriverh120,iriverh300,mrobe100,rtc,samsungyh*,sansac200*,sansae200*: ""
   </voice>
 </phrase>
 <phrase>
@@ -4103,7 +4044,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4747,7 +4688,7 @@
   </dest>
   <voice>
     *: none
-    radio: ""
+    radio: "Скенирам"
   </voice>
 </phrase>
 <phrase>
@@ -4978,7 +4919,7 @@
   </source>
   <dest>
     *: none
-    recording: "MPEG Layer 3"
+    recording: "Емпег лејер три"
   </dest>
   <voice>
     *: none
@@ -4995,7 +4936,7 @@
   </source>
   <dest>
     *: none
-    recording: "PCM Wave"
+    recording: "~PCM Wave"
   </dest>
   <voice>
     *: none
@@ -5110,7 +5051,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5859,20 +5800,6 @@
     *: "снимљене нумере"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CATALOG
-  desc: in main menu and onplay menu
-  user: core
-  <source>
-    *: "Playlist Catalogue"
-  </source>
-  <dest>
-    *: "Каталог плејлисти"
-  </dest>
-  <voice>
-    *: "Каталог плејлисти"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_RECURSE_DIRECTORY
   desc: In playlist menu
@@ -6012,8 +5939,8 @@
   </source>
   <dest>
     *: "Инт:"
-    hibylinux: "mSD:"
-    xduoox3: "mSD1:"
+    hibylinux: "~mSD:"
+    xduoox3: "~mSD1:"
   </dest>
   <voice>
     *: "Интерни"
@@ -6034,10 +5961,10 @@
   </source>
   <dest>
     *: none
-    hibylinux: "USB:"
-    multivolume: "HD1"
-    sansac200*,sansaclipplus,sansae200*,sansafuze*: "mSD:"
-    xduoox3: "mSD2:"
+    hibylinux: "~USB:"
+    multivolume: "~HD1"
+    sansac200*,sansaclipplus,sansae200*,sansafuze*: "~mSD:"
+    xduoox3: "~mSD2:"
   </dest>
   <voice>
     *: none
@@ -6234,7 +6161,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Тражи у плејлисти"
@@ -6598,10 +6525,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -6837,7 +6764,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7337,7 +7264,7 @@
     *: "Не могу да отворим %s"
   </dest>
   <voice>
-    *: ""
+    *: "Не могу да отворим додатак"
   </voice>
 </phrase>
 <phrase>
@@ -7351,7 +7278,7 @@
     *: "Неуспело читање %s"
   </dest>
   <voice>
-    *: ""
+    *: "Неуспело читање фајла"
   </voice>
 </phrase>
 <phrase>
@@ -8789,16 +8716,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Тренутно време"
   </dest>
   <voice>
     *: none
@@ -9257,7 +9184,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Јачина гласа"
@@ -9417,7 +9344,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -9435,7 +9362,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -11228,7 +11155,7 @@
     *: "PictureFlow"
   </source>
   <dest>
-    *: "PictureFlow"
+    *: "~PictureFlow"
   </dest>
   <voice>
     *: "покрени ток слика"
@@ -11261,7 +11188,7 @@
   </source>
   <dest>
     *: none
-    touchscreen: "Del"
+    touchscreen: "Дел"
   </dest>
   <voice>
     *: none
@@ -11349,7 +11276,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Аутоматско настављање репродукције"
@@ -11495,7 +11422,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Покрени тајмер за спавање након укључења"
@@ -11627,7 +11554,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Рестартуј тајмер за спавање приликом притиска на тастер"
@@ -12604,20 +12531,6 @@
     *: "Од почетка нумере"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_PLAYTIME_REMAINING
-  desc: deprecated
-  user: core
-  <source>
-    *: ""
-  </source>
-  <dest>
-    *: ""
-  </dest>
-  <voice>
-    *: ""
-  </voice>
-</phrase>
 <phrase>
   id: LANG_PLAYTIME_TRK_REMAINING
   desc: playing time screen
@@ -13358,48 +13271,6 @@
     *: "Ниво седам четрдесет потеза за двеста четрдесет минута"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Ниво 8: 1 потез / 15 минута"
-  </dest>
-  <voice>
-    *: "Ниво осам један потез за петнаест минута"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Ниво 9: 1 потез / 60 мин"
-  </dest>
-  <voice>
-    *: "Ниво девет један потез за шездесет минута"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Ниво 10: 1 потез / 600 мин"
-  </dest>
-  <voice>
-    *: "Ниво десет један потез за шесто минута"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_PGN_PARSE_ERROR
   desc: in the chessbox game viewer
@@ -14212,16 +14083,16 @@
 </phrase>
 <phrase>
   id: LANG_TOGGLE_ITEM
-  desc: in main_menu_config
+  desc: deprecated
   user: core
   <source>
-    *: "Toggle Item"
+    *: ""
   </source>
   <dest>
-    *: "Преклопи ставку"
+    *: ""
   </dest>
   <voice>
-    *: "Преклопи ставку"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -14282,13 +14153,13 @@
 </phrase>
 <phrase>
   id: LANG_MAIN_MENU_ORDER
-  desc: main_menu_config plugin title
+  desc: deprecated
   user: core
   <source>
-    *: "Rockbox Main Menu Order"
+    *: ""
   </source>
   <dest>
-    *: "Редослед Rockbox главног менија"
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -14791,20 +14662,6 @@
     *: "Није пронађена ниједна слика албума"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
-  user: core
-  <source>
-    *: "Cache will be rebuilt on next restart"
-  </source>
-  <dest>
-    *: "Кеш ће да се изгради при наредном поновном покретању"
-  </dest>
-  <voice>
-    *: "Кеш ће да се изгради при наредном поновном покретању"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_ERROR_WRITING_CONFIG
   desc: in the pictureflow splash messages
@@ -15213,10 +15070,10 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
-    *: "Постави Wps контекст додатак"
+    *: "Постави WPS контекст додатак"
   </dest>
   <voice>
     *: "Постави WPS контекст додатак"
@@ -17030,3 +16887,31 @@
     *: "Плејлиста се завршила. Желите ли да се пусти поново?"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_TAGNAVI_ALL_TRACKS_SORTED_BY_ALBUM
+  desc: "[By album]" entry in tag browser
+  user: core
+  <source>
+    *: "[By album]"
+  </source>
+  <dest>
+    *: "[по албуму]"
+  </dest>
+  <voice>
+    *: "Све нумере сортиране по албуму"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SORT_PLAYLISTS
+  desc: playlists sorting setting
+  user: core
+  <source>
+    *: "Sort Playlists"
+  </source>
+  <dest>
+    *: "Сортирај плејлисте"
+  </dest>
+  <voice>
+    *: "сортирај плејлисте"
+  </voice>
+</phrase>

apps/lang/tagalog.lang

@@ -227,8 +227,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -1436,7 +1436,7 @@
     *: "Mawala sa ibabaw Pahintuin/Tumigil"
   </dest>
   <voice>
-    *: "Fade On Stop and Pause"
+    *: "Fade on Stop and Pause"
   </voice>
 </phrase>
 <phrase>
@@ -2933,13 +2933,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: " Pagtingin nasa labas ng umikot sa screen"
   </dest>
   <voice>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </voice>
 </phrase>
 <phrase>
@@ -3260,7 +3260,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3268,7 +3268,7 @@
     masd: none
   </dest>
   <voice>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </voice>
 </phrase>
@@ -3277,7 +3277,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3285,7 +3285,7 @@
     masd: none
   </dest>
   <voice>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </voice>
 </phrase>
@@ -3773,22 +3773,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Ilagay"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Ilagay"
     gogearsa9200,samsungyh*: "PLAY = Ilagay"
     iriverh100,iriverh120,iriverh300: "NAVI = Ilagay"
     mpiohd300: "ENTER = Ilagay"
     mrobe500: "HEART =Ilagay"
-    rtc: "ON = Ilagay"
     vibe500: "OK = Ilagay"
   </dest>
   <voice>
@@ -3801,6 +3801,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3809,12 +3810,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Mabalik"
     gigabeatfx,mrobe500: "POWER = Mabalik"
     gigabeats,sansafuzeplus: "BACK = Mabalik"
     gogearsa9200: "LEFT = Mabalik"
@@ -3823,7 +3824,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Mabalik"
     iriverh100,iriverh120,iriverh300: "STOP = Mabalik"
     mrobe100: "DISPLAY = Mabalik"
-    rtc: "OFF = Mabalik"
     samsungyh*: "REW = Mabalik"
     vibe500: "C = Mabalik"
   </dest>
@@ -4262,7 +4262,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5431,7 +5431,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5439,7 +5439,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Same As Source"
+    recording: "Same as Source"
   </voice>
 </phrase>
 <phrase>
@@ -5689,7 +5689,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6142,10 +6142,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -8538,13 +8538,13 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Hanapin sa listahan"
   </dest>
   <voice>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </voice>
 </phrase>
 <phrase>
@@ -9444,20 +9444,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -9927,7 +9927,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9935,7 +9935,7 @@
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -10264,7 +10264,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10389,7 +10389,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""

apps/lang/thai.lang

@@ -228,8 +228,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -1437,7 +1437,7 @@
     *: "หรี่เสียงตอนหยุดเล่น"
   </dest>
   <voice>
-    *: "Fade On Stop and Pause"
+    *: "Fade on Stop and Pause"
   </voice>
 </phrase>
 <phrase>
@@ -2933,13 +2933,13 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "เลื่อนจอเมื่อตกขอบ"
   </dest>
   <voice>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </voice>
 </phrase>
 <phrase>
@@ -3260,7 +3260,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3268,7 +3268,7 @@
     masd: none
   </dest>
   <voice>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </voice>
 </phrase>
@@ -3277,7 +3277,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3285,7 +3285,7 @@
     masd: none
   </dest>
   <voice>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </voice>
 </phrase>
@@ -3756,22 +3756,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = ตั้งค่า"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = ตั้งค่า"
     gogearsa9200,samsungyh*: "PLAY = ตั้งค่า"
     iriverh100,iriverh120,iriverh300: "NAVI = ตั้งค่า"
     mpiohd300: "ENTER = ตั้งค่า"
     mrobe500: "HEART = ตั้งค่า"
-    rtc: "ON = ตั้งค่า"
     vibe500: "OK = ตั้งค่า"
   </dest>
   <voice>
@@ -3784,6 +3784,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3792,12 +3793,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = ยกเลิก"
     gigabeatfx,mrobe500: "POWER = ยกเลิก"
     gigabeats,sansafuzeplus: "BACK = ยกเลิก"
     gogearsa9200: "LEFT = ยกเลิก"
@@ -3806,7 +3807,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = ยกเลิก"
     iriverh100,iriverh120,iriverh300: "STOP = ยกเลิก"
     mrobe100: "DISPLAY = ยกเลิก"
-    rtc: "OFF = ยกเลิก"
     samsungyh*: "REW = ยกเลิก"
     vibe500: "C = ยกเลิก"
   </dest>
@@ -4245,7 +4245,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5413,7 +5413,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5421,7 +5421,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Same As Source"
+    recording: "Same as Source"
   </voice>
 </phrase>
 <phrase>
@@ -5671,7 +5671,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -5679,7 +5679,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </voice>
 </phrase>
 <phrase>
@@ -6676,13 +6676,13 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "ค้นหาในรายการเพลง"
   </dest>
   <voice>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </voice>
 </phrase>
 <phrase>
@@ -7054,10 +7054,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7307,7 +7307,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -7315,7 +7315,7 @@
   </dest>
   <voice>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </voice>
 </phrase>
 <phrase>
@@ -9389,20 +9389,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </dest>
   <voice>
     *: none
-    rtc: "Current time:"
+    rtc: "Current time"
   </voice>
 </phrase>
 <phrase>
@@ -10358,7 +10358,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -10366,7 +10366,7 @@
   </dest>
   <voice>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </voice>
 </phrase>
 <phrase>
@@ -10653,7 +10653,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""

apps/lang/turkce.lang

@@ -217,8 +217,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -1582,7 +1582,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "En Düşük Aralık"
@@ -1596,7 +1596,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "En Yüksek Aralık"
@@ -1707,22 +1707,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
-    gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "Açma Tuşu = Ayarla"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SEÇ Tuşu = Ayarla"
-    gogearsa9200,samsungyh*: "PLAY Tuşu = Ayarla"
+    aigoerosq,erosqnative,gogearsa9200,samsungyh*,xduoox3*: "PLAY Tuşu = Ayarla"
     iriverh100,iriverh120,iriverh300: "NAVI Tuşu = Ayarla"
     mpiohd300: "Tamam Tuşu = Ayarla"
     mrobe500: "Kalp Tuşu = Ayarla"
-    rtc: "Açma Tuşu = Ayarla"
     vibe500: "Tamam  Tuşu = Ayarla"
   </dest>
   <voice>
@@ -1736,31 +1736,30 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "BACK = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
-    gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
     iaudiom5,iaudiox5: "RECORD = Revert"
     ipod*,mpiohd300,sansac200*: "MENU = Revert"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Geri Döndür"
     gigabeatfx,mrobe500: "POWER = Geri Döndür"
-    gigabeats: "LEFT =  Revert"
+    aigoerosq,erosqnative,gigabeats,sansafuzeplus,xduoox3*: "LEFT =  Revert"
     gogearsa9200: "LEFT = Geri Döndür"
     iaudiom5,iaudiox5: "RECORD = Geri Döndür"
     ipod*,mpiohd300,sansac200*: "MENU = Geri Döndür"
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Geri Döndür"
     iriverh100,iriverh120,iriverh300: "STOP = Geri Döndür"
     mrobe100: "DISPLAY = Geri Döndür"
-    rtc: "OFF = Geri Döndür"
     samsungyh*: "REW = Geri Döndür"
-    sansafuzeplus: "BACK = Geri Döndür"
     vibe500: "C = Geri Döndür"
   </dest>
   <voice>
@@ -3037,7 +3036,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -3055,7 +3054,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -3460,19 +3459,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Battery Type"
+    battery_types: ""
   </source>
   <dest>
     *: none
-    battery_types: "Pil Türü"
+    battery_types: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Pil Türü"
+    battery_types: ""
   </voice>
 </phrase>
 <phrase>
@@ -3922,7 +3921,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Oynatma Listesinde Ara"
@@ -4622,7 +4621,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Önyüklemede Uyku Zamanlayıcısını Başlat"
@@ -4632,16 +4631,16 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "Geçerli Zaman"
   </dest>
   <voice>
     *: none
@@ -4847,7 +4846,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Otomatik Devam"
@@ -4935,7 +4934,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -5121,7 +5120,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -6150,7 +6149,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -6551,10 +6550,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7550,16 +7549,16 @@
 </phrase>
 <phrase>
   id: LANG_CATALOG
-  desc: in main menu and onplay menu
+  desc: deprecated
   user: core
   <source>
-    *: "Playlist Catalogue"
+    *: ""
   </source>
   <dest>
-    *: "Oynatma Listesi Kataloğu"
+    *: ""
   </dest>
   <voice>
-    *: "Oynatma Listesi Kataloğu"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9050,7 +9049,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Tuşa Basıldığında Uyku Zamanlayıcısını Yeniden Başlatın"
@@ -9137,22 +9136,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_2
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "NiMH"
-    xduoox3: "Older (1500 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "NiMH Nikel metal Hidrit"
-    xduoox3: "Daha eski (1500 mAh)"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Nikel metal Hidrit"
-    xduoox3: "Daha eski 1500 miliamper saat"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
@@ -11027,7 +11023,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Satırlar Ekrandan Taşsın mı?"
@@ -11901,22 +11897,19 @@
 </phrase>
 <phrase>
   id: LANG_BATTERY_TYPE_1
-  desc: in battery settings
+  desc: deprecated
   user: core
   <source>
     *: none
-    battery_types: "Alkaline"
-    xduoox3: "Newer (2000 mAh)"
+    battery_types,xduoox3: ""
   </source>
   <dest>
     *: none
-    battery_types: "Alkalin"
-    xduoox3: "Daha yeni (2000 mAh)"
+    battery_types,xduoox3: ""
   </dest>
   <voice>
     *: none
-    battery_types: "Alkalin"
-    xduoox3: "Daha yeni 2000 mAh den"
+    battery_types,xduoox3: ""
   </voice>
 </phrase>
 <phrase>
@@ -12053,7 +12046,7 @@
   desc: Relative volume of voice prompts
   user: core
   <source>
-    *: "Voice prompt volume"
+    *: "Voice Prompt Volume"
   </source>
   <dest>
     *: "Ses istemi ses seviyesi"
@@ -13251,48 +13244,6 @@
     *: "7. Seviye 240 dakikada 40 hamle"
   </voice>
 </phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_8
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 8: 1 move / 15 min"
-  </source>
-  <dest>
-    *: "Seviye 8: 1 hamle / 15 dk."
-  </dest>
-  <voice>
-    *: "Seviye 8 15 dakikada 1 hamle"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_9
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 9: 1 move / 60 min"
-  </source>
-  <dest>
-    *: "Seviye 9: 1 hamle / 60 dk."
-  </dest>
-  <voice>
-    *: "Seviye 9 60 dakikada 1 hamle"
-  </voice>
-</phrase>
-<phrase>
-  id: LANG_CHESSBOX_LEVEL_10
-  desc: in the chessbox game level selection
-  user: core
-  <source>
-    *: "Level 10: 1 move / 600 min"
-  </source>
-  <dest>
-    *: "Seviye 10: 1 hamle / 600 dk."
-  </dest>
-  <voice>
-    *: "Seviye 10, 600 dakikada 1 hamle"
-  </voice>
-</phrase>
 <phrase>
   id: LANG_CHESSBOX_PGN_PARSE_ERROR
   desc: in the chessbox game viewer
@@ -14686,16 +14637,16 @@
 </phrase>
 <phrase>
   id: LANG_CACHE_REBUILT_NEXT_RESTART
-  desc: in the pictureflow splash messages
+  desc: deprecated
   user: core
   <source>
-    *: "Cache will be rebuilt on next restart"
+    *: ""
   </source>
   <dest>
-    *: "Önbellek bir sonraki yeniden başlatmada yeniden oluşturulacak"
+    *: ""
   </dest>
   <voice>
-    *: "Önbellek bir sonraki yeniden başlatmada yeniden oluşturulacak"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -15105,13 +15056,13 @@
   desc: open plugin module
   user: core
   <source>
-    *: "Set Wps Context Plugin"
+    *: "Set WPS Context Plugin"
   </source>
   <dest>
-    *: "Wps Bağlam Eklentisini Ayarla"
+    *: "WPS Bağlam Eklentisini Ayarla"
   </dest>
   <voice>
-    *: "Wps Bağlam Eklentisini Ayarla"
+    *: "WPS Bağlam Eklentisini Ayarla"
   </voice>
 </phrase>
 <phrase>

apps/lang/vlaams.lang

@@ -3110,7 +3110,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Scherm schuift uit beeld"
@@ -3372,7 +3372,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3389,7 +3389,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3730,7 +3730,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -3973,7 +3973,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Zoeken in afspeellijst"
@@ -4179,20 +4179,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "huidigen tijd"
   </dest>
   <voice>
     *: none
-    rtc: "huidigen tijd:"
+    rtc: "huidigen tijd"
   </voice>
 </phrase>
 <phrase>
@@ -4305,6 +4305,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -4313,12 +4314,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = terugzetten"
     gigabeatfx,mrobe500: "POWER = terugzetten"
     gigabeats,sansafuzeplus: "BACK = terugzetten"
     gogearsa9200: "LINKS = terugzetten"
@@ -4327,12 +4328,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
     iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
-    rtc: "OFF = terugzetten"
     samsungyh*: "REW = terugzetten"
     vibe500: "C = terugzetten"
   </dest>
   <voice>
     *: none
+    rtc: "OFF = terugzetten"
     gigabeatfx,mrobe500: "POWER = terugzetten"
     gigabeats,sansafuzeplus: "BACK = terugzetten"
     gogearsa9200: "LINKS = terugzetten"
@@ -4341,7 +4342,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = terugzetten"
     iriverh100,iriverh120,iriverh300: "STOP = terugzetten"
     mrobe100: "DISPLAY = terugzetten"
-    rtc: "OFF = terugzetten"
     samsungyh*: "REW = terugzetten"
     vibe500: "C = terugzetten"
   </voice>
@@ -4517,7 +4517,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -4796,10 +4796,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "Variabele bitrate"
@@ -8323,7 +8323,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -9098,7 +9098,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -9304,32 +9304,32 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = instellen"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = instellen"
     gogearsa9200,samsungyh*: "PLAY = instellen"
     iriverh100,iriverh120,iriverh300: "NAVI = instellen"
     mpiohd300: "ENTER = instellen"
     mrobe500: "HEART = instellen"
-    rtc: "ON = instellen"
     vibe500: "OK = instellen"
   </dest>
   <voice>
     *: none
+    rtc: "ON = instellen"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = instellen"
     gogearsa9200,samsungyh*: "PLAY = instellen"
     iriverh100,iriverh120,iriverh300: "NAVI = instellen"
     mpiohd300: "ENTER = instellen"
     mrobe500: "HEART = instellen"
-    rtc: "ON = instellen"
     vibe500: "OK = instellen"
   </voice>
 </phrase>
@@ -9651,8 +9651,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -10234,7 +10234,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10252,7 +10252,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none
@@ -12194,7 +12194,7 @@
   desc: resume settings menu
   user: core
   <source>
-    *: "Automatic resume"
+    *: "Automatic Resume"
   </source>
   <dest>
     *: "Automatisch hervatten"
@@ -12298,7 +12298,7 @@
   desc: used in the onplay menu to set a playlist catalogue dir
   user: core
   <source>
-    *: "Set As Playlist Catalogue Directory"
+    *: "Set as Playlist Catalogue Directory"
   </source>
   <dest>
     *: "Instellen als afspeellijstcatalogusmap"
@@ -12399,7 +12399,7 @@
   desc: whether sleep timer starts on power up
   user: core
   <source>
-    *: "Start Sleep Timer On Boot"
+    *: "Start Sleep Timer on Boot"
   </source>
   <dest>
     *: "Slaaptimer starten bij opstarten"
@@ -12517,7 +12517,7 @@
   desc: whether to restart running sleep timer on keypress
   user: core
   <source>
-    *: "Restart Sleep Timer On Keypress"
+    *: "Restart Sleep Timer on Keypress"
   </source>
   <dest>
     *: "Slaaptimer herstarten bij toetsklik"

apps/lang/wallisertitsch.lang

@@ -847,7 +847,7 @@
   desc: options menu to set fade on stop or pause
   user: core
   <source>
-    *: "Fade On Stop/Pause"
+    *: "Fade on Stop/Pause"
   </source>
   <dest>
     *: "Uberblendu bi Stop/Pause"
@@ -1575,7 +1575,7 @@
   desc: in display_settings_menu
   user: core
   <source>
-    *: "Backlight On When Plugged"
+    *: "Backlight on When Plugged"
   </source>
   <dest>
     *: "Bilüüchtig a bim Netzbitrieb"
@@ -1981,7 +1981,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
   </source>
   <dest>
     *: "chlinschte Wärt"
@@ -1995,7 +1995,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
   </source>
   <dest>
     *: "greeschte Wärt"
@@ -2439,17 +2439,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
-    *: ""
+    *: none
+    rtc: "Current Time"
   </source>
   <dest>
-    *: ""
+    *: none
+    rtc: ""
   </dest>
   <voice>
-    *: ""
+    *: none
+    rtc: ""
   </voice>
 </phrase>
 <phrase>
@@ -2647,7 +2650,7 @@
   desc: The time until the alarm will go off shown in the alarm menu for the RTC alarm mod.
   user: core
   <source>
-    *: "Waking Up In %d:%02d"
+    *: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: "Üfwachu in %d:%02d"

apps/lang/walon.lang

@@ -232,8 +232,8 @@
   </voice>
 </phrase>
 <phrase>
-  id: LANG_RESET_ASK
-  desc: confirm to reset settings
+  id: LANG_ARE_YOU_SURE
+  desc: confirm action
   user: core
   <source>
     *: "Are You Sure?"
@@ -2953,7 +2953,7 @@
   desc: should lines scroll out of the screen
   user: core
   <source>
-    *: "Screen Scrolls Out Of View"
+    *: "Screen Scrolls Out of View"
   </source>
   <dest>
     *: "Erôlaedje foû del waitroûle"
@@ -3280,7 +3280,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Minimum Of Range"
+    *: "Minimum of Range"
     masd: none
   </source>
   <dest>
@@ -3297,7 +3297,7 @@
   desc: in the peak meter menu
   user: core
   <source>
-    *: "Maximum Of Range"
+    *: "Maximum of Range"
     masd: none
   </source>
   <dest>
@@ -3793,22 +3793,22 @@
   user: core
   <source>
     *: none
+    rtc: "ON = Set"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Set"
     gogearsa9200,samsungyh*: "PLAY = Set"
     iriverh100,iriverh120,iriverh300: "NAVI = Set"
     mpiohd300: "ENTER = Set"
     mrobe500: "HEART = Set"
-    rtc: "ON = Set"
     vibe500: "OK = Set"
   </source>
   <dest>
     *: none
+    rtc: "ON = Eployî"
     gigabeat*,iaudiom5,iaudiox5,ipod*,iriverh10,iriverh10_5gb,mrobe100,sansac200*,sansaclip*,sansaconnect,sansae200*,sansafuze*: "SELECT = Eployî"
     gogearsa9200,samsungyh*: "PLAY = Eployî"
     iriverh100,iriverh120,iriverh300: "NAVI = Eployî"
     mpiohd300: "ENTER = Eployî"
     mrobe500: "HEART = Eployî"
-    rtc: "ON = Eployî"
     vibe500: "OK = Eployî"
   </dest>
   <voice>
@@ -3822,6 +3822,7 @@
   user: core
   <source>
     *: none
+    rtc: "OFF = Revert"
     gigabeatfx,mrobe500: "POWER = Revert"
     gigabeats,sansafuzeplus: "BACK = Revert"
     gogearsa9200: "LEFT = Revert"
@@ -3830,12 +3831,12 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Revert"
     iriverh100,iriverh120,iriverh300: "STOP = Revert"
     mrobe100: "DISPLAY = Revert"
-    rtc: "OFF = Revert"
     samsungyh*: "REW = Revert"
     vibe500: "CANCEL = Revert"
   </source>
   <dest>
     *: none
+    rtc: "OFF = Rinoncî"
     gigabeatfx,mrobe500: "POWER = Rinoncî"
     gigabeats,sansafuzeplus: "BACK = Rinoncî"
     gogearsa9200: "LEFT = Rinoncî"
@@ -3844,7 +3845,6 @@
     iriverh10,iriverh10_5gb,sansae200*,sansafuze*: "PREV = Rinoncî"
     iriverh100,iriverh120,iriverh300: "STOP = Rinoncî"
     mrobe100: "DISPLAY = Rinoncî"
-    rtc: "OFF = Rinoncî"
     samsungyh*: "REW = Rinoncî"
     vibe500: "C = Rinoncî"
   </dest>
@@ -4284,7 +4284,7 @@
   user: core
   <source>
     *: none
-    alarm: "Waking Up In %d:%02d"
+    alarm: "Waking Up in %d:%02d"
   </source>
   <dest>
     *: none
@@ -5453,7 +5453,7 @@
   user: core
   <source>
     *: none
-    recording: "(Same As Source)"
+    recording: "(Same as Source)"
   </source>
   <dest>
     *: none
@@ -5709,7 +5709,7 @@
   user: core
   <source>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "Set as Recording Directory"
   </source>
   <dest>
     *: none
@@ -6714,7 +6714,7 @@
   desc: in playlist menu.
   user: core
   <source>
-    *: "Search In Playlist"
+    *: "Search in Playlist"
   </source>
   <dest>
     *: "Cweri el djivêye di boket"
@@ -7092,10 +7092,10 @@
   desc: in browse_id3
   user: core
   <source>
-    *: " (VBR)"
+    *: "(VBR)"
   </source>
   <dest>
-    *: " (VBR)"
+    *: "(VBR)"
   </dest>
   <voice>
     *: "VBR"
@@ -7345,7 +7345,7 @@
   user: core
   <source>
     *: none
-    lcd_non-mono: "Set As Backdrop"
+    lcd_non-mono: "Set as Backdrop"
   </source>
   <dest>
     *: none
@@ -9426,20 +9426,20 @@
   </voice>
 </phrase>
 <phrase>
-  id: VOICE_CURRENT_TIME
-  desc: spoken only, for wall clock announce
+  id: LANG_CURRENT_TIME
+  desc: for wall clock announce
   user: core
   <source>
     *: none
-    rtc: ""
+    rtc: "Current Time"
   </source>
   <dest>
     *: none
-    rtc: ""
+    rtc: "eure do moumint"
   </dest>
   <voice>
     *: none
-    rtc: "eure do moumint:"
+    rtc: "eure do moumint"
   </voice>
 </phrase>
 <phrase>
@@ -10289,7 +10289,7 @@
 </phrase>
 <phrase>
   id: VOICE_OK
-  desc: spoken only, On exiting a context, specifically the quick screen
+  desc: spoken only, on exiting a context, specifically the quick screen
   user: core
   <source>
     *: ""
@@ -10307,7 +10307,7 @@
   user: core
   <source>
     *: none
-    recording: "Stop Recording And Shutdown"
+    recording: "Stop Recording and Shutdown"
   </source>
   <dest>
     *: none

apps/main.c

@@ -206,7 +206,7 @@ int main(void)
         int fd = open(ROCKBOX_DIR"/playername.txt", O_CREAT|O_WRONLY|O_TRUNC, 0666);
         if(fd >= 0)
         {
-            fdprintf(fd, "%s!", str(LANG_ROCKBOX_TITLE));
+            fdprintf(fd, "%s", MODEL_NAME);
             close(fd);
         }
     }
@@ -500,7 +500,7 @@ static void init(void)
     power_init();
 
     enable_irq();
-#ifdef CPU_ARM
+#if defined(CPU_ARM_CLASSIC)
     enable_fiq();
 #endif
     /* current_tick should be ticking by now */
@@ -636,16 +636,24 @@ static void init(void)
         CHART("<disk_mount_all");
         if (rc<=0)
         {
+            int line=0;
             lcd_clear_display();
-            lcd_puts(0, 0, "No partition");
-            lcd_putsf(0, 1, "found (%d).", rc);
+            lcd_putsf(0, line++, "No partition found (%d).", rc);
 #ifndef USB_NONE
-            lcd_puts(0, 2, "Insert USB cable");
-            lcd_puts(0, 3, "and fix it.");
+            lcd_puts(0, line++, "Insert USB cable");
+            lcd_puts(0, line++, "and fix it.");
 #elif !defined(DEBUG) && !(CONFIG_STORAGE & STORAGE_RAMDISK)
-            lcd_puts(0, 2, "Rebooting in 5s");
+            lcd_puts(0, line++, "Rebooting in 5s");
 #endif
-            lcd_puts(0, 4, rbversion);
+            lcd_puts(0, line++, rbversion);
+
+            struct partinfo pinfo;
+            for (int i = 0 ; i < NUM_VOLUMES ; i++) {
+                disk_partinfo(i, &pinfo);
+                if (pinfo.type)
+                    lcd_putsf(0, line++, "P%d T%02x S%08lx",
+                              i, pinfo.type, pinfo.size);
+            }
             lcd_update();
 
 #if defined(MAX_VIRT_SECTOR_SIZE) && defined(DEFAULT_VIRT_SECTOR_SIZE)

apps/menu.c

@@ -578,7 +578,9 @@ int do_menu(const struct menu_item_ex *start_menu, int *start_selected,
                             shortcuts_add(SHORTCUT_SETTING, (void*)setting);
                             break;
 #endif
-                    } /* swicth(do_menu()) */
+                    } /* switch(do_menu()) */
+                    if (menu->flags & MENU_EXITAFTERTHISMENU)
+                        done = true; /* in case onplay menu contains setting */
                     redraw_lists = true;
                 }
             } /* else if (!in_stringlist) */

apps/menus/main_menu.c

@@ -57,7 +57,7 @@ static int show_info(void);
 
 static int reset_settings(void)
 {
-    static const char *lines[]={ID2P(LANG_RESET_ASK)};
+    static const char *lines[]={ID2P(LANG_ARE_YOU_SURE), ID2P(LANG_RESET)};
     static const char *yes_lines[]={
         ID2P(LANG_SETTINGS),
         ID2P(LANG_RESET_DONE_CLEAR)
@@ -66,7 +66,7 @@ static int reset_settings(void)
         ID2P(LANG_SETTINGS),
         ID2P(LANG_CANCEL)
     };
-    static const struct text_message message={lines, 1};
+    static const struct text_message message={lines, 2};
     static const struct text_message yes_message={yes_lines, 2};
     static const struct text_message no_message={no_lines, 2};
 
@@ -123,9 +123,9 @@ static int show_credits(void)
 
 static int show_legal(void)
 {
-    if (plugin_load(VIEWERS_DIR "/text_viewer.rock", "/.rockbox/docs/COPYING.txt") != PLUGIN_OK)
+    if (plugin_load(VIEWERS_DIR "/text_viewer.rock", ROCKBOX_DIR "/docs/COPYING.txt") != PLUGIN_OK)
         show_info();
-    if (plugin_load(VIEWERS_DIR "/text_viewer.rock", "/.rockbox/docs/LICENSES.txt") != PLUGIN_OK)
+    if (plugin_load(VIEWERS_DIR "/text_viewer.rock", ROCKBOX_DIR "/docs/LICENSES.txt") != PLUGIN_OK)
         show_info();
     return 0;
 }
@@ -240,7 +240,7 @@ static int info_speak_item(int selected_item, void * data)
 
 #if CONFIG_RTC
         case INFO_TIME:
-            talk_id(VOICE_CURRENT_TIME, false);
+            talk_id(LANG_CURRENT_TIME, false);
             /* fallthrough */
         case INFO_DATE:
             tm = get_time();
@@ -495,6 +495,15 @@ MAKE_MENU(info_menu, ID2P(LANG_SYSTEM), 0, Icon_System_menu,
 /*      INFO MENU                  */
 /***********************************/
 
+static int main_menu_config(void)
+{
+    plugin_load(PLUGIN_APPS_DIR "/main_menu_config.rock", NULL);
+    return 0;
+}
+
+MENUITEM_FUNCTION(main_menu_config_item, 0, ID2P(LANG_MAIN_MENU),
+                  main_menu_config, NULL, Icon_Rockbox);
+
 /***********************************/
 /*    MAIN MENU                    */
 
@@ -509,6 +518,7 @@ MAKE_MENU(main_menu_, ID2P(LANG_SETTINGS), NULL,
 #if CONFIG_RTC
         &timedate_item,
 #endif
+        &main_menu_config_item,
         &manage_settings,
         );
 /*    MAIN MENU                    */

apps/menus/playback_menu.c

@@ -177,26 +177,7 @@ MENUITEM_SETTING(pause_rewind, &global_settings.pause_rewind, NULL);
 MENUITEM_SETTING(play_frequency, &global_settings.play_frequency, NULL);
 #endif
 #ifdef HAVE_ALBUMART
-static int albumart_callback(int action,
-                             const struct menu_item_ex *this_item,
-                             struct gui_synclist *this_list)
-{
-    (void)this_item;
-    (void)this_list;
-    static int initial_aa_setting;
-    switch (action)
-    {
-        case ACTION_ENTER_MENUITEM:
-            initial_aa_setting = global_settings.album_art;
-            break;
-        case ACTION_EXIT_MENUITEM: /* on exit */
-            if (initial_aa_setting != global_settings.album_art)
-                set_albumart_mode(global_settings.album_art);
-    }
-    return action;
-}
-MENUITEM_SETTING(album_art, &global_settings.album_art,
-                 albumart_callback);
+MENUITEM_SETTING(album_art, &global_settings.album_art, NULL);
 #endif
 
 MENUITEM_SETTING(playback_log, &global_settings.playback_log, NULL);

apps/menus/playlist_menu.c

@@ -157,9 +157,11 @@ MAKE_MENU(currentplaylist_settings_menu, ID2P(LANG_CURRENT_PLAYLIST),
           &show_shuffled_adding_options,
           &show_queue_options);
 
+MENUITEM_SETTING(sort_playlists, &global_settings.sort_playlists, NULL);
 MAKE_MENU(playlist_settings, ID2P(LANG_PLAYLISTS), NULL,
           Icon_Playlist,
-          &viewer_settings_menu, &recursive_dir_insert, &currentplaylist_settings_menu);
+          &sort_playlists, &viewer_settings_menu, &recursive_dir_insert,
+          &currentplaylist_settings_menu);
 MAKE_MENU(playlist_options, ID2P(LANG_PLAYLISTS), NULL,
           Icon_Playlist,
           &view_cur_playlist, &save_playlist,

apps/menus/settings_menu.c

@@ -180,14 +180,10 @@ MAKE_MENU(tagcache_menu, ID2P(LANG_TAGCACHE), 0, Icon_NOICON,
 
 /***********************************/
 /*    FILE VIEW MENU               */
-static int fileview_callback(int action,
-                             const struct menu_item_ex *this_item,
-                             struct gui_synclist *this_list);
-
 MENUITEM_SETTING(sort_case, &global_settings.sort_case, NULL);
-MENUITEM_SETTING(sort_dir, &global_settings.sort_dir, fileview_callback);
-MENUITEM_SETTING(sort_file, &global_settings.sort_file, fileview_callback);
-MENUITEM_SETTING(interpret_numbers, &global_settings.interpret_numbers, fileview_callback);
+MENUITEM_SETTING(sort_dir, &global_settings.sort_dir, NULL);
+MENUITEM_SETTING(sort_file, &global_settings.sort_file, NULL);
+MENUITEM_SETTING(interpret_numbers, &global_settings.interpret_numbers, NULL);
 MENUITEM_SETTING(dirfilter, &global_settings.dirfilter, NULL);
 MENUITEM_SETTING(show_filename_ext, &global_settings.show_filename_ext, NULL);
 MENUITEM_SETTING(browse_current, &global_settings.browse_current, NULL);
@@ -205,25 +201,6 @@ static int clear_start_directory(void)
 }
 MENUITEM_FUNCTION(clear_start_directory_item, 0, ID2P(LANG_RESET_START_DIR),
                   clear_start_directory, NULL, Icon_file_view_menu);
-static int fileview_callback(int action,
-                             const struct menu_item_ex *this_item,
-                             struct gui_synclist *this_list)
-{
-    (void)this_list;
-    static int oldval;
-    int *variable = this_item->variable;
-    switch (action)
-    {
-        case ACTION_ENTER_MENUITEM: /* on entering an item */
-            oldval = *variable;
-            break;
-        case ACTION_EXIT_MENUITEM: /* on exit */
-            if (*variable != oldval)
-                reload_directory(); /* force reload if this has changed */
-            break;
-    }
-    return action;
-}
 
 static int filemenu_callback(int action,
                              const struct menu_item_ex *this_item,
@@ -243,10 +220,13 @@ static int filemenu_callback(int action,
 {
     (void)this_list;
 
+    /* Show File View menu in Settings or File Browser,
+       but not in Database or Playlist Catalog */
     if (action == ACTION_REQUEST_MENUITEM &&
         this_item == &file_menu &&
-        get_onplay_context() == CONTEXT_ID3DB &&
-        get_current_activity() != ACTIVITY_SETTINGS)
+        get_current_activity() != ACTIVITY_SETTINGS &&
+        (get_onplay_context() != CONTEXT_TREE
+         || *tree_get_context()->dirfilter == SHOW_M3U))
         return ACTION_EXIT_MENUITEM;
 
     return action;
@@ -505,7 +485,7 @@ int sleeptimer_voice(int selected_item, void*data)
 {
     (void)selected_item;
     (void)data;
-    talk_sleeptimer();
+    talk_sleeptimer(-1);
     return 0;
 }
 

apps/menus/theme_menu.c

@@ -29,6 +29,7 @@
 #include "settings.h"
 #include "rbpaths.h"
 #include "menu.h"
+#include "dir.h"
 #include "tree.h"
 #include "list.h"
 #include "color_picker.h"
@@ -42,6 +43,7 @@
 #include "viewport.h"
 #include "statusbar-skinned.h"
 #include "skin_engine/skin_engine.h"
+#include "splash.h"
 #include "icons.h"
 #ifdef HAVE_LCD_COLOR
 #include "filetypes.h"
@@ -211,7 +213,9 @@ MENUITEM_SETTING(remote_statusbar, &global_settings.remote_statusbar,
                                                     statusbar_callback_remote);
 #endif
 MENUITEM_SETTING(volume_type, &global_settings.volume_type, NULL);
+#if (CONFIG_BATTERY_MEASURE != 0)
 MENUITEM_SETTING(battery_display, &global_settings.battery_display, NULL);
+#endif
 MAKE_MENU(bars_menu, ID2P(LANG_BARS_MENU), 0, Icon_NOICON,
           &scrollbar_item, &scrollbar_width, &statusbar,
 #ifdef HAVE_REMOTE_LCD
@@ -256,6 +260,11 @@ int browse_folder(void *param)
         .root = info->dir,
     };
 
+    if (!dir_exists(info->dir)) {
+        splash(HZ, ID2P(LANG_PLAYLIST_DIRECTORY_ACCESS_ERROR));
+        return GO_TO_PREVIOUS;
+    }
+
     /* if we are in a special settings folder, center the current setting */
     switch(info->show_options)
     {
@@ -323,6 +332,7 @@ int browse_folder(void *param)
         browse.title = str(lang_id);
     }
 
+    tree_get_context()->browse = NULL;  /*bugfix - force root dir reload */
     return rockbox_browse(&browse);
 }
 

apps/misc.c

@@ -178,7 +178,7 @@ char *output_dyn_value(char *buf,
     }
     else
     {
-        talk_fractional(tbuf, value, P2ID(units[unit_no]));
+        talk_fractional(tbuf, value2, P2ID(units[unit_no]));
     }
     return buf;
 }
@@ -196,7 +196,13 @@ bool warn_on_pl_erase(void)
             {ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)};
         static const struct text_message message={lines, 1};
 
-        return (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES);
+        if (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES)
+            return true;
+        else
+        {
+            splash(HZ, ID2P(LANG_CANCEL));
+            return false;
+        }
     }
     else
         return true;
@@ -204,12 +210,13 @@ bool warn_on_pl_erase(void)
 
 bool show_search_progress(bool init, int display_count, int current, int total)
 {
-    static int last_tick = 0;
+    static long last_tick, talked_tick;
 
     /* Don't show splashes for 1/2 second after starting search */
     if (init)
     {
         last_tick = current_tick + HZ/2;
+        talked_tick = 0;
         return true;
     }
 
@@ -217,13 +224,22 @@ bool show_search_progress(bool init, int display_count, int current, int total)
     if (TIME_AFTER(current_tick, last_tick + HZ/10))
     {
         if (total != current)
-        {
+            /* (voiced) */
             splash_progress(current, total, str(LANG_PLAYLIST_SEARCH_MSG),
                             display_count, str(LANG_OFF_ABORT));
-        }
         else
+        {
+            if (global_settings.talk_menu &&
+                TIME_AFTER(current_tick, talked_tick + (HZ * 5)))
+            {
+                talked_tick = current_tick;
+                talk_number(display_count, false);
+                talk_id(LANG_PLAYLIST_SEARCH_MSG, true);
+            }
+            /* (voiced above) */
             splashf(0, str(LANG_PLAYLIST_SEARCH_MSG),
                     display_count, str(LANG_OFF_ABORT));
+        }
 
         if (action_userabort(TIMEOUT_NOBLOCK))
             return false;
@@ -861,7 +877,7 @@ void setvol(void)
         volume = max_vol;
     if (volume > global_settings.volume_limit)
         volume = global_settings.volume_limit;
-    global_status.volume = volume;
+
     sound_set_volume(volume);
     global_status.last_volume_change = current_tick;
     status_save(false);
@@ -1539,13 +1555,14 @@ int toggle_sleeptimer(void)
     return 0;
 }
 
-void talk_sleeptimer(void)
+void talk_sleeptimer(int custom_duration)
 {
-    int seconds = get_sleep_timer();
+    int seconds = custom_duration < 0 ? get_sleep_timer() : custom_duration*60;
     long talk_ids[] = {
-        seconds ? LANG_SLEEP_TIMER_CANCEL_CURRENT
-            : LANG_SLEEP_TIMER_START_CURRENT,
+        custom_duration >= 0 ? LANG_SLEEP_TIMER :
+        (seconds ? LANG_SLEEP_TIMER_CANCEL_CURRENT : LANG_SLEEP_TIMER_START_CURRENT),
         VOICE_PAUSE,
+        custom_duration == 0 ? LANG_OFF :
         (seconds ? seconds_to_min(seconds)
             : global_settings.sleeptimer_duration) | UNIT_MIN << UNIT_SHIFT,
         TALK_FINAL_ID
@@ -1559,7 +1576,7 @@ void talk_timedate(void)
     struct tm *tm = get_time();
     if (!global_settings.talk_menu)
         return;
-    talk_id(VOICE_CURRENT_TIME, false);
+    talk_id(LANG_CURRENT_TIME, false);
     if (valid_time(tm))
     {
         talk_time(tm, true);

apps/misc.h

@@ -101,7 +101,7 @@ const char* format_sleeptimer(char* buffer, size_t buffer_size,
    canceled, and how long it will be or how long is remaining in brackets */
 char* string_sleeptimer(char *buffer, size_t buffer_len);
 int toggle_sleeptimer(void);
-void talk_sleeptimer(void);
+void talk_sleeptimer(int custom_duration);
 
 #if CONFIG_RTC
 void talk_timedate(void);

apps/onplay.c

@@ -64,6 +64,9 @@
 #include "pathfuncs.h"
 #include "shortcuts.h"
 #include "misc.h"
+#ifdef HAVE_DISK_STORAGE
+#include "storage.h"
+#endif
 
 static int onplay_result = ONPLAY_OK;
 static bool in_queue_submenu = false;
@@ -180,7 +183,7 @@ static int bookmark_menu_callback(int action,
 /* CONTEXT_WPS playlist options */
 static bool shuffle_playlist(void)
 {
-    if (!warn_on_pl_erase())
+    if (!yesno_pop_confirm(ID2P(LANG_SHUFFLE)))
         return false;
     playlist_sort(NULL, true);
     playlist_randomise(NULL, current_tick, true);
@@ -267,6 +270,11 @@ static void op_playlist_insert_selected(int position, bool queue)
         ctx_current_playlist_insert(position, queue, false);
         return;
     }
+    else if (selected_file.context == CONTEXT_ID3DB)
+    {
+        tagtree_current_playlist_insert(position, queue);
+        return;
+    }
 #endif
     if ((selected_file.attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO)
         playlist_insert_track(NULL, selected_file.path, position, queue, true);
@@ -274,13 +282,6 @@ static void op_playlist_insert_selected(int position, bool queue)
         playlist_insert_playlist(NULL, selected_file.path, position, queue);
     else if (selected_file.attr & ATTR_DIRECTORY)
     {
-#ifdef HAVE_TAGCACHE
-        if (selected_file.context == CONTEXT_ID3DB)
-        {
-            tagtree_current_playlist_insert(position, queue);
-            return;
-        }
-#endif
         bool recurse = (global_settings.recursive_dir_insert == RECURSE_ON);
         if (global_settings.recursive_dir_insert == RECURSE_ASK)
         {
@@ -839,16 +840,33 @@ static bool list_viewers(void)
 #ifdef HAVE_TAGCACHE
 static bool prepare_database_sel(void *param)
 {
-    if (selected_file.context == CONTEXT_ID3DB &&
-        (selected_file.attr & FILE_ATTR_MASK) != FILE_ATTR_AUDIO)
+    if (selected_file.context == CONTEXT_ID3DB)
     {
-        if (!strcmp(param, "properties"))
+        if (param && !strcmp(param, "properties")
+            && (selected_file.attr & FILE_ATTR_MASK) != FILE_ATTR_AUDIO)
+        {
             strmemccpy(selected_file.buf, MAKE_ACT_STR(ACTIVITY_DATABASEBROWSER),
                        sizeof(selected_file.buf));
-        else if (!tagtree_get_subentry_filename(selected_file.buf, MAX_PATH))
+        }
+        else
         {
-            onplay_result = ONPLAY_RELOAD_DIR;
-            return false;
+            /* If database is not loaded into RAM, or tagcache_ram is
+               set to "quick", filename needs to be retrieved from disk! */
+#ifdef HAVE_DISK_STORAGE
+            if ((selected_file.attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO
+                && !storage_disk_is_active()
+#ifdef HAVE_TC_RAMCACHE
+                && (global_settings.tagcache_ram != TAGCACHE_RAM_ON
+                    || !tagcache_is_in_ram())
+#endif
+            )
+                splash(0, ID2P(LANG_WAIT));
+#endif
+             if (!tagtree_get_subentry_filename(selected_file.buf, MAX_PATH))
+            {
+                onplay_result = ONPLAY_RELOAD_DIR;
+                return false;
+            }
         }
 
         selected_file.path = selected_file.buf;
@@ -1031,9 +1049,13 @@ static int clipboard_callback(int action,
             else if (selected_file.path)
             {
                 /* requires an actual file */
-                if (this_item == &rename_file_item ||
-                    this_item == &clipboard_cut_item ||
-                    this_item == &clipboard_copy_item ||
+                if (this_item == &clipboard_cut_item ||
+                    this_item == &clipboard_copy_item)
+                {
+                    if (*tree_get_context()->dirfilter != SHOW_M3U)
+                        return action;
+                }
+                else if (this_item == &rename_file_item ||
                     (this_item == &track_info_item &&
                         (selected_file.attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO) ||
                     (this_item == &properties_item &&
@@ -1058,12 +1080,14 @@ static int clipboard_callback(int action,
                         )
                         return action;
                 }
-                else if (this_item == &delete_file_item ||
-                         this_item == &list_viewers_item)
-                {
                     /* only for files */
-                    return action;
+                else if (this_item == &list_viewers_item)
+                {
+                    if (*tree_get_context()->dirfilter != SHOW_M3U)
+                        return action;
                 }
+                else if (this_item == &delete_file_item)
+                    return action;
 #if LCD_DEPTH > 1
                 else if (this_item == &set_backdrop_item)
                 {
@@ -1108,6 +1132,23 @@ MAKE_ONPLAYMENU( wps_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
 #endif
          );
 
+int sort_playlists_callback(int action,
+                            const struct menu_item_ex *this_item,
+                            struct gui_synclist *this_list)
+{
+    (void) this_list;
+    (void) this_item;
+
+    if (action == ACTION_REQUEST_MENUITEM &&
+        *tree_get_context()->dirfilter != SHOW_M3U)
+    {
+        return ACTION_EXIT_MENUITEM;
+    }
+    return action;
+}
+
+MENUITEM_SETTING(sort_playlists, &global_settings.sort_playlists, sort_playlists_callback);
+
 MENUITEM_FUNCTION(view_playlist_item, 0, ID2P(LANG_VIEW),
                   view_playlist,
                   onplaymenu_callback, Icon_Playlist);
@@ -1125,7 +1166,7 @@ MAKE_ONPLAYMENU( tree_onplay_menu, ID2P(LANG_ONPLAY_MENU_TITLE),
 #if LCD_DEPTH > 1
            &set_backdrop_item,
 #endif
-           &add_to_faves_item, &set_as_dir_menu, &file_menu,
+           &add_to_faves_item, &set_as_dir_menu, &file_menu, &sort_playlists,
          );
 static int onplaymenu_callback(int action,
                                const struct menu_item_ex *this_item,
@@ -1173,6 +1214,9 @@ static bool hotkey_delete_item(void)
     if (selected_file.context == CONTEXT_ID3DB &&
         (selected_file.attr & FILE_ATTR_MASK) != FILE_ATTR_AUDIO)
         return false;
+
+     if (!prepare_database_sel(NULL))
+        return false;
 #endif
 
     return clipboard_delete_selected_fileobject();
@@ -1186,6 +1230,10 @@ static bool hotkey_open_with(void)
 #ifdef HAVE_MULTIVOLUME
     if (selected_file.attr & ATTR_VOLUME)
         return false;
+#endif
+#ifdef HAVE_TAGCACHE
+    if (!prepare_database_sel(NULL))
+        return false;
 #endif
     return list_viewers();
 }
@@ -1341,8 +1389,7 @@ int onplay(char* file, int attr, int from_context, bool hotkey, int customaction
     selected_file_set(from_context, NULL, attr);
 
 #ifdef HAVE_TAGCACHE
-    if (from_context == CONTEXT_ID3DB &&
-        (attr & FILE_ATTR_MASK) != FILE_ATTR_AUDIO)
+    if (from_context == CONTEXT_ID3DB)
     {
         ctx_add_to_playlist = tagtree_add_to_playlist;
         if (file != NULL)

apps/open_plugin.c

@@ -348,7 +348,7 @@ uint32_t open_plugin_add_path(const char *key, const char *plugin, const char *p
 
     logf("OP add_path Invalid, *Clearing entry*");
     if (lang_id != LANG_SHORTCUTS) /* from shortcuts menu */
-        splashf(HZ * 2, str(LANG_OPEN_PLUGIN_NOT_A_PLUGIN), pos);
+        splashf(HZ * 2, ID2P(LANG_OPEN_PLUGIN_NOT_A_PLUGIN), pos);
     op_clear_entry(op_entry);
     return 0;
 }

apps/playlist.c

@@ -140,7 +140,8 @@
  *    a supported position for (A)dd or (Q)eue commands.
  * v6 removed the (C)lear command.
  */
-#define PLAYLIST_CONTROL_FILE_MIN_VERSION   2
+#define PLAYLIST_CONTROL_FILE_LTS_VERSION   2 /*  v2 still supported  */
+#define PLAYLIST_CONTROL_FILE_MIN_VERSION   6
 #define PLAYLIST_CONTROL_FILE_VERSION       6
 
 #define PLAYLIST_COMMAND_SIZE (MAX_PATH+12)
@@ -679,12 +680,22 @@ static void display_playlist_count(int count, const unsigned char *fmt,
         if(count && TIME_AFTER(current_tick, next_tick))
         {
             talked_tick = current_tick;
-            talk_number(count, false);
-            talk_id(id, true);
+            if (final)
+            {
+                talk_id(LANG_ALL, false);
+                talk_number(count, true);
+                talk_id(id, true);
+                talk_force_enqueue_next(); /* Don't interrupt final announcement */
+            }
+            else
+            {
+                talk_number(count, false);
+                talk_id(id, true);
+            }
         }
     }
 
-    splashf(0, P2STR(fmt), count, str(LANG_OFF_ABORT));
+    splashf(0, P2STR(fmt), count, str(LANG_OFF_ABORT)); /* (voiced above) */
 }
 
 /*
@@ -1164,7 +1175,7 @@ static int create_and_play_dir(int direction, bool play_last)
 /*
  * remove all tracks, leaving the current track queued
  */
-static int remove_all_tracks_unlocked(struct playlist_info *playlist, bool write)
+static int remove_all_tracks_unlocked(struct playlist_info *playlist)
 {
     char filename[MAX_PATH];
     int seek_pos = -1;
@@ -1172,25 +1183,22 @@ static int remove_all_tracks_unlocked(struct playlist_info *playlist, bool write
     if (playlist->amount <= 0)
         return 0;
 
-    if (write) /* Write control file commands to disk */
-    {
-        if (playlist->control_fd < 0)
-            return -1;
+    if (playlist->control_fd < 0)
+        return -1;
 
-        if (get_track_filename(playlist, playlist->index,
-                               filename, sizeof(filename)) != 0)
-            return -1;
+    if (get_track_filename(playlist, playlist->index,
+                           filename, sizeof(filename)) != 0)
+        return -1;
 
-        /* Start over with fresh control file for emptied dynamic playlist */
-        pl_close_control(playlist);
-        create_control_unlocked(playlist);
-        update_control_unlocked(playlist, PLAYLIST_COMMAND_PLAYLIST,
-                                PLAYLIST_CONTROL_FILE_VERSION, -1,
-                                "", "", NULL);
-        update_control_unlocked(playlist, PLAYLIST_COMMAND_QUEUE,
-                                0, 0, filename, NULL, &seek_pos);
-        sync_control_unlocked(playlist);
-    }
+    /* Start over with fresh control file for emptied dynamic playlist */
+    pl_close_control(playlist);
+    create_control_unlocked(playlist);
+    update_control_unlocked(playlist, PLAYLIST_COMMAND_PLAYLIST,
+                            PLAYLIST_CONTROL_FILE_VERSION, -1,
+                            "", "", NULL);
+    update_control_unlocked(playlist, PLAYLIST_COMMAND_QUEUE,
+                            0, 0, filename, NULL, &seek_pos);
+    sync_control_unlocked(playlist);
 
     /* Move current track down to position 0 */
     playlist->indices[0] = playlist->indices[playlist->index];
@@ -1338,7 +1346,7 @@ static int add_track_to_playlist_unlocked(struct playlist_info* playlist,
             break;
         }
         case PLAYLIST_REPLACE:
-            if (remove_all_tracks_unlocked(playlist, true) < 0)
+            if (remove_all_tracks_unlocked(playlist) < 0)
                 return -1;
             int newpos = playlist->index + 1;
             playlist->last_insert_pos = position = insert_position = newpos;
@@ -2416,7 +2424,7 @@ int playlist_insert_context_create(struct playlist_info* playlist,
 
     if (position == PLAYLIST_REPLACE)
     {
-        if (remove_all_tracks_unlocked(playlist, true) == 0)
+        if (remove_all_tracks_unlocked(playlist) == 0)
             position = PLAYLIST_INSERT_LAST;
         else
         {
@@ -3082,7 +3090,7 @@ int playlist_remove_all_tracks(struct playlist_info *playlist)
     dc_thread_stop(playlist);
     playlist_write_lock(playlist);
 
-    result = remove_all_tracks_unlocked(playlist, true);
+    result = remove_all_tracks_unlocked(playlist);
 
     playlist_write_unlock(playlist);
     dc_thread_start(playlist, false);
@@ -3119,8 +3127,6 @@ static enum playlist_command pl_cmds_run(char cmd)
             return PLAYLIST_COMMAND_UNSHUFFLE;
         case 'R':
             return PLAYLIST_COMMAND_RESET;
-        case 'C':
-            return PLAYLIST_COMMAND_CLEAR;
         case 'F':
             return PLAYLIST_COMMAND_FLAGS;
         case '#':
@@ -3283,8 +3289,9 @@ int playlist_resume(void)
                          * (It's not a big deal since the error message will
                          * be practically the same either way...)
                          */
-                        if (version < PLAYLIST_CONTROL_FILE_MIN_VERSION ||
-                            version > PLAYLIST_CONTROL_FILE_VERSION)
+                        if ((version < PLAYLIST_CONTROL_FILE_MIN_VERSION ||
+                             version > PLAYLIST_CONTROL_FILE_VERSION)
+                            && version != PLAYLIST_CONTROL_FILE_LTS_VERSION)
                         {
                             result = -3;
                             goto out;
@@ -3418,19 +3425,6 @@ int playlist_resume(void)
                         playlist->last_insert_pos = -1;
                         break;
                     }
-                    /* FIXME: Deprecated.
-                     * Adjust PLAYLIST_CONTROL_FILE_MIN_VERSION after removal */
-                    case PLAYLIST_COMMAND_CLEAR:
-                    {
-                        if (strp[0])
-                            playlist->index = atoi(strp[0]);
-                        if (remove_all_tracks_unlocked(playlist, false) < 0)
-                        {
-                            result = -16;
-                            goto out;
-                        }
-                        break;
-                    }
                     case PLAYLIST_COMMAND_FLAGS:
                     {
                         if (!strp[0] || !strp[1])

apps/playlist.h

@@ -51,7 +51,6 @@ enum playlist_command {
     PLAYLIST_COMMAND_SHUFFLE,
     PLAYLIST_COMMAND_UNSHUFFLE,
     PLAYLIST_COMMAND_RESET,
-    PLAYLIST_COMMAND_CLEAR,
     PLAYLIST_COMMAND_FLAGS,
     PLAYLIST_COMMAND_COMMENT,
     PLAYLIST_COMMAND_ERROR = PLAYLIST_COMMAND_COMMENT + 1 /* Internal */

apps/playlist_catalog.c

@@ -100,6 +100,7 @@ static int initialize_catalog_buf(char* dirbuf, size_t dirbuf_sz)
                 talk_dir_or_spell(dirbuf, NULL, true);
                 talk_force_enqueue_next();
             }
+            /* (voiced above) */
             splashf(HZ*2, str(LANG_CATALOG_NO_DIRECTORY), dirbuf);
             return -1;
         }
@@ -264,7 +265,7 @@ static void display_insert_count(int count)
         talk_number(count, false);
         talk_id(LANG_PLAYLIST_INSERT_COUNT, true);
     }
-
+    /* (voiced above) */
     splashf(0, str(LANG_PLAYLIST_INSERT_COUNT), count, str(LANG_OFF_ABORT));
 }
 
@@ -286,8 +287,8 @@ static int add_track_to_playlist(char* filename, void* context)
 
 /* Add "sel" file into specified "playlist".  How to insert depends on type
    of file */
-static int add_to_playlist(const char* playlist, bool new_playlist,
-                           const char* sel, int sel_attr)
+int catalog_insert_into(const char* playlist, bool new_playlist,
+                        const char* sel, int sel_attr)
 {
     int fd;
     int result = -1;
@@ -514,7 +515,7 @@ bool catalog_add_to_a_playlist(const char* sel, int sel_attr,
         result = ctx_add_to_playlist(playlist, new_playlist);
     }
     else
-        result = add_to_playlist(playlist, new_playlist, sel, sel_attr);
+        result = catalog_insert_into(playlist, new_playlist, sel, sel_attr);
 
     return (result == 0);
 }

apps/playlist_catalog.h

@@ -36,6 +36,9 @@ bool catalog_view_playlists(void);
 bool catalog_pick_new_playlist_name(char *pl_name, size_t buf_size,
                                     const char* curr_pl_name);
 
+int catalog_insert_into(const char* playlist, bool new_playlist,
+                        const char* sel, int sel_attr);
+
 /*
  * Add something to a playlist (new or select from list of playlists in
  * catalog).

apps/playlist_viewer.c

@@ -774,6 +774,8 @@ static enum pv_context_result context_menu(int index)
                 return show_track_info(current_track);
             case 5:
                 /* shuffle */
+                if (!yesno_pop_confirm(ID2P(LANG_SHUFFLE)))
+                    return PV_CONTEXT_UNCHANGED;
                 playlist_sort(viewer.playlist, !viewer.playlist);
                 playlist_randomise(viewer.playlist, current_tick, !viewer.playlist);
                 viewer.selected_track = 0;
@@ -1253,6 +1255,7 @@ bool search_playlist(void)
     int found_indicies_count = 0, last_found_count = -1;
     int button;
     int track_display = global_settings.playlist_viewer_track_display;
+    long talked_tick = 0;
     struct gui_synclist playlist_lists;
     struct playlist_track_info track;
 
@@ -1271,6 +1274,14 @@ bool search_playlist(void)
     {
         if (found_indicies_count != last_found_count)
         {
+            if (global_settings.talk_menu &&
+                TIME_AFTER(current_tick, talked_tick + (HZ * 5)))
+            {
+                talked_tick = current_tick;
+                talk_number(found_indicies_count, false);
+                talk_id(LANG_PLAYLIST_SEARCH_MSG, true);
+            }
+            /* (voiced above) */
             splashf(0, str(LANG_PLAYLIST_SEARCH_MSG), found_indicies_count,
                        str(LANG_OFF_ABORT));
             last_found_count = found_indicies_count;
@@ -1293,7 +1304,7 @@ bool search_playlist(void)
 
     cpu_boost(false);
 
-    cond_talk_ids_fq(TALK_ID(found_indicies_count, UNIT_INT),
+    cond_talk_ids_fq(LANG_ALL, TALK_ID(found_indicies_count, UNIT_INT),
                      LANG_PLAYLIST_SEARCH_MSG);
     if (!found_indicies_count)
     {

apps/plugin.c

@@ -184,7 +184,6 @@ static const struct plugin_api rockbox_api = {
     language_strings,
     &core_bitmaps[0],
     /* lcd */
-    splash,
     splashf,
     splash_progress,
     splash_progress_set_delay,
@@ -412,7 +411,7 @@ static const struct plugin_api rockbox_api = {
     storage_sleep,
     STORAGE_FUNCTION(spin),
     STORAGE_FUNCTION(spindown),
-#if USING_STORAGE_CALLBACK
+#ifdef USING_STORAGE_CALLBACK
     register_storage_idle_func,
     unregister_storage_idle_func,
 #endif /* USING_STORAGE_CALLBACK */
@@ -463,7 +462,7 @@ static const struct plugin_api rockbox_api = {
     talk_force_enqueue_next,
 
     /* kernel/ system */
-#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
+#if defined(ARM_NEED_DIV0)
     __div0,
 #endif
     sleep,
@@ -845,6 +844,7 @@ static const struct plugin_api rockbox_api = {
        the API gets incompatible */
     add_playbacklog,
     &device_battery_tables,
+    yesno_pop_confirm,
 };
 
 static int plugin_buffer_handle;
@@ -861,7 +861,9 @@ int plugin_load(const char* plugin, const void* parameter)
 
     /* for some plugins, the SBS can be left enabled */
     const char *sepch = strrchr(plugin, PATH_SEPCH);
-    bool theme_enabled = sepch && !strcmp("properties.rock", sepch + 1);
+    bool theme_enabled = sepch && (!strcmp("properties.rock", sepch + 1) ||
+                                   !strcmp("main_menu_config.rock", sepch + 1) ||
+                                   !strcmp("disktidy.rock", sepch + 1));
 
     if (current_plugin_handle)
     {
@@ -900,6 +902,13 @@ int plugin_load(const char* plugin, const void* parameter)
     strcpy(current_plugin, plugin);
     current_plugin_handle = lc_open(plugin, pluginbuf, PLUGIN_BUFFER_SIZE);
     if (current_plugin_handle == NULL) {
+        if (global_settings.talk_menu)
+        {
+            talk_id(LANG_PLUGIN_CANT_OPEN, false);
+            talk_spell(plugin, true);
+            talk_force_enqueue_next();
+        }
+        /* (voiced above) */
         splashf(HZ*2, str(LANG_PLUGIN_CANT_OPEN), plugin);
         return -1;
     }

apps/plugin.h

@@ -58,6 +58,8 @@
 #undef vsprintf
 #endif
 
+#define splash(__ticks, __str) splashf(__ticks, __str)
+
 char* strncpy(char *, const char *, size_t);
 void* plugin_get_buffer(size_t *buffer_size);
 size_t plugin_reserve_buffer(size_t buffer_size);
@@ -174,7 +176,7 @@ int plugin_open(const char *plugin, const char *parameter);
  * when this happens please take the opportunity to sort in
  * any new functions "waiting" at the end of the list.
  */
-#define PLUGIN_API_VERSION 273
+#define PLUGIN_API_VERSION 274
 
 /* 239 Marks the removal of ARCHOS HWCODEC and CHARCELL */
 
@@ -211,7 +213,6 @@ struct plugin_api {
     const struct cbmp_bitmap_info_entry *core_bitmaps;
 
     /* lcd */
-    void (*splash)(int ticks, const char *str);
     void (*splashf)(int ticks, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
     void (*splash_progress)(int current, int total, const char *fmt, ...) ATTRIBUTE_PRINTF(3, 4);
     void (*splash_progress_set_delay)(long delay_ticks);
@@ -295,15 +296,15 @@ struct plugin_api {
 #if defined(HAVE_LCD_ENABLE) || defined(HAVE_LCD_SLEEP)
     void (*button_queue_post)(long id, intptr_t data);
 #endif
-    unsigned short *(*bidi_l2v)( const unsigned char *str, int orientation );
-    bool (*is_diacritic)(const unsigned short char_code, bool *is_rtl);
-    const unsigned char *(*font_get_bits)( struct font *pf, unsigned short char_code );
+    ucschar_t *(*bidi_l2v)(const unsigned char *str, int orientation);
+    bool (*is_diacritic)(const ucschar_t char_code, bool *is_rtl);
+    const unsigned char *(*font_get_bits)(struct font *pf, ucschar_t char_code);
     int (*font_load)(const char *path);
     void (*font_unload)(int font_id);
     struct font* (*font_get)(int font);
     int  (*font_getstringsize)(const unsigned char *str, int *w, int *h,
                                int fontnumber);
-    int (*font_get_width)(struct font* pf, unsigned short char_code);
+    int (*font_get_width)(struct font* pf, ucschar_t char_code);
     void (*screen_clear_area)(struct screen * display, int xstart, int ystart,
                               int width, int height);
     void (*gui_scrollbar_draw)(struct screen * screen, int x, int y,
@@ -474,7 +475,7 @@ struct plugin_api {
     void (*storage_sleep)(void);
     void (*storage_spin)(void);
     void (*storage_spindown)(int seconds);
-#if USING_STORAGE_CALLBACK
+#ifdef USING_STORAGE_CALLBACK
     void (*register_storage_idle_func)(void (*function)(void));
     void (*unregister_storage_idle_func)(void (*function)(void), bool run);
 #endif /* USING_STORAGE_CALLBACK */
@@ -537,7 +538,7 @@ struct plugin_api {
     void (*talk_force_enqueue_next)(void);
 
     /* kernel/ system */
-#if defined(CPU_ARM) && CONFIG_PLATFORM & PLATFORM_NATIVE
+#if defined(ARM_NEED_DIV0)
     void (*__div0)(void);
 #endif
     unsigned (*sleep)(unsigned ticks);
@@ -666,7 +667,7 @@ struct plugin_api {
                               const unsigned char * const *units,
                               unsigned int unit_count, bool binary_scale);
     /* unicode stuff */
-    const unsigned char* (*utf8decode)(const unsigned char *utf8, unsigned short *ucs);
+    const unsigned char* (*utf8decode)(const unsigned char *utf8, ucschar_t *ucs);
     unsigned char* (*iso_decode)(const unsigned char *iso, unsigned char *utf8, int cp, int count);
     unsigned char* (*utf16LEdecode)(const unsigned char *utf16, unsigned char *utf8, int count);
     unsigned char* (*utf16BEdecode)(const unsigned char *utf16, unsigned char *utf8, int count);
@@ -922,7 +923,7 @@ struct plugin_api {
     int  (*rand)(void);
     void (*qsort)(void *base, size_t nmemb, size_t size,
                   int(*compar)(const void *, const void *));
-    int (*kbd_input)(char* buffer, int buflen, unsigned short *kbd);
+    int (*kbd_input)(char* buffer, int buflen, ucschar_t *kbd);
     struct tm* (*get_time)(void);
     struct tm * (*gmtime_r)(const time_t *timep, struct tm *tm);
 #if CONFIG_RTC
@@ -992,6 +993,7 @@ struct plugin_api {
        the API gets incompatible */
     void (*add_playbacklog)(struct mp3entry *id3);
     struct battery_tables_t *device_battery_tables;
+    bool (*yesno_pop_confirm)(const char* text);
 };
 
 /* plugin header */