Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

25 files changed, 347 insertions, 347 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index e5fd9d17a..6ae850bff 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -129,7 +129,7 @@ Config::set_defaults ()
 	for (int i = 0; i < NAG_COUNT; ++i) {
 		_nagged[i] = false;
 	}
-	_sound = false;
+	_sound = true;
 	_sound_output = optional<string> ();
 	_last_kdm_write_type = KDM_WRITE_FLAT;
 
@@ -368,7 +368,7 @@ try
 		}
 	}
 	/* The variable was renamed but not the XML tag */
-	_sound = f.optional_bool_child("PreviewSound").get_value_or (false);
+	_sound = f.optional_bool_child("PreviewSound").get_value_or (true);
 	_sound_output = f.optional_string_child("PreviewSoundOutput");
 	if (f.optional_string_child("CoverSheet")) {
 		_cover_sheet = f.optional_string_child("CoverSheet").get();
diff --git a/src/lib/dcpomatic_time.h b/src/lib/dcpomatic_time.h
index 204af3c1e..3d792467b 100644
--- a/src/lib/dcpomatic_time.h
+++ b/src/lib/dcpomatic_time.h
@@ -125,6 +125,10 @@ public:
 		return Time<S, O> (llrint (HZ * frames_floor(r) / r));
 	}
 
+	Time<S, O> round (double r) const {
+		return Time<S, O> (llrint (HZ * frames_round(r) / r));
+	}
+
 	double seconds () const {
 		return double (_t) / HZ;
 	}
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 361daa8b6..386f456b5 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -1520,42 +1520,6 @@ Film::content_summary (DCPTimePeriod period) const
 	return _playlist->content_summary (period);
 }
 
-list<string>
-Film::fix_conflicting_settings ()
-{
-	list<string> notes;
-
-	list<boost::filesystem::path> was_referencing;
-	BOOST_FOREACH (shared_ptr<Content> i, content()) {
-		shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (i);
-		if (d) {
-			list<string> reasons;
-			bool was = false;
-			if (!d->can_reference_video(reasons) && d->reference_video()) {
-				d->set_reference_video (false);
-				was = true;
-			}
-			if (!d->can_reference_audio(reasons) && d->reference_audio()) {
-				d->set_reference_audio (false);
-				was = true;
-			}
-			if (!d->can_reference_subtitle(reasons) && d->reference_subtitle()) {
-				d->set_reference_subtitle (false);
-				was = true;
-			}
-			if (was) {
-				was_referencing.push_back (d->path(0).parent_path().filename());
-			}
-		}
-	}
-
-	BOOST_FOREACH (boost::filesystem::path d, was_referencing) {
-		notes.push_back (String::compose (_("The DCP %1 was being referred to by this film.  This not now possible because the reel sizes in the film no longer agree with those in the imported DCP.\n\nSetting the 'Reel type' to 'split by video content' will probably help.\n\nAfter doing that you would need to re-tick the appropriate 'refer to existing DCP' checkboxes."), d.string()));
-	}
-
-	return notes;
-}
-
 void
 Film::use_template (string name)
 {
@@ -1590,3 +1554,29 @@ Film::copy_from (shared_ptr<const Film> film)
 {
 	read_metadata (film->file (metadata_file));
 }
+
+bool
+Film::references_dcp_video () const
+{
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
+		shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+		if (d && d->reference_video()) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool
+Film::references_dcp_audio () const
+{
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
+		shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+		if (d && d->reference_audio()) {
+			return true;
+		}
+	}
+
+	return false;
+}
diff --git a/src/lib/film.h b/src/lib/film.h
index 0aa3dab3f..a1dfc6094 100644
--- a/src/lib/film.h
+++ b/src/lib/film.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -165,7 +165,8 @@ public:
 
 	std::string content_summary (DCPTimePeriod period) const;
 
-	std::list<std::string> fix_conflicting_settings ();
+	bool references_dcp_video () const;
+	bool references_dcp_audio () const;
 
 	/** Identifiers for the parts of our state;
 	    used for signalling changes.
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 522b8304f..ec7a93dac 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -595,6 +595,14 @@ Player::pass ()
 	case SILENT:
 	{
 		DCPTimePeriod period (_silent.period_at_position());
+		if (_last_audio_time) {
+			/* Sometimes the thing that happened last finishes fractionally before
+			   this silence.  Bodge the start time of the silence to fix it.  I'm
+			   not sure if this is the right solution --- maybe the last thing should
+			   be padded `forward' rather than this thing padding `back'.
+			*/
+			period.from = min(period.from, *_last_audio_time);
+		}
 		if (period.duration() > one_video_frame()) {
 			period.to = period.from + one_video_frame();
 		}
