Make enable-autoresume option more consistent with other settings.

Rename "Enable automatic resume" to "Automatic resume", and make it a
simple Yes/No option.  Offer the user to initialized the database in
case it is not yet ready when enabling autoresume.
---
 apps/lang/czech.lang       |   20 ++++++++++----------
 apps/lang/deutsch.lang     |   20 ++++++++++----------
 apps/lang/english.lang     |   30 ++++++++++++++++++++++--------
 apps/lang/francais.lang    |   20 ++++++++++----------
 apps/lang/hrvatski.lang    |   20 ++++++++++----------
 apps/lang/italiano.lang    |   20 ++++++++++----------
 apps/lang/portugues.lang   |   20 ++++++++++----------
 apps/lang/russian.lang     |   20 ++++++++++----------
 apps/lang/slovak.lang      |   20 ++++++++++----------
 apps/lang/tagalog.lang     |   20 ++++++++++----------
 apps/menus/settings_menu.c |   22 +++++++++++++++++++++-
 apps/settings_list.c       |    4 ++--
 12 files changed, 135 insertions(+), 101 deletions(-)

diff --git a/apps/lang/czech.lang b/apps/lang/czech.lang
index 1aef597..c766c95 100644
--- a/apps/lang/czech.lang
+++ b/apps/lang/czech.lang
@@ -12607,29 +12607,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Auto.pokračování u všech souborů"
+    *: none
   </dest>
   <voice>
-    *: "Automatycké pokračování u všech souborů"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Ano (vyžaduje inicializovanou databázi)"
+    *: none
   </dest>
   <voice>
-    *: "Ano, vyžaduje inicializovanou databázi"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 2150ee7..381ab3f 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -12624,29 +12624,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Ja (erfordert initialisierte Datenbank)"
+    *: none
   </dest>
   <voice>
-    *: "Ja (erfordert initialisierte Datenbank)"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Automatisches Fortsetzen aktivieren"
+    *: none
   </dest>
   <voice>
-    *: "Automatisches Fortsetzen aktivieren"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 394bc99..8f46678 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -12687,29 +12687,43 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Enable automatic resume"
+    *: none
   </dest>
   <voice>
-    *: "Enable automatic resume"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
+  desc: deprecated
+  user:
+  <source>
+    *: none
+  </source>
+  <dest>
+    *: none
+  </dest>
+  <voice>
+    *: none
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_AUTORESUME
   desc: resume settings menu
   user: core
   <source>
-    *: "Yes (requires initialized database)"
+    *: "Automatic resume"
   </source>
   <dest>
-    *: "Yes (requires initialized database)"
+    *: "Automatic resume"
   </dest>
   <voice>
-    *: "Yes (requires initialized database)"
+    *: "Automatic resume"
   </voice>
 </phrase>
diff --git a/apps/lang/francais.lang b/apps/lang/francais.lang
index 4d84cb6..7fc952d 100644
--- a/apps/lang/francais.lang
+++ b/apps/lang/francais.lang
@@ -12631,29 +12631,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Activer la reprise automatique"
+    *: none
   </dest>
   <voice>
