diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-07 13:35:34 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-07 13:35:34 +0000 |
| commit | 6c9cbc74a656257e5cd7f1901439dd22256faf96 (patch) | |
| tree | 1ae338b70be364decc13fd451548459a04b3e43e /src/lib | |
| parent | 8b4a53492c593fe5777138da781579ce9bc6e154 (diff) | |
| parent | 330903522f2454744f2c45ae2fd255d120b2a102 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/transcode_job.cc | 3 | ||||
| -rw-r--r-- | src/lib/util.cc | 30 |
2 files changed, 12 insertions, 21 deletions
diff --git a/src/lib/transcode_job.cc b/src/lib/transcode_job.cc index 23a46d06d..c71028794 100644 --- 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 7a0f1a17a..728e7d048 100644 --- 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 (); |