@@ -650,7 +658,9 @@ Player::subtitles_for_frame (DCPTime time) const
 {
 	list<PositionImage> subtitles;
 
-	BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, _film->video_frame_rate())),  _always_burn_subtitles)) {
+	int const vfr = _film->video_frame_rate();
+
+	BOOST_FOREACH (PlayerSubtitles i, _active_subtitles.get_burnt (DCPTimePeriod(time, time + DCPTime::from_frames(1, vfr)), _always_burn_subtitles)) {
 
 		/* Image subtitles */
 		list<PositionImage> c = transform_image_subtitles (i.image);
@@ -658,7 +668,7 @@ Player::subtitles_for_frame (DCPTime time) const
 
 		/* Text subtitles (rendered to an image) */
 		if (!i.text.empty ()) {
-			list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time);
+			list<PositionImage> s = render_subtitles (i.text, i.fonts, _video_container_size, time, vfr);
 			copy (s.begin(), s.end(), back_inserter (subtitles));
 		}
 	}
@@ -707,8 +717,9 @@ Player::video (weak_ptr<Piece> wp, ContentVideo video)
 			}
 			while (j < time || eyes != video.eyes) {
 				if (last != _last_video.end()) {
-					last->second->set_eyes (eyes);
-					emit_video (last->second, j);
+					shared_ptr<PlayerVideo> copy = last->second->shallow_copy();
+					copy->set_eyes (eyes);
+					emit_video (copy, j);
 				} else {
 					emit_video (black_player_video_frame(eyes), j);
 				}
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index d3f09947e..8ff008b39 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -258,3 +258,21 @@ PlayerVideo::memory_used () const
 {
 	return _in->memory_used();
 }
+
+/** @return Shallow copy of this; _in and _subtitle are shared between the original and the copy */
+shared_ptr<PlayerVideo>
+PlayerVideo::shallow_copy () const
+{
+	return shared_ptr<PlayerVideo>(
+		new PlayerVideo(
+			_in,
+			_crop,
+			_fade,
+			_inter_size,
+			_out_size,
+			_eyes,
+			_part,
+			_colour_conversion
+			)
+		);
+}
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index fe7ae384e..a6e39d66e 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -55,6 +55,8 @@ public:
 
 	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>);
 
+	boost::shared_ptr<PlayerVideo> shallow_copy () const;
+
 	void set_subtitle (PositionImage);
 
 	void prepare ();
diff --git a/src/lib/po/cs_CZ.po b/src/lib/po/cs_CZ.po
index 468b84c31..7ce796a31 100644
--- a/src/lib/po/cs_CZ.po
+++ b/src/lib/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2018-01-11 15:23+0100\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
@@ -1062,22 +1062,6 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Text titulků"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"DCP% 1 byl uvedený v tomto filmu. Toto není možné z důvodu velikosti reelu "
-"ve filmu, protože nesouhlasí s údaji v importovaném DCP. Nastavení 'Reel "
-"type' na 'rozdělit podle video obsahu' vám pravděpodobně pomůže. Poté budete "
-"muset znovu zaškrtnout příslušný checkboxes \"odkaz na existující DCP '."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "DCP nemá zvuk ve všech reeloch."
@@ -1495,6 +1479,22 @@ msgstr "video snímky"
 msgid "you must add some content to the DCP before creating it"
 msgstr "musíte přidat obsah do DCP před tím než ho vytvoříte"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "DCP% 1 byl uvedený v tomto filmu. Toto není možné z důvodu velikosti "
+#~ "reelu ve filmu, protože nesouhlasí s údaji v importovaném DCP. Nastavení "
+#~ "'Reel type' na 'rozdělit podle video obsahu' vám pravděpodobně pomůže. "
+#~ "Poté budete muset znovu zaškrtnout příslušný checkboxes \"odkaz na "
+#~ "existující DCP '."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Nemohu najít formát pixelu pro video."
 
diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index bac5675a8..8778f789b 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2017-10-04 21:45+0200\n"
 "Last-Translator: FULL NAME &lt;EMAIL@ADDRESS&gt;\n"
 "Language-Team: LANGUAGE &lt;LL@li.org&gt;\n"
@@ -1080,27 +1080,6 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Teks"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Denne film havde en reference til DCPen %1. Dette er ikke længere muligt, da "
-"filmens spolestørrelse ikke længere er i overensstemmelse med den "
-"importerede DCP.\n"
-"\n"
-"Det vil formodentlig hjælpe at sætte 'Spole type' til 'opdel efter "
-"videoindhold'.\n"
-"\n"
-"Derefter er det nødvendigt at genstille de passende 'Referer til existerende "
-"DCP' checkboxe."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "DCPen har ikke lyd på alle spoler."
@@ -1517,6 +1496,26 @@ msgstr "videobilleder"
 msgid "you must add some content to the DCP before creating it"
 msgstr "du er nødt til at tilføje indhold til DCP'en før du kan danne den"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Denne film havde en reference til DCPen %1. Dette er ikke længere muligt, "
+#~ "da filmens spolestørrelse ikke længere er i overensstemmelse med den "
+#~ "importerede DCP.\n"
+#~ "\n"
+#~ "Det vil formodentlig hjælpe at sætte 'Spole type' til 'opdel efter "
+#~ "videoindhold'.\n"
+#~ "\n"
+#~ "Derefter er det nødvendigt at genstille de passende 'Referer til "
+#~ "existerende DCP' checkboxe."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Kunne ikke finde information om pixel format til video."
 
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 6977abcf5..e6cf28b1c 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2018-01-13 20:21+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: DCP-o-matic translators\n"
@@ -1093,27 +1093,6 @@ msgstr "Test - TST"
 msgid "Text subtitles"
 msgstr "Untertitel (Text)"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Das DCP %1 wird in diesem Projekt eingebunden. Dies ist so nicht umsetzbar, "
-"weil die im Projekt eingestellen Aktgrößen ('reel size') nicht mit denen des "
-"eingebundenen DCPs übereinstimmen. Eine Überlagerung unterschiedlicher "
-"Aktgrößen ist nicht möglich.\n"
-"\n"
-"Wenn Sie jedoch bei Aktaufteilung 'An Inhaltsgrenzen aufteilen' auswählen, "
-"werden die Aktgrößen des referenzierten DCPs übernommen.\n"
-"\n"
-"Danach müssen Sie erneut 'Aus bestehendem DCP einbinden' auswählen."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "Das DCP enthält in einigen Akten ('Reels') keinen Ton."
@@ -1562,6 +1541,26 @@ msgstr "Video Bilder"
 msgid "you must add some content to the DCP before creating it"
 msgstr "Sie müssen erst Inhalte hinzufügen bevor Sie ein DCP erstellen können!"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Das DCP %1 wird in diesem Projekt eingebunden. Dies ist so nicht "
+#~ "umsetzbar, weil die im Projekt eingestellen Aktgrößen ('reel size') nicht "
+#~ "mit denen des eingebundenen DCPs übereinstimmen. Eine Überlagerung "
+#~ "unterschiedlicher Aktgrößen ist nicht möglich.\n"
+#~ "\n"
+#~ "Wenn Sie jedoch bei Aktaufteilung 'An Inhaltsgrenzen aufteilen' "
+#~ "auswählen, werden die Aktgrößen des referenzierten DCPs übernommen.\n"
+#~ "\n"
+#~ "Danach müssen Sie erneut 'Aus bestehendem DCP einbinden' auswählen."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Kein Pixelformat erkannt"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 430993f8f..c373f6faf 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2017-08-25 23:10-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -1069,26 +1069,6 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Subtítulos de texto"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"El DCP %1 se utilizaba como referencia para esta película.  Esto ya no es "
-"posible porque el tamaño de las bobinas no coincide con los del DCP "
-"referenciado.\n"
-"\n"
-"Seleccionar el 'Tipo de bobina' a 'Dividir por contenido' puede ayudar.\n"
-"\n"
-"Después de hacerlo tendrá que volver a marcar la casilla 'Refenciar a un DCP "
-"existente'."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "El DCP no tiene sonido en todas las bobinas."
@@ -1504,6 +1484,25 @@ msgstr "fotogramas"
 msgid "you must add some content to the DCP before creating it"
 msgstr "tiene que añadir contenido al DCP antes de crearlo"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "El DCP %1 se utilizaba como referencia para esta película.  Esto ya no es "
