Tag cache renamed to the less cryptic "Database" throughout the UI and manual. No functional changes.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11588 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 65 insertions, 65 deletions

diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index a306138356..67cc08a032 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -1694,13 +1694,13 @@
   desc: in settings menu
   user:
   <source>
-    *: "Tag Cache"
+    *: "Database"
   </source>
   <dest>
-    *: "Tag Cache"
+    *: "Database"
   </dest>
   <voice>
-    *: "Tag Cache"
+    *: "Database"
   </voice>
 </phrase>
 <phrase>
@@ -1764,10 +1764,10 @@
   desc: while initializing tagcache on boot
   user:
   <source>
-    *: "Committing tagcache"
+    *: "Committing database"
   </source>
   <dest>
-    *: "Committing tagcache"
+    *: "Committing database"
   </dest>
   <voice>
     *: ""
@@ -1960,13 +1960,13 @@
   desc: show ID3 Database
   user:
   <source>
-    *: "ID3 Database"
+    *: "Database"
   </source>
   <dest>
-    *: "ID3 Database"
+    *: "Database"
   </dest>
   <voice>
-    *: "ID3 Database"
+    *: "Database"
   </voice>
 </phrase>
 <phrase>
@@ -8543,13 +8543,13 @@
   id: LANG_TAGCACHE_BUSY
   desc: when trying to shutdown and tagcache is committing
   <source>
-    *: "Tagcache is not ready"
+    *: "Database is not ready"
   </source>
   <dest>
-    *: "Tagcache is not ready"
+    *: "Database is not ready"
   </dest>
   <voice>
-    *: "Tagcache is not ready"
+    *: "Database is not ready"
   </voice>
 </phrase>
 <phrase>
diff --git a/apps/tagcache.h b/apps/tagcache.h
index 281f3b86a2..4194851aab 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -64,11 +64,11 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
 #define TAGCACHE_MAX_CLAUSES 32
 
 /* Tag database files. */
-#define TAGCACHE_FILE_TEMP       ROCKBOX_DIR "/tagcache_tmp.tcd"
-#define TAGCACHE_FILE_MASTER     ROCKBOX_DIR "/tagcache_idx.tcd"
-#define TAGCACHE_FILE_INDEX      ROCKBOX_DIR "/tagcache_%d.tcd"
-#define TAGCACHE_FILE_CHANGELOG  ROCKBOX_DIR "/tagcache_changelog.txt"
-#define TAGCACHE_STATEFILE       ROCKBOX_DIR "/tagcache_state.tcd"
+#define TAGCACHE_FILE_TEMP       ROCKBOX_DIR "/database_tmp.tcd"
+#define TAGCACHE_FILE_MASTER     ROCKBOX_DIR "/database_idx.tcd"
+#define TAGCACHE_FILE_INDEX      ROCKBOX_DIR "/database_%d.tcd"
+#define TAGCACHE_FILE_CHANGELOG  ROCKBOX_DIR "/database_changelog.txt"
+#define TAGCACHE_STATEFILE       ROCKBOX_DIR "/database_state.tcd"
 
 /* Flags */
 #define FLAG_DELETED    0x0001  /* Entry has been removed from db */
diff --git a/manual/configure_rockbox/file_view.tex b/manual/configure_rockbox/file_view.tex
index 77ce87ca5b..98a47854c7 100755
--- a/manual/configure_rockbox/file_view.tex
+++ b/manual/configure_rockbox/file_view.tex
@@ -36,11 +36,11 @@ displays files.
     hidden.
   \item[Playlists:] The \setting{File Browser} displays only directories and playlists,
     for simplified navigation.
-  \item[ID3 Database:] This shows the files based on the \setting{Tag Cache}
+  \item[Database:] This shows the files based on the \setting{Database}
     information, thus disabling the \setting{File Browser}. You can browse the
     database by various tags and search them. Only information present
     in music file tags are shown. For a detailed description of
-    \setting{Tag Cache} refer to \reference{ref:tagcache}.
+    \setting{Database} refer to \reference{ref:database}.
 
   \end{description}
   
@@ -64,8 +64,8 @@ displays files.
   If set to \setting{Current Directory Only} only the name of the current
   directory will be displayed.
 
-\item[Tag Cache:]
-  This option allows you to configure the Tag Cache.
-  See \reference{ref:tagcache} for more information about using
-  the Tag Cache.
+\item[Database:]
+  This option allows you to configure the database.
+  See \reference{ref:database} for more information about using
+  the database.
 \end{description}
diff --git a/manual/getting_started/installation.tex b/manual/getting_started/installation.tex
index 38cd0543b3..0af9ccfe05 100644
--- a/manual/getting_started/installation.tex
+++ b/manual/getting_started/installation.tex
@@ -221,8 +221,8 @@ use.
     your player using Itunes, you will not be able to see your music because
     Itunes changes your files' names and hides them in directories in the 
     \fname{Ipod\_Control} folder. You can view files placed on your \dap{} by 
