diff options
author | Nils Wallménius <nils@rockbox.org> | 2007-08-06 13:08:36 +0000 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2007-08-06 13:08:36 +0000 |
commit | 5b76936a44de3c7ecd568300f26b5e6421901285 (patch) | |
tree | 504d9cf371d8f64c70a7bb40469a3a6f05a1b7cd /apps/tagtree.c | |
parent | d755c283caef258ae5d81278d324f907fcf402c8 (diff) | |
download | rockbox-5b76936a44de3c7ecd568300f26b5e6421901285.tar.gz rockbox-5b76936a44de3c7ecd568300f26b5e6421901285.zip |
Accept FS#6159 'Add voice to roughly 100 splash screens and yes-no menus' by Stephane Doyon with some minor tweaks by me. Rerun 'configure' and do a 'make clean' before rebuilding your voice files.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14213 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tagtree.c')
-rw-r--r-- | apps/tagtree.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/tagtree.c b/apps/tagtree.c index 22b7125701..59fb8c131f 100644 --- a/apps/tagtree.c +++ b/apps/tagtree.c | |||
@@ -690,7 +690,7 @@ bool tagtree_export(void) | |||
690 | gui_syncsplash(0, str(LANG_CREATING)); | 690 | gui_syncsplash(0, str(LANG_CREATING)); |
691 | if (!tagcache_create_changelog(&tcs)) | 691 | if (!tagcache_create_changelog(&tcs)) |
692 | { | 692 | { |
693 | gui_syncsplash(HZ*2, str(LANG_FAILED)); | 693 | gui_syncsplash(HZ*2, ID2P(LANG_FAILED)); |
694 | } | 694 | } |
695 | 695 | ||
696 | return false; | 696 | return false; |
@@ -698,10 +698,10 @@ bool tagtree_export(void) | |||
698 | 698 | ||
699 | bool tagtree_import(void) | 699 | bool tagtree_import(void) |
700 | { | 700 | { |
701 | gui_syncsplash(0, str(LANG_WAIT)); | 701 | gui_syncsplash(0, ID2P(LANG_WAIT)); |
702 | if (!tagcache_import_changelog()) | 702 | if (!tagcache_import_changelog()) |
703 | { | 703 | { |
704 | gui_syncsplash(HZ*2, str(LANG_FAILED)); | 704 | gui_syncsplash(HZ*2, ID2P(LANG_FAILED)); |
705 | } | 705 | } |
706 | 706 | ||
707 | return false; | 707 | return false; |
@@ -1228,7 +1228,7 @@ static int retrieve_entries(struct tree_context *c, struct tagcache_search *tcs, | |||
1228 | 1228 | ||
1229 | if (!sort && (sort_inverse || sort_limit)) | 1229 | if (!sort && (sort_inverse || sort_limit)) |
1230 | { | 1230 | { |
1231 | gui_syncsplash(HZ*4, str(LANG_SHOWDIR_BUFFER_FULL), total_count); | 1231 | gui_syncsplash(HZ*4, ID2P(LANG_SHOWDIR_BUFFER_FULL), total_count); |
1232 | logf("Too small dir buffer"); | 1232 | logf("Too small dir buffer"); |
1233 | return 0; | 1233 | return 0; |
1234 | } | 1234 | } |
@@ -1419,7 +1419,7 @@ int tagtree_enter(struct tree_context* c) | |||
1419 | !global_settings.party_mode && | 1419 | !global_settings.party_mode && |
1420 | playlist_modified(NULL)) | 1420 | playlist_modified(NULL)) |
1421 | { | 1421 | { |
1422 | char *lines[]={str(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; | 1422 | char *lines[]={ID2P(LANG_WARN_ERASEDYNPLAYLIST_PROMPT)}; |
1423 | struct text_message message={lines, 1}; | 1423 | struct text_message message={lines, 1}; |
1424 | 1424 | ||
1425 | if (gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) | 1425 | if (gui_syncyesno_run(&message, NULL, NULL) != YESNO_YES) |
@@ -1496,7 +1496,7 @@ static bool insert_all_playlist(struct tree_context *c, int position, bool queue | |||
1496 | cpu_boost(true); | 1496 | cpu_boost(true); |
1497 | if (!tagcache_search(&tcs, tag_filename)) | 1497 | if (!tagcache_search(&tcs, tag_filename)) |
1498 | { | 1498 | { |
1499 | gui_syncsplash(HZ, str(LANG_TAGCACHE_BUSY)); | 1499 | gui_syncsplash(HZ, ID2P(LANG_TAGCACHE_BUSY)); |
1500 | cpu_boost(false); | 1500 | cpu_boost(false); |
1501 | return false; | 1501 | return false; |
1502 | } | 1502 | } |
@@ -1599,12 +1599,12 @@ bool tagtree_insert_selection_playlist(int position, bool queue) | |||
1599 | } | 1599 | } |
1600 | 1600 | ||
1601 | if (tc->filesindir <= 0) | 1601 | if (tc->filesindir <= 0) |
1602 | gui_syncsplash(HZ, str(LANG_END_PLAYLIST)); | 1602 | gui_syncsplash(HZ, ID2P(LANG_END_PLAYLIST)); |
1603 | else | 1603 | else |
1604 | { | 1604 | { |
1605 | logf("insert_all_playlist"); | 1605 | logf("insert_all_playlist"); |
1606 | if (!insert_all_playlist(tc, position, queue)) | 1606 | if (!insert_all_playlist(tc, position, queue)) |
1607 | gui_syncsplash(HZ*2, str(LANG_FAILED)); | 1607 | gui_syncsplash(HZ*2, ID2P(LANG_FAILED)); |
1608 | } | 1608 | } |
1609 | 1609 | ||
1610 | /* Finally return the dirlevel to its original value. */ | 1610 | /* Finally return the dirlevel to its original value. */ |