+#~ "posible porque el tamaño de las bobinas no coincide con los del DCP "
+#~ "referenciado.\n"
+#~ "\n"
+#~ "Seleccionar el 'Tipo de bobina' a 'Dividir por contenido' puede ayudar.\n"
+#~ "\n"
+#~ "Después de hacerlo tendrá que volver a marcar la casilla 'Refenciar a un "
+#~ "DCP existente'."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "No se pudo encontrar el formato de los píxeles del vídeo."
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 8ab7d133a..8b6df9ea9 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2017-11-07 23:35+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -1078,26 +1078,6 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Sous-titres textes"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Le DCP %1 se régérait à ce film.  Ce n'est plus possible désormais puisque "
-"la taille de la bobine du film ne correspond plus à celle importée dans le "
-"DCP.\n"
-"\n"
-"Régler le type de bobine sur 'découper par contenu vidéo' peut aider.\n"
-"\n"
-"Après avoir fait cela, vous devrez re-cocher la case 'se référer à un DCP "
-"existant'."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "Ce DCP ne posséde pas de son dans chacune de ses bobines"
@@ -1524,6 +1504,25 @@ msgstr "images"
 msgid "you must add some content to the DCP before creating it"
 msgstr "Vous devez ajouter des contenus pour créer le DCP"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Le DCP %1 se régérait à ce film.  Ce n'est plus possible désormais "
+#~ "puisque la taille de la bobine du film ne correspond plus à celle "
+#~ "importée dans le DCP.\n"
+#~ "\n"
+#~ "Régler le type de bobine sur 'découper par contenu vidéo' peut aider.\n"
+#~ "\n"
+#~ "Après avoir fait cela, vous devrez re-cocher la case 'se référer à un DCP "
+#~ "existant'."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "format du pixel pour la vidéo non determiné"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index e9e4596e3..9b30c65f4 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2016-10-28 15:19+0200\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -1064,26 +1064,6 @@ msgstr "Prova"
 msgid "Text subtitles"
 msgstr "sottotitoli"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Il DCP %1 era contenuto in questo film. Ora non ci sta più, in quanto la "
-"dimensione delle parti del film non corrisponde più a quelle del DCP "
-"importato.\n"
-"\n"
-"Modificare l'impostazione 'Parti' su 'Dividi per contenuto video' per "
-"risolvere il problema.\n"
-"\n"
-"Sarà necessario ri-selezionare la casella 'Fai riferimento ai DCP esistenti'."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "Il DCP non ha sonoro in nessuna delle parti."
@@ -1503,6 +1483,26 @@ msgstr "fotogrammi video"
 msgid "you must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Il DCP %1 era contenuto in questo film. Ora non ci sta più, in quanto la "
+#~ "dimensione delle parti del film non corrisponde più a quelle del DCP "
+#~ "importato.\n"
+#~ "\n"
+#~ "Modificare l'impostazione 'Parti' su 'Dividi per contenuto video' per "
+#~ "risolvere il problema.\n"
+#~ "\n"
+#~ "Sarà necessario ri-selezionare la casella 'Fai riferimento ai DCP "
+#~ "esistenti'."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Non posso trovare informazioni sul formato pixel del video."
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 6a0a02857..4816d19a4 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2018-01-06 01:40+0100\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
@@ -1087,27 +1087,6 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Tekst-ondertitels"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Er werd aan de DCP %1 gerefereerd door deze film.  Dat is nu niet meer "
-"mogelijk omdat de reel-lengtes van de film en de geïmporteerde DCP niet meer "
-"overeenkomen.\n"
-"\n"
-"De 'reel-mode' op 'splits per video-content' instellen helpt "
-"waarschijnlijk.\n"
-"\n"
-"Nadat dat gebeurd is moeten de juiste 'Refereer aan bestaande DCP' "
-"selectievakjes weer worden aangevinkt."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "De DCP heeft niet audio in alle reels."
@@ -1531,6 +1510,26 @@ msgstr "video frames"
 msgid "you must add some content to the DCP before creating it"
 msgstr "u moet content aan de DCP toevoegen voor hij gemaakt kan worden"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Er werd aan de DCP %1 gerefereerd door deze film.  Dat is nu niet meer "
