summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2005-10-08 22:01:42 +0000
committerJens Arnold <amiconn@rockbox.org>2005-10-08 22:01:42 +0000
commit104d38cd8bf44357e07d8e6ba335014474ab4eab (patch)
tree800df630e92f4035ebd52c367ee067e47e5c9b0f
parent1f39f2e7486ef6448103d5ac1d020cad59e9fd95 (diff)
Changed the dircache option to 'Direcory cache: On/Off' * Synced deutsch.lang * Made some standard boolean yes/no settings more compact.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7601 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/lang/deutsch.lang18
-rw-r--r--apps/lang/english.lang6
-rw-r--r--apps/settings_menu.c21
3 files changed, 30 insertions, 15 deletions
diff --git a/apps/lang/deutsch.lang b/apps/lang/deutsch.lang
index 2a4dde65ed..81a95bc1a8 100644
--- a/apps/lang/deutsch.lang
+++ b/apps/lang/deutsch.lang
@@ -3291,3 +3291,21 @@ desc: use track gain if shuffle mode is on, album gain otherwise
eng: "Track gain if shuffling"
voice: "Titellautstärke beim Mischen"
new: "Titellautstärke beim Mischen"
+
+id: LANG_DIRCACHE_ENABLE
+desc: in directory cache settings
+eng: "Directory cache"
+voice: "Verzeichnispuffer"
+new: "Verzeichnispuffer"
+
+id: LANG_DIRCACHE_REBOOT
+desc: when activating directory cache
+eng: "Please reboot to enable the cache"
+voice: ""
+new: "Neustarten, um den Puffer zu aktivieren"
+
+id: LANG_DIRCACHE_BUILDING
+desc: when booting up and rebuilding the cache
+eng: "Scanning disk..."
+voice: ""
+new: "Lese Festplatte..."
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index fbba81250f..94f434f2f4 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -3301,14 +3301,14 @@ new:
id: LANG_DIRCACHE_ENABLE
desc: in directory cache settings
-eng: "Enable directory cache"
-voice: "Enable directory cache"
+eng: "Directory cache"
+voice: "Directory cache"
new:
id: LANG_DIRCACHE_REBOOT
desc: when activating directory cache
eng: "Please reboot to enable the cache"
-voice: "Please reboot to enable the cache"
+voice: ""
new:
id: LANG_DIRCACHE_BUILDING
diff --git a/apps/settings_menu.c b/apps/settings_menu.c
index 6ad5274f0f..b6d6b2bdac 100644
--- a/apps/settings_menu.c
+++ b/apps/settings_menu.c
@@ -76,11 +76,8 @@ void dac_line_in(bool enable);
#ifdef HAVE_CHARGING
static bool car_adapter_mode(void)
{
- return set_bool_options( str(LANG_CAR_ADAPTER_MODE),
- &global_settings.car_adapter_mode,
- STR(LANG_SET_BOOL_YES),
- STR(LANG_SET_BOOL_NO),
- NULL);
+ return set_bool( str(LANG_CAR_ADAPTER_MODE),
+ &global_settings.car_adapter_mode );
}
#endif
@@ -1161,11 +1158,8 @@ static bool runtimedb(void)
bool rc;
bool old = global_settings.runtimedb;
- rc = set_bool_options( str(LANG_RUNTIMEDB_ACTIVE),
- &global_settings.runtimedb,
- STR(LANG_SET_BOOL_YES),
- STR(LANG_SET_BOOL_NO),
- NULL);
+ rc = set_bool( str(LANG_RUNTIMEDB_ACTIVE),
+ &global_settings.runtimedb );
if (old && !global_settings.runtimedb)
rundb_shutdown();
if (!old && global_settings.runtimedb)
@@ -1264,8 +1258,11 @@ static bool beep(void)
#ifdef HAVE_DIRCACHE
static bool dircache(void)
{
- bool result = set_bool(str(LANG_DIRCACHE_ENABLE),
- &global_settings.dircache);
+ bool result = set_bool_options(str(LANG_DIRCACHE_ENABLE),
+ &global_settings.dircache,
+ STR(LANG_ON),
+ STR(LANG_OFF),
+ NULL);
if (!dircache_is_enabled() && global_settings.dircache)
splash(HZ*2, true, str(LANG_DIRCACHE_REBOOT));