1 files changed, 11 insertions, 8 deletions
diff --git a/constants.py b/constants.py
index 3430e39..29f674c 100644
--- a/constants.py
+++ b/constants.py
@@ -2,6 +2,7 @@
 import os
 import gtk
 from gettext import gettext as gt
+from gettext import ngettext
 import hippo
 
 import sugar.graphics.style
@@ -15,6 +16,15 @@ import cairo
 import pango
 import pangocairo
 
+
+def istrMinutes(x):
+    return ngettext('%(1)s minute', '%(1)s minutes', int(x)) % {'1': int(x)}
+
+
+def istrSeconds(x):
+    return ngettext('%(1)s second', '%(1)s seconds', int(x)) % {'1': int(x)}
+
+
 class Constants:
 
     VERSION = 54
@@ -125,19 +135,12 @@ class Constants:
     istrTags = _('Tags:')
     istrSaving = _('Saving')
     istrFinishedRecording = _("Finished recording")
-    istrHoursMinutesSecondsRemaining = _("%(1)s hours, %(2)s minutes, %(3)s seconds remaining")
-    istrMinutesSecondsRemaining = _("%(1)s minutes, %(2)s seconds remaining")
-    istrHoursRemaining = _("%(1)s hours remaining")
-    istrMinutesRemaining = _("%(1)s minutes remaining")
-    istrSecondsRemaining = _("%(1)s seconds remaining")
-    istrHours = _("%(1)s hours")
-    istrMinutes = _("%(1)s minutes")
-    istrSeconds = _("%(1)s seconds")
     istrRemove = _("Remove")
     istrStoppedRecording = _("Stopped recording")
     istrCopyToClipboard = _("Copy to clipboard")
     istrTimer = _("Timer:")
     istrDuration = _("Duration:")
+    istrRemaining = _("Remaining:")
     istrNow = _("Immediate")
     istrPlay = _("Play")
     istrPause = _("Pause")