+#~ "mogelijk omdat de reel-lengtes van de film en de geïmporteerde DCP niet "
+#~ "meer overeenkomen.\n"
+#~ "\n"
+#~ "De 'reel-mode' op 'splits per video-content' instellen helpt "
+#~ "waarschijnlijk.\n"
+#~ "\n"
+#~ "Nadat dat gebeurd is moeten de juiste 'Refereer aan bestaande DCP' "
+#~ "selectievakjes weer worden aangevinkt."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Kan pixelformaat voor video niet vinden"
 
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index b58d9dd97..7793cdc70 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2017-07-31 21:23+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1070,27 +1070,6 @@ msgstr "Testowy"
 msgid "Text subtitles"
 msgstr "Napisy"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Próbujesz użyć paczki DCP %1 jako referencji, nie jest to jednak możliwe, "
-"gdyż ustawiona liczba rolek w Projekcie nie są zgodne z tymi w importowanym "
-"DCP.\n"
-"\n"
-"Zapewne pomoże ustawienie opcji \"Typ podziału rolek' na 'podziel zgodnie z "
-"zawartością paczki' w zakładce 'DCP'.\n"
-"\n"
-"Po tym może być konieczne ponowne zaznaczenie opcji 'odnieś się do "
-"istniejącego DCP'."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "DCP nie ma dźwięku w żadnej rolce."
@@ -1508,6 +1487,26 @@ msgstr "klatki obrazu"
 msgid "you must add some content to the DCP before creating it"
 msgstr "musisz najpierw dodać jakieś pliki zanim utworzysz DCP"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Próbujesz użyć paczki DCP %1 jako referencji, nie jest to jednak możliwe, "
+#~ "gdyż ustawiona liczba rolek w Projekcie nie są zgodne z tymi w "
+#~ "importowanym DCP.\n"
+#~ "\n"
+#~ "Zapewne pomoże ustawienie opcji \"Typ podziału rolek' na 'podziel zgodnie "
+#~ "z zawartością paczki' w zakładce 'DCP'.\n"
+#~ "\n"
+#~ "Po tym może być konieczne ponowne zaznaczenie opcji 'odnieś się do "
+#~ "istniejącego DCP'."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Nie udało się znaleźć formatu piksela dla obrazu."
 
diff --git a/src/lib/po/pt_BR.po b/src/lib/po/pt_BR.po
index 98e1c4a9a..66652eae0 100644
--- a/src/lib/po/pt_BR.po
+++ b/src/lib/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2018-01-15 16:19-0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1086,25 +1086,6 @@ msgstr "Teste"
 msgid "Text subtitles"
 msgstr "Legendas em texto"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"O DCP OV %1 estava sendo referenciado por este filme.  Isso não é mais "
-"possível porque os tamanhos de rolo entre este filme e o DCP OV não batem.\n"
-"\n"
-"Definir 'Rolos' para 'Dividir por arquivo de conteúdo' pode ajudar.\n"
-"\n"
-"Depois de fazer isso, você terá de reativar as opções \"Abrir de um DCP "
-"existente'."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "O DCP não tem som em todos os rolos."
@@ -1529,6 +1510,25 @@ msgstr "quadros de vídeo"
 msgid "you must add some content to the DCP before creating it"
 msgstr "você precisa adicionar conteúdo ao DCP antes de criá-lo"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "O DCP OV %1 estava sendo referenciado por este filme.  Isso não é mais "
+#~ "possível porque os tamanhos de rolo entre este filme e o DCP OV não "
+#~ "batem.\n"
+#~ "\n"
+#~ "Definir 'Rolos' para 'Dividir por arquivo de conteúdo' pode ajudar.\n"
+#~ "\n"
+#~ "Depois de fazer isso, você terá de reativar as opções \"Abrir de um DCP "
+#~ "existente'."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Impossível encontrar formato de pixel para o vídeo"
 