-    Itunes by initialising and using Rockbox's Tag Cache. See 
-    \reference{ref:tagcache} for more information. 
+    Itunes by initialising and using Rockbox's database. See 
+    \reference{ref:database} for more information. 
   } 
 }
 
diff --git a/manual/rockbox_interface/main.tex b/manual/rockbox_interface/main.tex
index dddcef0d9e..c64cc82ec7 100644
--- a/manual/rockbox_interface/main.tex
+++ b/manual/rockbox_interface/main.tex
@@ -148,8 +148,8 @@ audio files to it.
 When you have files on your \dap{} you'll see the supported ones now. Of
 course you can change this view later. You can also completely switch to
 a view that is based on the meta-data\footnote{ID3 Tags, Vorbis comments, etc.}
-of your audio files. This view is called Tag Cache (see
-\reference{ref:tagcache}). Now you can start browsing the folder structure of
+of your audio files. This view is called Database (see
+\reference{ref:database}). Now you can start browsing the folder structure of
 your \dap{}.
 
 \subsection{Basic controls}
@@ -223,4 +223,4 @@ garbled.}
 \fixme{include an overview of the menu structure here}
 %\input{rockbox_interface/menu_structure.tex}
 
-\input{rockbox_interface/playback.tex}
\ No newline at end of file
+\input{rockbox_interface/playback.tex}
diff --git a/manual/rockbox_interface/playback.tex b/manual/rockbox_interface/playback.tex
index b4a3faa72b..ba49204ea2 100644
--- a/manual/rockbox_interface/playback.tex
+++ b/manual/rockbox_interface/playback.tex
@@ -7,20 +7,20 @@ Rockbox lets you browse your music in either of two ways. The
 your \dap, entering folders and executing the default action on each file.
 To help differentiate files, each file format is displayed with an icon. 
 
-The \setting{Tag Cache Browser}, on the other hand, allows you to navigate 
+The \setting{Database Browser}, on the other hand, allows you to navigate 
 through the music on your player using categories like album, artist, genre,
 etc.
 
 You can select whether to browse using the \setting{File Browser} or the 
