--- totem-2.16.4/src/totem-time-label.c	2006-03-08 01:10:52.000000000 +0100
+++ totem-2.16.4_modified/src/totem-time-label.c	2007-01-06 17:46:30.000000000 +0100
@@ -80,12 +80,15 @@
 
 		time_str = totem_time_to_string (time);
 		length_str =  totem_time_to_string (length);
-		if (label->priv->seeking == FALSE)
-			/* Elapsed / Total Length */
-			label_str = g_strdup_printf (_("%s / %s"), time_str, length_str);
-		else 
-			/* Seeking to Time / Total Length */
-			label_str = g_strdup_printf (_("Seek to %s / %s"), time_str, length_str);
+        
+		/* make sure time_str has same length as length_str,
+		 * otherwise, the scrollbar changes its length, which can
+		 * be very nasty.
+		 */
+        
+		/* Elapsed / Total Length */
+		label_str = g_strdup_printf (_("%s / %s"), time_str, length_str);   
+
 		g_free (time_str);
 		g_free (length_str);
 	}
--- totem-2.16.4/src/totem-statusbar.c	2006-09-28 12:05:59.000000000 +0200
+++ totem-2.16.4_modified/src/totem-statusbar.c	2007-01-06 17:38:05.000000000 +0100
@@ -182,12 +182,8 @@
     length = totem_time_to_string
 	    (statusbar->length == -1 ? 0 : statusbar->length * 1000);
 
-    if (statusbar->seeking == FALSE)
-      /* Elapsed / Total Length */
-      label = g_strdup_printf (_("%s / %s"), time, length);
-    else
-      /* Seeking to Time / Total Length */
-      label = g_strdup_printf (_("Seek to %s / %s"), time, length);
+    /* Elapsed / Total Length */
+    label = g_strdup_printf (_("%s / %s"), time, length);
 
     g_free (length);
   }
--- totem-2.16.4/src/backend/video-utils.c	2006-05-17 16:49:22.000000000 +0200
+++ totem-2.16.4_modified/src/backend/video-utils.c	2007-01-06 17:33:10.000000000 +0100
@@ -220,7 +220,7 @@
 		 * translate the "long time format|" part. Remove it from
 		 * the translation.
 		 */
-		return g_strdup_printf (Q_("long time format|%d:%02d:%02d"), hour, min, sec);
+		return g_strdup_printf (Q_("long time format|%02d:%02d:%02d"), hour, min, sec);
 	} else {
 		/* minutes:seconds */
 		/* Translators: This is a time format, like "5:02" for 5
@@ -230,7 +230,7 @@
 		 * translate the "short time format|" part. Remove it from
 		 * the translation.
 		 */
-		return g_strdup_printf (Q_("short time format|%d:%02d"), min, sec);
+		return g_strdup_printf (Q_("short time format|%02d:%02d"), min, sec);
 	}
 
 	return NULL;