diff --git a/src/lib/po/pt_PT.po b/src/lib/po/pt_PT.po
index 39664b66d..54d33d5f5 100644
--- a/src/lib/po/pt_PT.po
+++ b/src/lib/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic PORTUGUESE (Portugal)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2016-03-19 18:19+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
@@ -1070,18 +1070,6 @@ msgstr "Teste"
 msgid "Text subtitles"
 msgstr "Legendas de texto"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "Não há nenhuma bobina de audio no DCP"
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index dbbfdb839..0793e0670 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2017-05-14 22:22+0300\n"
 "Last-Translator: Igor Voytovich <i.voyt@dualvfilms.com>\n"
 "Language-Team: Russian\n"
@@ -1080,26 +1080,6 @@ msgstr "TST (Тестовый)"
 msgid "Text subtitles"
 msgstr "Текстовые субтитры"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Проект ссылался на DCP %1. Теперь это невозможно, потому что размеры бобин в "
-"проекте более не соответствует размерам бобин импортированного DCP.\n"
-"\n"
-"Установка режима бобины \"разделять по видео-контенту\" возможно поможет "
-"вам.\n"
-"\n"
-"Сделав это, вам потребуется повторно отметить необходимые чекбоксы "
-"\"ссылаться на\"."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "Во всех бобинах данного DCP отсутствует звук."
@@ -1520,6 +1500,26 @@ msgstr "видеокадры"
 msgid "you must add some content to the DCP before creating it"
 msgstr "вам необходимо добавить контент в DCP перед его созданием"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Проект ссылался на DCP %1. Теперь это невозможно, потому что размеры "
+#~ "бобин в проекте более не соответствует размерам бобин импортированного "
+#~ "DCP.\n"
+#~ "\n"
+#~ "Установка режима бобины \"разделять по видео-контенту\" возможно поможет "
+#~ "вам.\n"
+#~ "\n"
+#~ "Сделав это, вам потребуется повторно отметить необходимые чекбоксы "
+#~ "\"ссылаться на\"."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Не удалось найти формат пикселя видео."
 
diff --git a/src/lib/po/sk_SK.po b/src/lib/po/sk_SK.po
index f8499ed60..3a0e5b6bd 100644
--- a/src/lib/po/sk_SK.po
+++ b/src/lib/po/sk_SK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2016-01-06 00:23+0100\n"
 "Last-Translator: Tomáš Hlaváč\n"
 "Language-Team: \n"
@@ -1072,18 +1072,6 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "[titulky]"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "DCP nemá zvuk vo všetkých reeloch."
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 02db47435..65d277c44 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2016-10-25 17:57+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -1075,27 +1075,6 @@ msgstr "Test"
 msgid "Text subtitles"
 msgstr "Undertexter"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"DCP %1 refererades till av denna film. Detta är inte möjligt nu eftersom "
-"storleken på rullarna i filmen inte längre stämmer med dom i den importerade "
-"DCP:n.\n"
-"\n"
-"Det hjälper troligen att sätta 'Typ av rulle' till 'dela upp baserat på "
-"videoinnehåll'.\n"
-"\n"
-"Efter denna manöver behöver du också fylla i rätt checkbox under 'Referera "
-"till existerande DCP'."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "DCP:n har inte ljud i alla rullar."
@@ -1515,6 +1494,26 @@ msgstr "bildrutor"
 msgid "you must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "DCP %1 refererades till av denna film. Detta är inte möjligt nu eftersom "
+#~ "storleken på rullarna i filmen inte längre stämmer med dom i den "
+#~ "importerade DCP:n.\n"
+#~ "\n"
+#~ "Det hjälper troligen att sätta 'Typ av rulle' till 'dela upp baserat på "
+#~ "videoinnehåll'.\n"
+#~ "\n"
+#~ "Efter denna manöver behöver du också fylla i rätt checkbox under "
+#~ "'Referera till existerande DCP'."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Kunde inte hitta information om pixel-formatet för videon."
 
