Index: apps/tagtree.c
===================================================================
--- apps/tagtree.c	(revision 24590)
+++ apps/tagtree.c	(working copy)
@@ -1169,6 +1169,13 @@
         if (total_count++ < offset)
             continue;
         
+        if ( strcmp(tcs.result , UNTAGGED ) == 0)
+            if ( strlen(str(LANG_TAGNAVI_UNTAGGED))+1 <= TAG_MAXLEN )
+            {
+                tcs.result_len = strlen(str(LANG_TAGNAVI_UNTAGGED))+1;
+                strcpy(tcs.result,str(LANG_TAGNAVI_UNTAGGED));
+            }
+        
         dptr->newtable = NAVIBROWSE;
         if (tag == tag_title || tag == tag_filename)
         {
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang	(revision 24590)
+++ apps/lang/english.lang	(working copy)
@@ -13315,3 +13315,17 @@
     lcd_bitmap: "Remote Base Skin"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_TAGNAVI_UNTAGGED
+  desc: "<untagged>" entry in tag browser
+  user: core
+  <source>
+    *: "<Untagged>"
+  </source>
+  <dest>
+    *: "<Untagged>"
+  </dest>
+  <voice>
+    *: "Untagged"
+  </voice>
+</phrase>
Index: apps/lang/portugues.lang
===================================================================
--- apps/lang/portugues.lang	(revision 24590)
+++ apps/lang/portugues.lang	(working copy)
@@ -13209,6 +13209,20 @@
   </voice>
 </phrase>
 <phrase>
+  id: LANG_TAGNAVI_UNTAGGED
+  desc: "<untagged>" entry in tag browser
+  user: core
+  <source>
+    *: "<Untagged>"
+  </source>
+  <dest>
+    *: "<Sem Etiqueta>"
+  </dest>
+  <voice>
+    *: "Sem etiqueta"
+  </voice>
+</phrase>
+<phrase>
   id: LANG_OF
   desc: Shown in WPS: X of Y (tracks)
   user: core
Index: apps/tagcache.c
===================================================================
--- apps/tagcache.c	(revision 24590)
+++ apps/tagcache.c	(working copy)
@@ -95,8 +95,6 @@
 static const char tagcache_thread_name[] = "tagcache";
 #endif
 
-#define UNTAGGED "<Untagged>"
-
 /* Previous path when scanning directory tree recursively. */
 static char curpath[TAG_MAXLEN+32];
 
Index: apps/tagcache.h
===================================================================
--- apps/tagcache.h	(revision 24590)
+++ apps/tagcache.h	(working copy)
@@ -95,6 +95,9 @@
 /* Serialized DB. */
 #define TAGCACHE_STATEFILE       ROCKBOX_DIR "/database_state.tcd"
 
+/* Tag to be used on untagged files. */
+#define UNTAGGED "<Untagged>"
+
 /* Numeric tags (we can use these tags with conditional clauses). */
 #define TAGCACHE_NUMERIC_TAGS ((1LU << tag_year) | (1LU << tag_discnumber) | \
     (1LU << tag_tracknumber) | (1LU << tag_length) | (1LU << tag_bitrate) | \