Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0

4 files changed, 27 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 ();
diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 23b531b47..53ed98799 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -339,6 +339,7 @@ ContentPanel::set_film (shared_ptr<Film> f)
 	_film = f;
 
 	film_changed (Film::CONTENT);
+	film_changed (Film::AUDIO_CHANNELS);
 	selection_changed ();
 }
 
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 497d138ca..a5f3417a2 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -133,6 +133,20 @@ HintsDialog::film_changed ()
 		_text->Newline ();
 	}
 
+	int three_d = 0;
+	for (ContentList::const_iterator i = content.begin(); i != content.end(); ++i) {
+		shared_ptr<const VideoContent> vc = dynamic_pointer_cast<const VideoContent> (*i);
+		if (vc && vc->video_frame_type() != VIDEO_FRAME_TYPE_2D) {
+			++three_d;
+		}
+	}
+
+	if (three_d > 0) {
+		hint = true;
+		_text->WriteText (_("You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if you want to play it back on a 3D system (e.g.\ Real-D, MasterImage etc.)"));
+		_text->Newline ();
+	}
+
 	_text->EndSymbolBullet ();
 
 	if (!hint) {