diff --git a/src/lib/po/uk_UA.po b/src/lib/po/uk_UA.po
index 4570a9ed7..964d74714 100644
--- a/src/lib/po/uk_UA.po
+++ b/src/lib/po/uk_UA.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2017-01-18 12:15+0200\n"
 "Last-Translator: Igor Voytovich <i.voyt@dualvfilms.com>\n"
 "Language-Team: Українська\n"
@@ -1065,26 +1065,6 @@ msgstr "TST (Тестовий)"
 msgid "Text subtitles"
 msgstr "Текстові субтитри"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr ""
-"Проект посилався на DCP %1. Тепер це неможливо, тому що розміри бобін у "
-"проекті більше не відповідають розмірам бобін імпортованого DCP.\n"
-"\n"
-"Установка режима бобіни \"розділяти по відео-контенту\" можливо допоможе "
-"вам.\n"
-"\n"
-"Зробив це, вам буде потрібно повторно помітити необхідні чекбокси "
-"\"посилатися на\"."
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "У всіх бобінах даного DCP відсутній звук."
@@ -1503,6 +1483,25 @@ msgstr "відеокадри"
 msgid "you must add some content to the DCP before creating it"
 msgstr "Додайте контент в проект перед створенням DCP"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr ""
+#~ "Проект посилався на DCP %1. Тепер це неможливо, тому що розміри бобін у "
+#~ "проекті більше не відповідають розмірам бобін імпортованого DCP.\n"
+#~ "\n"
+#~ "Установка режима бобіни \"розділяти по відео-контенту\" можливо допоможе "
+#~ "вам.\n"
+#~ "\n"
+#~ "Зробив це, вам буде потрібно повторно помітити необхідні чекбокси "
+#~ "\"посилатися на\"."
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "Не вдалося знайти формат пікселя відео."
 
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 55c46f70c..5852ee1c7 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"POT-Creation-Date: 2018-02-01 00:02+0000\n"
 "PO-Revision-Date: 2017-07-23 09:54+0800\n"
 "Last-Translator: Hanyuan\n"
 "Language-Team: Hanyuan\n"
@@ -1054,18 +1054,6 @@ msgstr "测试片"
 msgid "Text subtitles"
 msgstr "文本字幕"
 
-#: src/lib/film.cc:1553
-msgid ""
-"The DCP %1 was being referred to by this film.  This not now possible "
-"because the reel sizes in the film no longer agree with those in the "
-"imported DCP.\n"
-"\n"
-"Setting the 'Reel type' to 'split by video content' will probably help.\n"
-"\n"
-"After doing that you would need to re-tick the appropriate 'refer to "
-"existing DCP' checkboxes."
-msgstr "DCP中的电影内容太大，请使用 【 分卷模式 】后再试一次。"
-
 #: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "该DCP的所有分卷无声音。"
@@ -1460,6 +1448,17 @@ msgstr "视频帧"
 msgid "you must add some content to the DCP before creating it"
 msgstr "您必须在创建DCP之前添加一些内容。"
 
+#~ msgid ""
+#~ "The DCP %1 was being referred to by this film.  This not now possible "
+#~ "because the reel sizes in the film no longer agree with those in the "
+#~ "imported DCP.\n"
+#~ "\n"
+#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
+#~ "\n"
+#~ "After doing that you would need to re-tick the appropriate 'refer to "
+#~ "existing DCP' checkboxes."
+#~ msgstr "DCP中的电影内容太大，请使用 【 分卷模式 】后再试一次。"
+
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "找不到视频格式"
 