-\setting{Tag Cache Browser} by adjusting the \setting{Show Files} setting.  
+\setting{Database Browser} by adjusting the \setting{Show Files} setting.  
 If you choose the \setting{File Browser}, the \setting{Show Files} setting also
 lets you select what types of files you wish to view.  See 
 \reference{ref:ShowFiles} for more information on the \setting{Show Files}
 setting.
 
 \note{The \setting{File Browser} allows you to manipulate your files in ways
-that are not available within the \setting{Tag Cache Browser}. Read more about
-\setting{Tag Cache} in \reference{ref:tagcache}.  The remainder of this section
+that are not available within the \setting{Database Browser}. Read more about
+\setting{Database} in \reference{ref:database}.  The remainder of this section
 deals with the \setting{File Browser}.}
 
 \opt{ondio}{
@@ -307,4 +307,4 @@ This is the virtual keyboard that is used when entering file names in Rockbox.
 \input{rockbox_interface/wps.tex}
 
 %Include playlist section
-\input{working_with_playlists/main.tex}
\ No newline at end of file
+\input{working_with_playlists/main.tex}
diff --git a/manual/rockbox_interface/tagcache.tex b/manual/rockbox_interface/tagcache.tex
index 08c5ef2f67..fc68f9d85e 100644
--- a/manual/rockbox_interface/tagcache.tex
+++ b/manual/rockbox_interface/tagcache.tex
@@ -1,38 +1,38 @@
 % $Id$ %
-\section{\label{ref:tagcache}Tag Cache}
+\section{\label{ref:database}Database}
 
 \subsection{Introduction}
-Tag Cache is the Rockbox music database system. Using the information
+This chapter describes the Rockbox music database system. Using the information
 contained in the tags (ID3v1, ID3v2%
   \opt{SWCODEC}{, Vorbis Comments, Apev2, etc.}%
 ) in your audio files, Rockbox builds and maintains a database of the music
 files on your player and allows you to browse them by Artist, Album and Genre.
 
-\subsection{Initialising the Tag Cache}
-Before you use the Tag Cache for the first time, you must initialise it by using
-the \setting{Initialize Now} function in the \setting{Tag Cache Menu}
-(\setting{General Settings $\rightarrow$ File View $\rightarrow$ Tag Cache})
+\subsection{Initialising the database}
+Before you use the database for the first time, you must initialise it by using
+the \setting{Initialize Now} function in the \setting{Database Menu}
+(\setting{General Settings $\rightarrow$ File View $\rightarrow$ Database})
 , which is described in the following section.
 
-\subsection{\label{ref:tagcachemenu}The Tag Cache Menu}
+\subsection{\label{ref:databasemenu}The Database Menu}
 
 \begin{description}
   \opt{SWCODEC}{
   \item[Load To Ram.]
-    The Tag Cache database can either be kept on disk (to save memory), or
+    The database can either be kept on disk (to save memory), or
     loaded into RAM (for fast browsing). Setting this to \setting{Yes} loads
-    the Tag Cache to RAM, allowing faster browsing and searching. Setting this
-    option to \setting{No} keeps the Tag Cache on the disk, meaning slower 
+    the database to RAM, allowing faster browsing and searching. Setting this
+    option to \setting{No} keeps the database on the disk, meaning slower 
     browsing but it does not use extra RAM and saves some battery on boot up. 
     
-    \note{If you browse your music frequently using Tag Cache, you should load
-      to RAM, as this will reduce the overall battery consumption because the
-      disk will not need to spin on each search.}
+    \note{If you browse your music frequently using the database, you should
+      load to RAM, as this will reduce the overall battery consumption because
+      the disk will not need to spin on each search.}
   }
   
 \item[Auto Update.]
   If \setting{Auto update} is set to \setting{on}, each time the \dap{}
-  boots, Tag Cache will automatically update the database.
+  boots, the database will automatically be updated.
   \opt{SWCODEC}{
     \note{The \setting{Auto Update} will only check for deleted files if the
       \setting{Directory Cache} (\setting{General Settings $\rightarrow$
@@ -44,22 +44,22 @@ the \setting{Initialize Now} function in the \setting{Tag Cache Menu}
     deleted files from the database you need to run \setting{Update Now}.}%
 
 \item[Initialize Now.]
-  Before you use the Tag Cache for the first time, you must Initialize it by
-  using the \setting{Initialize Now} function in the \setting{Tag Cache
+  Before you use the database for the first time, you must Initialize it by
+  using the \setting{Initialize Now} function in the \setting{Database
     Menu}.
   \warn{\setting{Initialize Now} removes all database files (removing
     runtimedb data also) and rebuilds the database from scratch.}
   This can take quite a while depending on the number of music files on your
   \dap{}, and may require a restart to allow the files to be committed to the
-  cache.
+  database.
 
-  The Tag Cache initialisation happens in the background, so you can continue
-  to listen to music while the Tag Cache is being initialised. If you shut
+  The database initialisation happens in the background, so you can continue
+  to listen to music while the database is being initialised. If you shut
   down your player during initialisation, the database building process will
   continue next time you turn it on.
   
 \item[Update Now.]
-  \setting{Update now} causes Tag Cache to detect new and deleted files
+  \setting{Update now} causes the database to detect new and deleted files
   \opt{SWCODEC}{
     \note{Unlike the \setting{Auto Update} function, \setting{Update Now}
       will update the database regardless of whether the \setting{Directory Cache}
@@ -76,31 +76,31 @@ the \setting{Initialize Now} function in the \setting{Tag Cache Menu}
   
 \item[Export modifications.]
   This allows for the runtime data to be exported into \\
-  \fname{/.rockbox/tagcache\_changelog.txt}, which backs up the runtime data in
-  ASCII format. This is needed when Tag Cache structures change, because new
-  code cannot read old Tag Cache database code. But, all modifications
-  exported to ASCII format should be readable by all Tag Cache versions.
+  \fname{/.rockbox/database\_changelog.txt}, which backs up the runtime data in
+  ASCII format. This is needed when database structures change, because new
+  code cannot read old database code. But, all modifications
+  exported to ASCII format should be readable by all database versions.
   
 \item[Import modifications.]
-  Allows the \fname{/.rockbox/tagcache\_changelog.txt} backup to be 
-  conveniently loaded into the Tag Cache. This is performed automatically when
-  the Tag Cache is initialised.
+  Allows the \fname{/.rockbox/database\_changelog.txt} backup to be 
+  conveniently loaded into the database. This is performed automatically when
+  the database is initialised.
   
 \end{description}
 
-\subsection{Using the Tag Cache}
-Once the Tag Cache has been initialised, you can browse your music by Artist, 
-Album, Genre and Song Name. To use the Tag Cache, change the 
+\subsection{Using the database}
+Once the database has been initialised, you can browse your music by Artist, 
+Album, Genre and Song Name. To use the database, change the 
 \setting{Show Files} show mode by changing the \setting{General Settings 
 $\rightarrow$ File View $\rightarrow$ Show files} option to 
-\setting{ID3 database}. This disables the \setting{File Browser} and instead
-allows you to view files using the information in the Tag Cache database.\\
+\setting{Database}. This disables the \setting{File Browser} and instead
+allows you to view files using the information in the database.\\
 
 \note{You may need to increase the value of the \setting{Max files in dir 
 browser} setting (\setting{General Settings $\rightarrow$ System $\rightarrow$ 
 Limits}) in order to view long lists of tracks in the ID3 database browser.\\
 
-There is no option to turn off Tag Cache completely. If you do not want
+There is no option to turn off database completely. If you do not want
 to use it just don't do the initial build of the database and do not load it
 to RAM.}
 %