diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-08-05 19:19:39 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-08-05 19:19:39 +0000 |
commit | b3113674819cd8daf44750d129c5d8298e830df0 (patch) | |
tree | ebc7ec9e096e309ef79834802eed28ff9c22fd41 /apps/settings.c | |
parent | e70f7f4ca857e9e88a6e076360b6c9c235d7739b (diff) | |
download | rockbox-b3113674819cd8daf44750d129c5d8298e830df0.tar.gz rockbox-b3113674819cd8daf44750d129c5d8298e830df0.zip |
*** Lang v2 cleanup (FS#6574) ***
1) Introduces apps/features.txt that controls which strings are included
for each target based on defines.
2) .lng and .voice files are now target specific and the format versions
of both these file types have been bumped, which means that new voice
files are needed.
3) Use the 'features' mechanism to exclude strings for targets that
didn't use them.
4) Delete unused and deprecated and duplicated strings, sort strings in
english.lang
Some string IDs were changed so translations will be slightly worse than
before.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14198 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
-rw-r--r-- | apps/settings.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/apps/settings.c b/apps/settings.c index 958c410af8..7815bdb81c 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -536,11 +536,11 @@ int settings_save( void ) | |||
536 | { | 536 | { |
537 | screens[i].clear_display(); | 537 | screens[i].clear_display(); |
538 | #ifdef HAVE_LCD_CHARCELLS | 538 | #ifdef HAVE_LCD_CHARCELLS |
539 | screens[i].puts(0, 0, str(LANG_SETTINGS_SAVE_PLAYER)); | 539 | screens[i].puts(0, 0, str(LANG_SETTINGS_SAVE_FAILED)); |
540 | screens[i].puts(0, 1, str(LANG_SETTINGS_BATTERY_PLAYER)); | 540 | screens[i].puts(0, 1, str(LANG_SETTINGS_PARTITION)); |
541 | #else | 541 | #else |
542 | screens[i].puts(4, 2, str(LANG_SETTINGS_SAVE_RECORDER)); | 542 | screens[i].puts(4, 2, str(LANG_SETTINGS_SAVE_FAILED)); |
543 | screens[i].puts(2, 4, str(LANG_SETTINGS_BATTERY_RECORDER)); | 543 | screens[i].puts(2, 4, str(LANG_SETTINGS_PARTITION)); |
544 | screens[i].update(); | 544 | screens[i].update(); |
545 | #endif | 545 | #endif |
546 | } | 546 | } |
@@ -575,7 +575,7 @@ bool settings_save_config(int options) | |||
575 | break; | 575 | break; |
576 | } | 576 | } |
577 | else { | 577 | else { |
578 | gui_syncsplash(HZ, str(LANG_MENU_SETTING_CANCEL)); | 578 | gui_syncsplash(HZ, str(LANG_CANCEL)); |
579 | return false; | 579 | return false; |
580 | } | 580 | } |
581 | } | 581 | } |