diff --git a/src/lib/reel_writer.cc b/src/lib/reel_writer.cc
index 4aa5ff3a7..da246ca0a 100644
--- a/src/lib/reel_writer.cc
+++ b/src/lib/reel_writer.cc
@@ -458,10 +458,12 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 		} else {
 
 			/* All our assets should be the same length; use the picture asset length here
-			   as a reference to set the subtitle one.
+			   as a reference to set the subtitle one.  We'll use the duration rather than
+			   the intrinsic duration; we don't care if the picture asset has been trimmed, we're
+			   just interested in its presentation length.
 			*/
 			dynamic_pointer_cast<dcp::SMPTESubtitleAsset>(_subtitle_asset)->set_intrinsic_duration (
-				reel_picture_asset->intrinsic_duration ()
+				reel_picture_asset->duration ()
 				);
 
 			_subtitle_asset->write (
@@ -473,7 +475,7 @@ ReelWriter::create_reel (list<ReferencedReelAsset> const & refs, list<shared_ptr
 			new dcp::ReelSubtitleAsset (
 				_subtitle_asset,
 				dcp::Fraction (_film->video_frame_rate(), 1),
-				reel_picture_asset->intrinsic_duration (),
+				reel_picture_asset->duration(),
 				0
 				)
 			);
diff --git a/src/lib/render_subtitles.cc b/src/lib/render_subtitles.cc
index 56343cd50..5f587c313 100644
--- a/src/lib/render_subtitles.cc
+++ b/src/lib/render_subtitles.cc
@@ -85,7 +85,7 @@ set_source_rgba (Cairo::RefPtr<Cairo::Context> context, dcp::Colour colour, floa
  *  at the same time and with the same fade in/out.
  */
 static PositionImage
-render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target, DCPTime time)
+render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target, DCPTime time, int frame_rate)
 {
 	/* XXX: this method can only handle italic / bold changes mid-line,
 	   nothing else yet.
@@ -242,9 +242,12 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
 	/* Compute fade factor */
 	float fade_factor = 1;
 
-	DCPTime const fade_in_start = DCPTime::from_seconds (subtitles.front().in().as_seconds ());
+	/* Round the fade start/end to the nearest frame start.  Otherwise if a subtitle starts just after
+	   the start of a frame it will be faded out.
+	*/
+	DCPTime const fade_in_start = DCPTime::from_seconds(subtitles.front().in().as_seconds()).round(frame_rate);
 	DCPTime const fade_in_end = fade_in_start + DCPTime::from_seconds (subtitles.front().fade_up_time().as_seconds ());
-	DCPTime const fade_out_end =  DCPTime::from_seconds (subtitles.front().out().as_seconds ());
+	DCPTime const fade_out_end =  DCPTime::from_seconds (subtitles.front().out().as_seconds()).round(frame_rate);
 	DCPTime const fade_out_start = fade_out_end - DCPTime::from_seconds (subtitles.front().fade_down_time().as_seconds ());
 
 	if (fade_in_start <= time && time <= fade_in_end && fade_in_start != fade_in_end) {
@@ -347,23 +350,25 @@ render_line (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp:
 	return PositionImage (image, Position<int> (max (0, x), max (0, y)));
 }
 
-/** @param time Time of the frame that these subtitles are going on */
+/** @param time Time of the frame that these subtitles are going on.
+ *  @param frame_rate DCP frame rate.
+ */
 list<PositionImage>
-render_subtitles (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target, DCPTime time)
+render_subtitles (list<SubtitleString> subtitles, list<shared_ptr<Font> > fonts, dcp::Size target, DCPTime time, int frame_rate)
 {
 	list<SubtitleString> pending;
 	list<PositionImage> images;
 
 	BOOST_FOREACH (SubtitleString const & i, subtitles) {
 		if (!pending.empty() && fabs (i.v_position() - pending.back().v_position()) > 1e-4) {
-			images.push_back (render_line (pending, fonts, target, time));
+			images.push_back (render_line (pending, fonts, target, time, frame_rate));
 			pending.clear ();
 		}
 		pending.push_back (i);
 	}
 
 	if (!pending.empty ()) {
-		images.push_back (render_line (pending, fonts, target, time));
+		images.push_back (render_line (pending, fonts, target, time, frame_rate));
 	}
 
 	return images;
diff --git a/src/lib/render_subtitles.h b/src/lib/render_subtitles.h
index 02bf3ec65..b1239bb3d 100644
--- a/src/lib/render_subtitles.h
+++ b/src/lib/render_subtitles.h
@@ -27,5 +27,5 @@ class Font;
 
 std::string marked_up (std::list<SubtitleString> subtitles, int target_height, float fade_factor);
 std::list<PositionImage> render_subtitles (
-	std::list<SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime
+	std::list<SubtitleString>, std::list<boost::shared_ptr<Font> > fonts, dcp::Size, DCPTime, int
 	);