-    *: "Activer la reprise automatique"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Oui (nécessite l'activation de la base de données)"
+    *: none
   </dest>
   <voice>
-    *: "Oui (nécessite l'activation de la base de données)"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/hrvatski.lang b/apps/lang/hrvatski.lang
index 71bece2..335a5fd 100644
--- a/apps/lang/hrvatski.lang
+++ b/apps/lang/hrvatski.lang
@@ -12605,29 +12605,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Da (zahtijeva pokrenutu bazu podataka)"
+    *: none
   </dest>
   <voice>
-    *: "Da (zahtijeva pokrenutu bazu podataka)"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Omogući automatsko nastavljanje"
+    *: none
   </dest>
   <voice>
-    *: "Omogući automatsko nastavljanje"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/italiano.lang b/apps/lang/italiano.lang
index da841af..2e3ac10 100644
--- a/apps/lang/italiano.lang
+++ b/apps/lang/italiano.lang
@@ -12607,29 +12607,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Abilita Riprendi Automatico"
+    *: none
   </dest>
   <voice>
-    *: "Abilita Riprendi Automatico"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Sì (richiede database inizializzato)"
+    *: none
   </dest>
   <voice>
-    *: "Sì (richiede database inizializzato)"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 88bf497..0a216a3 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -12586,16 +12586,16 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Sim (requer base de dados inicializada)"
+    *: none
   </dest>
   <voice>
-    *: "Sim (requer base de dados inicializada)"
+    *: none
   </voice>
 </phrase>
 <phrase>
@@ -12617,15 +12617,15 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Habilitar retoma da reprodução automática"
+    *: none
   </dest>
   <voice>
-    *: "Habilitar retoma da reprodução automática"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/russian.lang b/apps/lang/russian.lang
index e85ac6e..c99cac3 100644
--- a/apps/lang/russian.lang
+++ b/apps/lang/russian.lang
@@ -12611,29 +12611,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Да (необходима инициализированная база данных)"
+    *: none
   </dest>
   <voice>
-    *: "Да (необходима инициализированная база данных)"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Автоматически продолжать воспроизведение"
+    *: none
   </dest>
   <voice>
-    *: "Автоматически продолжать воспроизведение"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/slovak.lang b/apps/lang/slovak.lang
index 9c77af3..c08d0fc 100644
--- a/apps/lang/slovak.lang
+++ b/apps/lang/slovak.lang
@@ -12586,16 +12586,16 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Áno (požaduje inicializovanú databázu)"
+    *: none
   </dest>
   <voice>
-    *: "Áno (požaduje inicializovanú databázu)"
+    *: none
   </voice>
 </phrase>
 <phrase>
@@ -12617,15 +12617,15 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Aktivovať Automatické Obnovenie Prehrávania"
+    *: none
   </dest>
   <voice>
-    *: "Aktivovať Automatické Obnovenie Prehrávania"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/lang/tagalog.lang b/apps/lang/tagalog.lang
index 38a2e05..3fe60ad 100644
--- a/apps/lang/tagalog.lang
+++ b/apps/lang/tagalog.lang
@@ -12605,29 +12605,29 @@
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE_YES
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Yes (requires initialized database)"
+    *: none
   </source>
   <dest>
-    *: "Oo (kailangan initialize database)"
+    *: none
   </dest>
   <voice>
-    *: "Oo (kailangan initialize database)"
+    *: none
   </voice>
 </phrase>
 <phrase>
   id: LANG_AUTORESUME_ENABLE
-  desc: resume settings menu
-  user: core
+  desc: deprecated
+  user:
   <source>
-    *: "Enable automatic resume"
+    *: none
   </source>
   <dest>
-    *: "Paganahin ang awtomatikong resume"
+    *: none
   </dest>
   <voice>
-    *: "Paganahin ang awtomatikong resume"
+    *: none
   </voice>
 </phrase>
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index cc3871a..ce03e1a 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -34,6 +34,7 @@
 #include "tagtree.h"
 #include "usb.h"
 #include "splash.h"
+#include "yesno.h"
 #include "talk.h"
 #include "powermgmt.h"
 #if CONFIG_CODEC == SWCODEC
@@ -426,7 +427,26 @@ MAKE_MENU(hotkey_menu, ID2P(LANG_HOTKEY), 0, Icon_NOICON,
 
 #ifdef HAVE_TAGCACHE
 #if CONFIG_CODEC == SWCODEC 
-MENUITEM_SETTING(autoresume_enable, &global_settings.autoresume_enable, NULL);
+static int autoresume_callback(int action, const struct menu_item_ex *this_item)
+{
+    (void)this_item;
+
+    if (action == ACTION_EXIT_MENUITEM  /* on exit */
+        && global_settings.autoresume_enable
+        && !tagcache_is_usable())
+    {
+        static const char *lines[] = {ID2P(LANG_TAGCACHE_BUSY),
+                                      ID2P(LANG_TAGCACHE_FORCE_UPDATE)};
+        static const struct text_message message = {lines, 2};
+        
+        if (gui_syncyesno_run(&message, NULL, NULL) == YESNO_YES)
+            tagcache_rebuild_with_splash();
+    }
+    return action;
+}
+
+MENUITEM_SETTING(autoresume_enable, &global_settings.autoresume_enable,
+                 autoresume_callback);
 #endif
 #endif
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 94910c0..0521d4f 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -1258,9 +1258,9 @@ const struct settings_list settings[] = {
 
 #ifdef HAVE_TAGCACHE
 #if CONFIG_CODEC == SWCODEC 
-    BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME_ENABLE, false,
+    BOOL_SETTING(0, autoresume_enable, LANG_AUTORESUME, false,
                  "autoresume enable", off_on,
-                 LANG_AUTORESUME_ENABLE_YES, LANG_SET_BOOL_NO, NULL),
+                 LANG_SET_BOOL_YES, LANG_SET_BOOL_NO, NULL),
 #endif                  
 
     OFFON_SETTING(0, runtimedb, LANG_RUNTIMEDB_ACTIVE, false,
-- 
1.7.1