5 files changed, 37 insertions, 3 deletions
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index 4a4fb2c73a..1b386a5c90 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -13731,4 +13731,17 @@
     gigabeats: "3-D Enhancement"
   </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>
diff --git a/apps/lang/portugues.lang b/apps/lang/portugues.lang
index 2f76e4881f..0006512881 100644
--- a/apps/lang/portugues.lang
+++ b/apps/lang/portugues.lang
@@ -13214,6 +13214,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
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 29c00ae311..affa75db05 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -95,8 +95,6 @@ static long tagcache_stack[(DEFAULT_STACK_SIZE + 0x4000)/sizeof(long)];
 static const char tagcache_thread_name[] = "tagcache";
 #endif
 
-#define UNTAGGED "<Untagged>"
-
 /* Previous path when scanning directory tree recursively. */
 static char curpath[TAG_MAXLEN+32];
 
diff --git a/apps/tagcache.h b/apps/tagcache.h
index 1488c3bd39..15b4251ddc 100644
--- a/apps/tagcache.h
+++ b/apps/tagcache.h
@@ -95,6 +95,9 @@ enum tag_type { tag_artist = 0, tag_album, tag_genre, tag_title,
 /* 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) | \
diff --git a/apps/tagtree.c b/apps/tagtree.c
index 3b13df06ab..8c7f7a2e5d 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -1169,6 +1169,12 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
         if (total_count++ < offset)
             continue;
         
+        if ( strcmp(tcs.result , UNTAGGED ) == 0)
+        {
+            tcs.result_len = strlcpy(tcs.result, 
+                                     str(LANG_TAGNAVI_UNTAGGED), TAG_MAXLEN )+1;
+        }
+        
         dptr->newtable = NAVIBROWSE;
         if (tag == tag_title || tag == tag_filename)
         {