Shrink progress text so that it fits better on 4:3 screens.

diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc
index 23a46d06dddcb7875a9247911d387028a0da802e..c7102879413b7f3a3a628a9596557c68b14b7aa0 100644 (file)
--- a/src/lib/transcode_job.cc
+++ b/src/lib/transcode_job.cc
@@ -95,7 +95,8 @@ TranscodeJob::status () const
        s << Job::status ();
 
        if (!finished () && !_transcoder->finishing ()) {
-               s << "; " << fixed << setprecision (1) << fps << " " << _("frames per second");
+               /* TRANSLATORS: fps here is an abbreviation for frames per second */
+               s << "; " << fixed << setprecision (1) << fps << " " << _("fps");
        }
        
        return s.str ();

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 7a0f1a17aec65008bf2eea3585d0bebb5cf283c9..728e7d048199f08652329b078e214039e244bbc1 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -156,14 +156,11 @@ seconds_to_approximate_hms (int s)
 
        if (hours) {
                if (m > 30 && !minutes) {
-                       ap << (h + 1) << N_(" ") << _("hours");
+                       /* TRANSLATORS: h here is an abbreviation for hours */
+                       ap << (h + 1) << _("h");
                } else {
-                       ap << h << N_(" ");
-                       if (h == 1) {
-                               ap << _("hour");
-                       } else {
-                               ap << _("hours");
-                       }
+                       /* TRANSLATORS: h here is an abbreviation for hours */
+                       ap << h << _("h");
                }
 
                if (minutes | seconds) {
@@ -174,14 +171,11 @@ seconds_to_approximate_hms (int s)
        if (minutes) {
                /* Minutes */
                if (s > 30 && !seconds) {
-                       ap << (m + 1) << N_(" ") << _("minutes");
+                       /* TRANSLATORS: m here is an abbreviation for minutes */
+                       ap << (m + 1) << _("m");
                } else {
-                       ap << m << N_(" ");
-                       if (m == 1) {
-                               ap << _("minute");
-                       } else {
-                               ap << _("minutes");
-                       }
+                       /* TRANSLATORS: m here is an abbreviation for minutes */
+                       ap << m << _("m");
                }
 
                if (seconds) {
@@ -191,12 +185,8 @@ seconds_to_approximate_hms (int s)
 
        if (seconds) {
                /* Seconds */
-               ap << s << N_(" ");
-               if (s == 1) {
-                       ap << _("second");
-               } else {
-                       ap << _("seconds");
-               }
+               /* TRANSLATORS: s here is an abbreviation for seconds */
+               ap << s << _("s");
        }
 
        return ap.str ();