=== modified file 'src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs'
--- src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs	2008-09-19 01:27:19 +0000
+++ src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellDiscAndCount.cs	2009-02-27 01:11:00 +0000
@@ -37,7 +37,7 @@
     public class ColumnCellDiscAndCount : ColumnCellText
     {
         // Translators: this is {disc number} of {disc count}
-        private static string format = Catalog.GetString ("{0} of {1}");
+        private static readonly string format = Catalog.GetString ("{0} of {1}");
 
         public ColumnCellDiscAndCount (string property, bool expand) : base (property, expand)
         {
@@ -49,11 +49,11 @@
         protected override string GetText (object obj)
         {
             Banshee.Collection.TrackInfo track = BoundObjectParent as Banshee.Collection.TrackInfo;
-            if (track == null) {
+            if (track == null || track.DiscNumber == 0) {
                 return String.Empty;
             }
-
-            return String.Format (format, track.DiscNumber, track.DiscCount);
+            return String.Format (track.DiscCount == 0? "{0}" : format,
+                                  track.DiscNumber, track.DiscCount);
         }
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs'
--- src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs	2008-09-19 01:27:19 +0000
+++ src/Core/Banshee.ThickClient/Banshee.Collection.Gui/ColumnCellTrackAndCount.cs	2009-02-27 01:10:46 +0000
@@ -37,7 +37,7 @@
     public class ColumnCellTrackAndCount : ColumnCellText
     {
         // Translators: this is {track number} of {track count}
-        private static string format = Catalog.GetString ("{0} of {1}");
+        private static readonly string format = Catalog.GetString ("{0} of {1}");
 
         public ColumnCellTrackAndCount (string property, bool expand) : base (property, expand)
         {
@@ -49,11 +49,11 @@
         protected override string GetText (object obj)
         {
             Banshee.Collection.TrackInfo track = BoundObjectParent as Banshee.Collection.TrackInfo;
-            if (track == null) {
+            if (track == null || track.TrackNumber == 0) {
                 return String.Empty;
             }
-
-            return String.Format (format, track.TrackNumber, track.TrackCount);
+            return String.Format (track.TrackCount == 0? "{0}" : format,
+                                  track.TrackNumber, track.TrackCount);
         }
     }
-}
\ No newline at end of file
+}

