Merge master.

40 files changed, 880 insertions, 543 deletions

diff --git a/src/lib/colour_conversion.cc b/src/lib/colour_conversion.cc
index c836cc271..5ecbf4021 100644
--- a/src/lib/colour_conversion.cc
+++ b/src/lib/colour_conversion.cc
@@ -84,6 +84,16 @@ ColourConversion::ColourConversion (cxml::NodePtr node)
 	output_gamma = node->number_child<double> ("OutputGamma");
 }
 
+boost::optional<ColourConversion>
+ColourConversion::from_xml (cxml::NodePtr node)
+{
+	if (!node->optional_node_child ("InputGamma")) {
+		return boost::optional<ColourConversion> ();
+	}
+
+	return ColourConversion (node);
+}
+
 void
 ColourConversion::as_xml (xmlpp::Node* node) const
 {
diff --git a/src/lib/colour_conversion.h b/src/lib/colour_conversion.h
index fa1a955e1..706e51fe8 100644
--- a/src/lib/colour_conversion.h
+++ b/src/lib/colour_conversion.h
@@ -46,6 +46,8 @@ public:
 
 	boost::optional<size_t> preset () const;
 
+	static boost::optional<ColourConversion> from_xml (cxml::NodePtr);
+
 	double input_gamma;
 	bool input_gamma_linearised;
 	boost::numeric::ublas::matrix<double> matrix;
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc
index f6c671fd1..cacba190f 100644
--- a/src/lib/dcp_video.cc
+++ b/src/lib/dcp_video.cc
@@ -111,26 +111,33 @@ DCPVideo::DCPVideo (shared_ptr<const PlayerVideo> frame, shared_ptr<const cxml::
 shared_ptr<EncodedData>
 DCPVideo::encode_locally ()
 {
-	shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
-		12, _frame->colour_conversion().input_gamma, _frame->colour_conversion().input_gamma_linearised
-		);
-	
-	/* XXX: libdcp should probably use boost */
-	
-	double matrix[3][3];
-	for (int i = 0; i < 3; ++i) {
-		for (int j = 0; j < 3; ++j) {
-			matrix[i][j] = _frame->colour_conversion().matrix (i, j);
+	shared_ptr<dcp::XYZFrame> xyz;
+
+	if (_frame->colour_conversion()) {
+		ColourConversion conversion = _frame->colour_conversion().get ();
+		shared_ptr<dcp::GammaLUT> in_lut = dcp::GammaLUT::cache.get (
+			12, conversion.input_gamma, conversion.input_gamma_linearised
+			);
+		
+		/* XXX: dcp should probably use boost */
+		
+		double matrix[3][3];
+		for (int i = 0; i < 3; ++i) {
+			for (int j = 0; j < 3; ++j) {
+				matrix[i][j] = conversion.matrix (i, j);
+			}
 		}
+		
+		xyz = dcp::rgb_to_xyz (
+			_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles),
+			in_lut,
+			dcp::GammaLUT::cache.get (16, 1 / conversion.output_gamma, false),
+			matrix
+			);
+	} else {
+		xyz = dcp::xyz_to_xyz (_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles));
 	}
 
-	shared_ptr<dcp::XYZFrame> xyz = dcp::rgb_to_xyz (
-		_frame->image (AV_PIX_FMT_RGB48LE, _burn_subtitles),
-		in_lut,
-		dcp::GammaLUT::cache.get (16, 1 / _frame->colour_conversion().output_gamma, false),
-		matrix
-		);
-
 	/* Set the max image and component sizes based on frame_rate */
 	int max_cs_len = ((float) _j2k_bandwidth) / 8 / _frames_per_second;
 	if (_frame->eyes() == EYES_LEFT || _frame->eyes() == EYES_RIGHT) {
diff --git a/src/lib/job.cc b/src/lib/job.cc
index 1d3cb73b6..7be171417 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -231,8 +231,9 @@ Job::set_progress (float p, bool force)
 	_progress = p;
 	boost::this_thread::interruption_point ();
 
-	if (paused ()) {
-		dcpomatic_sleep (1);
+	boost::mutex::scoped_lock lm2 (_state_mutex);
+	while (_state == PAUSED) {
+		_pause_changed.wait (lm2);
 	}
 
 	if (ui_signaller) {
@@ -350,6 +351,7 @@ Job::pause ()
 {
 	if (running ()) {
 		set_state (PAUSED);
+		_pause_changed.notify_all ();
 	}
 }
 
@@ -358,5 +360,6 @@ Job::resume ()
 {
 	if (paused ()) {
 		set_state (RUNNING);
+		_pause_changed.notify_all ();
 	}
 }
diff --git a/src/lib/job.h b/src/lib/job.h
index 97e3fc296..b7dfc5891 100644
--- a/src/lib/job.h
+++ b/src/lib/job.h
@@ -125,6 +125,11 @@ private:
 	mutable boost::mutex _progress_mutex;
 	boost::optional<float> _progress;
 
+	/** condition to signal changes to pause/resume so that we know when to wake;
+	    this could be a general _state_change if it made more sense.
+	*/
+	boost::condition_variable _pause_changed;
+
 	int _ran_for;
 };
 
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 8e6fcd5f3..b5f0b5fa5 100644
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -29,6 +29,7 @@ using std::cout;
 using dcp::raw_convert;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
+using boost::optional;
 
 PlayerVideo::PlayerVideo (
 	shared_ptr<const ImageProxy> in,
@@ -40,7 +41,7 @@ PlayerVideo::PlayerVideo (
 	Scaler const * scaler,
 	Eyes eyes,
 	Part part,
-	ColourConversion colour_conversion
+	optional<ColourConversion> colour_conversion
 	)
 	: _in (in)
 	, _time (time)
@@ -67,7 +68,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
 	_scaler = Scaler::from_id (node->string_child ("Scaler"));
 	_eyes = (Eyes) node->number_child<int> ("Eyes");
 	_part = (Part) node->number_child<int> ("Part");
-	_colour_conversion = ColourConversion (node);
+	_colour_conversion = ColourConversion::from_xml (node);
 
 	_in = image_proxy_factory (node->node_child ("In"), socket, log);
 
@@ -141,7 +142,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node, bool send_subtitles) const
 	node->add_child("Scaler")->add_child_text (_scaler->id ());
 	node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
 	node->add_child("Part")->add_child_text (raw_convert<string> (_part));
-	_colour_conversion.as_xml (node);
+	if (_colour_conversion) {
+		_colour_conversion.get().as_xml (node);
+	}
 	if (send_subtitles && _subtitle.image) {
 		node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle.image->size().width));
 		node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle.image->size().height));
diff --git a/src/lib/player_video.h b/src/lib/player_video.h
index e9d260972..610a7526c 100644
--- a/src/lib/player_video.h
+++ b/src/lib/player_video.h
@@ -50,7 +50,7 @@ public:
 		Scaler const *,
 		Eyes,
 		Part,
-		ColourConversion
+		boost::optional<ColourConversion>
 		);
 	
 	PlayerVideo (boost::shared_ptr<cxml::Node>, boost::shared_ptr<Socket>, boost::shared_ptr<Log>);
@@ -73,7 +73,7 @@ public:
 		return _eyes;
 	}
 
-	ColourConversion colour_conversion () const {
+	boost::optional<ColourConversion> colour_conversion () const {
 		return _colour_conversion;
 	}
 
@@ -97,6 +97,6 @@ private:
 	Scaler const * _scaler;
 	Eyes _eyes;
 	Part _part;
-	ColourConversion _colour_conversion;
+	boost::optional<ColourConversion> _colour_conversion;
 	PositionImage _subtitle;
 };
diff --git a/src/lib/player_video_frame.cc b/src/lib/player_video_frame.cc
index 63ddc637b..771e0a912 100644
--- a/src/lib/player_video_frame.cc
+++ b/src/lib/player_video_frame.cc
@@ -36,7 +36,7 @@ PlayerVideoFrame::PlayerVideoFrame (
 	Scaler const * scaler,
 	Eyes eyes,
 	Part part,
-	ColourConversion colour_conversion
+	boost::optional<ColourConversion> colour_conversion
 	)
 	: _in (in)
 	, _crop (crop)
@@ -59,7 +59,7 @@ PlayerVideoFrame::PlayerVideoFrame (shared_ptr<cxml::Node> node, shared_ptr<Sock
 	_scaler = Scaler::from_id (node->string_child ("Scaler"));
 	_eyes = (Eyes) node->number_child<int> ("Eyes");
 	_part = (Part) node->number_child<int> ("Part");
-	_colour_conversion = ColourConversion (node);
+	_colour_conversion = ColourConversion::from_xml (node);
 
 	_in = image_proxy_factory (node->node_child ("In"), socket, log);
 
@@ -129,7 +129,9 @@ PlayerVideoFrame::add_metadata (xmlpp::Node* node) const
 	node->add_child("Scaler")->add_child_text (_scaler->id ());
 	node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
 	node->add_child("Part")->add_child_text (raw_convert<string> (_part));
-	_colour_conversion.as_xml (node);
+	if (_colour_conversion) {
+		_colour_conversion.get().as_xml (node);
+	}
 	if (_subtitle_image) {
 		node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle_image->size().width));
 		node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle_image->size().height));
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index 22412da4a..4580e54d4 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -62,6 +62,12 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
+	/* Don't respond to position changes here, as:
+	   - sequencing after earlier/later changes is handled by move_earlier/move_later
+	   - any other position changes will be timeline drags which should not result in content
+	   being sequenced.
+	*/
+	
 	if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
 		maybe_sequence_video ();
 	}
@@ -393,6 +399,6 @@ Playlist::move_later (shared_ptr<Content> c)
 	}
 
 	(*next)->set_position (c->position ());
-	c->set_position (c->position() + c->length_after_trim ());
+	c->set_position (c->position() + (*next)->length_after_trim ());
 	sort (_content.begin(), _content.end(), ContentSorter ());
 }
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 68418910c..32a4b67e2 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: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-13 02:32+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -102,7 +102,7 @@ msgstr "Abgebrochen"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Center"
 
@@ -217,7 +217,13 @@ msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
 msgid "Could not decode image file (%1)"
 msgstr "Bilddatei konnte nicht dekodiert werden"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "%1 konnte nicht geöffnet werden."
 
@@ -357,7 +363,7 @@ msgstr "Gauss Filter"
 msgid "Gradient debander"
 msgstr "Gradient Glätter"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -385,23 +391,23 @@ msgstr "Kernel De-Interlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround links"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
@@ -489,19 +495,19 @@ msgstr "Freigabehinweis"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround rechts"
 
@@ -601,7 +607,7 @@ msgstr "Überleitung"
 msgid "Unexpected ZIP file contents"
 msgstr "Ungültiger ZIP Inhalt"
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Ungültiges Bildformat vom Server erhalten"
 
@@ -621,7 +627,7 @@ msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "VI"
 
@@ -657,7 +663,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "Zeit für Verbindung abgelaufen"
 
@@ -685,7 +691,15 @@ msgstr "Datei %1 konnte nicht erstellt werden."
 msgid "could not find stream information"
 msgstr "Keine Spur-Information gefunden"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "Ton Dekoder nicht gefunden."
+
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "Bild-Dekoder nicht gefunden"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
@@ -729,19 +743,19 @@ msgstr "SSH Session konnte nicht gestartet werden"
 msgid "could not write to file %1 (%2)"
 msgstr "Datei %1 konnte nicht geschrieben werden (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "error during async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "error during async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "error during async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
@@ -749,23 +763,23 @@ msgstr "error during async_write (%1)"
 msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "Stunde"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "Stunden"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "Minute"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "Key %1 in Key-value set fehlt"
 
@@ -799,12 +813,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB nicht linearisiert"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "Sekunden"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -816,12 +830,6 @@ msgstr "Standbild"
 msgid "unknown"
 msgstr "unbekannt"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "Ton Dekoder nicht gefunden."
-
-#~ msgid "could not find video decoder"
-#~ msgstr "Bild-Dekoder nicht gefunden"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "Nur Bitmap Untertitel werden unterstützt"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index e874c6415..5dc99462b 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: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -101,7 +101,7 @@ msgstr "Cancelado"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "No se puede usar el formato de pixel %1 para %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centro"
 
@@ -212,7 +212,13 @@ msgstr "No se pudo crear la carpeta remota %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "No se pudo crear el fichero (%1)"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
@@ -349,7 +355,7 @@ msgstr "Gaussiano"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -378,23 +384,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
@@ -479,19 +485,19 @@ msgstr "Clasificación"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround derecha"
 
@@ -591,7 +597,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -611,7 +617,7 @@ msgstr "Máscara de desenfoque Gaussiano"
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -647,7 +653,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -676,6 +682,14 @@ msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
 #: src/lib/writer.cc:430
+msgid "could not find audio decoder"
+msgstr "no se encontró el decodificador de audio"
+
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "no se pudo encontrar decodificador de vídeo"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "no s puedo mover el audio MXF en el DCP (%1)"
 
@@ -719,19 +733,19 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir en el fichero (%1)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "error durante async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
@@ -739,23 +753,23 @@ msgstr "error durante async_write (%1)"
 msgid "frames per second"
 msgstr "imágenes por segundo"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -789,12 +803,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "segundos"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "segundos"
 
@@ -806,12 +820,6 @@ msgstr "imagen fija"
 msgid "unknown"
 msgstr "desconocido"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "no se encontró el decodificador de audio"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "no se pudo encontrar decodificador de vídeo"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 474da73f9..bf8dc04f7 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: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-14 12:04+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -101,7 +101,7 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centre"
 
@@ -216,7 +216,13 @@ msgstr "Création du dossier distant %1 (%2) impossible"
 msgid "Could not decode image file (%1)"
 msgstr "Impossible de décoder le ficher image"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "lecture du fichier %1 impossible"
 
@@ -355,7 +361,7 @@ msgstr "Gaussien"
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -383,23 +389,23 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -483,19 +489,19 @@ msgstr "Classification"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -594,7 +600,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Type d'image non conforme reçu par le serveur"
 
@@ -614,7 +620,7 @@ msgstr "Adoucissement et flou Gaussien"
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -650,7 +656,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -678,7 +684,15 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "décodeur audio introuvable"
+
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "décodeur vidéo introuvable"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
 
@@ -724,19 +738,19 @@ msgstr "démarrage de session SSH impossible"
 msgid "could not write to file %1 (%2)"
 msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "erreur pendant async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "erreur pendant async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "erreur pendant async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "erreur pendant async_write (%1)"
 
@@ -744,23 +758,23 @@ msgstr "erreur pendant async_write (%1)"
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 manquante dans le réglage"
 
@@ -794,12 +808,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "secondes"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondes"
 
@@ -811,12 +825,6 @@ msgstr "%1 [restant]"
 msgid "unknown"
 msgstr "Inconnu"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "décodeur audio introuvable"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "décodeur vidéo introuvable"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "sous-titres non-bitmap non supportés actuellement"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index a22ccee3c..a3b1b9de7 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: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -102,7 +102,7 @@ msgstr "Cancellato"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centro"
 
@@ -220,7 +220,13 @@ msgstr "Non posso creare la directory remota %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Non riesco ad aprire %1"
 
@@ -361,7 +367,7 @@ msgstr "Gaussiana"
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr ""
 
@@ -390,24 +396,24 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -493,20 +499,20 @@ msgstr "Punteggio"
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Surround destro"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -609,7 +615,7 @@ msgstr "Di transizione"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -629,7 +635,7 @@ msgstr "Maschera unsharp e sfocatura Gaussiana"
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr ""
 
@@ -666,7 +672,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -690,11 +696,19 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "non riesco a trovare il decoder audio"
+
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "non riesco a trovare il decoder video"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr ""
 
@@ -740,19 +754,19 @@ msgstr "non posso avviare la sessione SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "non posso scrivere il file (%1)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr ""
 
@@ -760,23 +774,23 @@ msgstr ""
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -810,12 +824,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non linearizzato"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "secondi"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondi"
 
@@ -829,12 +843,6 @@ msgstr "ancora"
 msgid "unknown"
 msgstr "Errore sconosciuto"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "non riesco a trovare il decoder audio"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "non riesco a trovare il decoder video"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "sottotitoli non-bitmap non ancora supportati"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 81a1e626b..414eacdc5 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: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-09-04 20:34+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -102,7 +102,7 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Midden"
 
@@ -211,7 +211,13 @@ msgstr "Kan geen remote map maken %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "Kan beeldbestand niet decoderen"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Kan niet openen %1"
 
@@ -351,7 +357,7 @@ msgstr "Gaussian"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -379,23 +385,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -483,19 +489,19 @@ msgstr "Beoordeling"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Rechts surround"
 
@@ -594,7 +600,7 @@ msgstr "Bumper"
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Onverwacht beeldtype ontvangen door server"
 
@@ -614,7 +620,7 @@ msgstr "Unsharp mask and Gaussian blur"
 msgid "Untitled"
 msgstr "Niet benoemd"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -650,7 +656,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
@@ -674,11 +680,19 @@ msgstr "kopieeren %1"
 msgid "could not create file %1"
 msgstr "kan geen bestand maken %1"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "kan geen audio decoder vinden"
+
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "kan geen stream informatie vinden"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "kan geen videodecoder vinden"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kan MXF audio niet plaatsen in DCP (%1)"
 
@@ -722,19 +736,19 @@ msgstr "kan SSH sessie niet starten"
 msgid "could not write to file %1 (%2)"
 msgstr "kan niet schrijven naar bestand %1 (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "fout met async_accepteren (FTP) (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "fout met async_verbinden (FTP) (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "fout met async_lezen (FTP) (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "fout met async_schrijven (FTP) (%1)"
 
@@ -742,23 +756,23 @@ msgstr "fout met async_schrijven (FTP) (%1)"
 msgid "frames per second"
 msgstr "frames per seconde"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "uur"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "uren"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuut"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minuten"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "ontbrekende key %1 in key-value set"
 
@@ -792,11 +806,11 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non-linearised"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 msgid "second"
 msgstr "secondes"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondes"
 
@@ -808,12 +822,6 @@ msgstr "still"
 msgid "unknown"
 msgstr "onbekend"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "kan geen audio decoder vinden"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "kan geen videodecoder vinden"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 29127294f..75a664191 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: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -101,7 +101,7 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Center"
 
@@ -215,7 +215,13 @@ msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Kunde inte öppna %1"
 
@@ -353,7 +359,7 @@ msgstr "Gaussisk"
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr ""
 
@@ -382,24 +388,24 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -485,20 +491,20 @@ msgstr "Rating"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -599,7 +605,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -620,7 +626,7 @@ msgstr "Oskärpemask och Gaussisk suddighet"
 msgid "Untitled"
 msgstr "Utan titel"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr ""
 
@@ -658,7 +664,7 @@ msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
@@ -682,11 +688,19 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "kunde inte hitta audio-avkodare"
+
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "kunde inte hitta video-avkodare"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)"
 
@@ -731,19 +745,19 @@ msgstr "kunde inte starta SSH-session"
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "fel vid async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
@@ -751,23 +765,23 @@ msgstr "fel vid async_write (%1)"
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -802,12 +816,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB icke-linjär"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "sekunder"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "sekunder"
 
@@ -819,12 +833,6 @@ msgstr "stillbild"
 msgid "unknown"
 msgstr "okänd"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "kunde inte hitta audio-avkodare"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "kunde inte hitta video-avkodare"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index ba656e4c2..976bc3aa0 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -65,7 +65,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (Config::instance()->default_scale ())
 {
-	setup_default_colour_conversion ();
+	set_default_colour_conversion ();
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len)
@@ -75,7 +75,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, DCPTime s, ContentTime len
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (Config::instance()->default_scale ())
 {
-	setup_default_colour_conversion ();
+	set_default_colour_conversion ();
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
@@ -85,7 +85,7 @@ VideoContent::VideoContent (shared_ptr<const Film> f, boost::filesystem::path p)
 	, _video_frame_type (VIDEO_FRAME_TYPE_2D)
 	, _scale (Config::instance()->default_scale ())
 {
-	setup_default_colour_conversion ();
+	set_default_colour_conversion ();
 }
 
 VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, int version)
@@ -116,8 +116,11 @@ VideoContent::VideoContent (shared_ptr<const Film> f, cxml::ConstNodePtr node, i
 	} else {
 		_scale = VideoContentScale (node->node_child ("Scale"));
 	}
+
 	
-	_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
+	if (node->optional_node_child ("ColourConversion")) {
+		_colour_conversion = ColourConversion (node->node_child ("ColourConversion"));
+	}
 	if (version >= 32) {
 		_fade_in = ContentTime (node->number_child<int64_t> ("FadeIn"));
 		_fade_out = ContentTime (node->number_child<int64_t> ("FadeOut"));
@@ -186,15 +189,17 @@ VideoContent::as_xml (xmlpp::Node* node) const
 	node->add_child("VideoFrameType")->add_child_text (raw_convert<string> (static_cast<int> (_video_frame_type)));
 	_crop.as_xml (node);
 	_scale.as_xml (node->add_child("Scale"));
-	_colour_conversion.as_xml (node->add_child("ColourConversion"));
+	if (_colour_conversion) {
+		_colour_conversion.get().as_xml (node->add_child("ColourConversion"));
+	}
 	node->add_child("FadeIn")->add_child_text (raw_convert<string> (_fade_in.get ()));
 	node->add_child("FadeOut")->add_child_text (raw_convert<string> (_fade_out.get ()));
 }
 
 void
-VideoContent::setup_default_colour_conversion ()
+VideoContent::set_default_colour_conversion ()
 {
-	_colour_conversion = PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion;
+	set_colour_conversion (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6).conversion);
 }
 
 void
@@ -327,8 +332,11 @@ VideoContent::identifier () const
 	  << "_" << crop().right
 	  << "_" << crop().top
 	  << "_" << crop().bottom
-	  << "_" << scale().id()
-	  << "_" << colour_conversion().identifier ();
+	  << "_" << scale().id();
+
+	if (colour_conversion()) {
+		s << "_" << colour_conversion().get().identifier ();
+	}
 
 	return s.str ();
 }
@@ -376,6 +384,17 @@ VideoContent::video_size_after_3d_split () const
 }
 
 void
+VideoContent::unset_colour_conversion ()
+{
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_colour_conversion = boost::optional<ColourConversion> ();
+	}
+
+	signal_changed (VideoContentProperty::COLOUR_CONVERSION);
+}
+
+void
 VideoContent::set_colour_conversion (ColourConversion c)
 {
 	{
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index e88fb0227..3c8e5fefd 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -89,7 +89,9 @@ public:
 	void set_bottom_crop (int);
 
 	void set_scale (VideoContentScale);
+	void unset_colour_conversion ();
 	void set_colour_conversion (ColourConversion);
+	void set_default_colour_conversion ();
 
 	void set_fade_in (ContentTime);
 	void set_fade_out (ContentTime);
@@ -130,7 +132,7 @@ public:
 		return _scale;
 	}
 
-	ColourConversion colour_conversion () const {
+	boost::optional<ColourConversion> colour_conversion () const {
 		boost::mutex::scoped_lock lm (_mutex);
 		return _colour_conversion;
 	}
@@ -173,7 +175,7 @@ private:
 	VideoFrameType _video_frame_type;
 	Crop _crop;
 	VideoContentScale _scale;
-	ColourConversion _colour_conversion;
+	boost::optional<ColourConversion> _colour_conversion;
 	ContentTime _fade_in;
 	ContentTime _fade_out;
 };
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d08a11ea9..edd04fd51 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -198,7 +198,7 @@ public:
 
 		_film_editor = new FilmEditor (overall_panel);
 		_film_viewer = new FilmViewer (overall_panel);
-		JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast<JobManagerView::Buttons> (0));
+		JobManagerView* job_manager_view = new JobManagerView (overall_panel);
 
 		wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
 		right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6);
@@ -418,7 +418,7 @@ private:
 		} catch (exception& e) {
 			error_dialog (this, e.what ());
 		} catch (...) {
-			error_dialog (this, _("An unknown exeception occurred."));
+			error_dialog (this, _("An unknown exception occurred."));
 		}
 	
 		d->Destroy ();
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index de255e65e..b92ca5d71 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -77,7 +77,7 @@ public:
 		s->Add (panel, 1, wxEXPAND);
 		SetSizer (s);
 
-		JobManagerView* job_manager_view = new JobManagerView (panel, JobManagerView::PAUSE);
+		JobManagerView* job_manager_view = new JobManagerView (panel);
 		_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
 
 		wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index ab8f2fca7..627bbe6a5 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-13 03:04+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,11 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
 "den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Ein unbekannter Fehler ist aufgetreten."
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -116,11 +120,7 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
 "den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr "Ein unbekannter Fehler ist aufgetreten."
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Medien der CPL sind nicht verschlüsselt worden."
 
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index c4074fb12..5c99032c0 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-04-20 10:21-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -103,17 +103,17 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Ha ocurrido un error desconocido."
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr "Ha ocurrido un error desconocido."
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 6d426d432..e338bfdac 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/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: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-14 10:43+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -106,7 +106,11 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Exception inconnue"
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -114,11 +118,7 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr "Exception inconnue"
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Le contenu du CPL n'est pas crypté."
 
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 7f7baddaf..ce52d6543 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -100,17 +100,17 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr ""
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 02eafd9cc..67cd9cbe6 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/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: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-09-04 20:29+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -105,7 +105,11 @@ msgstr ""
 "Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
 "(carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Er is een onbekende fout opgetreden."
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -113,11 +117,7 @@ msgstr ""
 "Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
 "(carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr "Er is een onbekende fout opgetreden."
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "De inhoud van de CPL is niet geëncrypteerd."
 
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 9756a16c7..b1849f333 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -103,17 +103,17 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr ""
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index dbf502289..db5bc7c45 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -134,6 +134,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Silvio Giuliano"));
 	supported_by.Add (wxT ("Alan Gouger"));
 	supported_by.Add (wxT ("Flor Guillaume"));
+	supported_by.Add (wxT ("Patrick Haderer"));
 	supported_by.Add (wxT ("Antonio Ruiz Hernandez"));
 	supported_by.Add (wxT ("Jonathan Jensen"));
 	supported_by.Add (wxT ("Chris Kay"));
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 7f9461d94..881317f3a 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -89,8 +89,6 @@ FilmEditor::FilmEditor (wxWindow* parent)
 		);
 
 	set_film (shared_ptr<Film> ());
-	
-	SetSizerAndFit (s);
 }
 
 
diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc
index 5146243b4..b62d44d07 100644
--- a/src/wx/job_manager_view.cc
+++ b/src/wx/job_manager_view.cc
@@ -39,12 +39,11 @@ using boost::weak_ptr;
 class JobRecord
 {
 public:
-	JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table, bool pause)
+	JobRecord (shared_ptr<Job> job, wxScrolledWindow* window, wxPanel* panel, wxFlexGridSizer* table)
 		: _job (job)
 		, _window (window)
 		, _panel (panel)
 		, _table (table)
-		, _pause (0)
 	{
 		int n = 0;
 		
@@ -69,12 +68,10 @@ public:
 		table->Insert (n, _cancel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
 		++n;
 	
-		if (pause) {
-			_pause = new wxButton (_panel, wxID_ANY, _("Pause"));
-			_pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this);
-			table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
-			++n;
-		}
+		_pause = new wxButton (_panel, wxID_ANY, _("Pause"));
+		_pause->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::pause_clicked, this);
+		table->Insert (n, _pause, 1, wxALIGN_CENTER_VERTICAL | wxALL, 6);
+		++n;
 	
 		_details = new wxButton (_panel, wxID_ANY, _("Details..."));
 		_details->Bind (wxEVT_COMMAND_BUTTON_CLICKED, &JobRecord::details_clicked, this);
@@ -135,9 +132,7 @@ private:
 		}
 		
 		_cancel->Enable (false);
-		if (_pause) {
-			_pause->Enable (false);
-		}
+		_pause->Enable (false);
 		if (!_job->error_details().empty ()) {
 			_details->Enable (true);
 		}
@@ -183,21 +178,15 @@ private:
 };
 
 /** Must be called in the GUI thread */
-JobManagerView::JobManagerView (wxWindow* parent, Buttons buttons)
+JobManagerView::JobManagerView (wxWindow* parent)
 	: wxScrolledWindow (parent)
-	, _buttons (buttons)
 {
 	_panel = new wxPanel (this);
 	wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 	sizer->Add (_panel, 1, wxEXPAND);
 	SetSizer (sizer);
 
-	int N = 5;
-	if (buttons & PAUSE) {
-		++N;
-	}
-	
-	_table = new wxFlexGridSizer (N, 6, 6);
+	_table = new wxFlexGridSizer (6, 6, 6);
 	_table->AddGrowableCol (1, 1);
 	_panel->SetSizer (_table);
 
@@ -225,7 +214,7 @@ JobManagerView::job_added (weak_ptr<Job> j)
 {
 	shared_ptr<Job> job = j.lock ();
 	if (job) {
-		_job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table, _buttons & PAUSE)));
+		_job_records.push_back (shared_ptr<JobRecord> (new JobRecord (job, this, _panel, _table)));
 	}
 }
 
diff --git a/src/wx/job_manager_view.h b/src/wx/job_manager_view.h
index 83ce4ee5a..fde9199ff 100644
--- a/src/wx/job_manager_view.h
+++ b/src/wx/job_manager_view.h
@@ -34,11 +34,7 @@ class JobRecord;
 class JobManagerView : public wxScrolledWindow
 {
 public:
-	enum Buttons {
-		PAUSE = 0x1,
-	};
-		
-	JobManagerView (wxWindow *, Buttons);
+	JobManagerView (wxWindow *);
 
 private:
 	void job_added (boost::weak_ptr<Job>);
@@ -50,5 +46,4 @@ private:
 	boost::shared_ptr<wxTimer> _timer;
 		
 	std::list<boost::shared_ptr<JobRecord> > _job_records;
-	Buttons _buttons;
 };
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index d7353e914..df095e8ce 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-13 03:08+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,7 +45,11 @@ msgstr "-6dB"
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/video_panel.cc:193
+#: src/wx/audio_panel.cc:273
+msgid "1 channel"
+msgstr "1 Kanal"
+
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
@@ -106,13 +110,24 @@ msgstr "Kino hinzufügen..."
 msgid "Add Screen..."
 msgstr "Saal hinzufügen..."
 
-#: src/wx/content_panel.cc:67
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Datei(en) hinzufügen..."
 
-#: src/wx/content_panel.cc:69
-msgid "Add folder..."
-msgstr "Ordner hinzufügen..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62
 msgid "Add..."
@@ -166,7 +181,16 @@ msgstr ""
 "Der Ton von Kanal %d wird wird an den DCP Kanal %d mit %.1fdB Pegel "
 "weitergegeben."
 
-#: src/wx/config_dialog.cc:1022
+#: src/wx/audio_panel.cc:248
+#, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr ""
+
+#: src/wx/audio_panel.cc:253
+msgid "Audio will not be resampled."
+msgstr ""
+
+#: src/wx/config_dialog.cc:683
 msgid "BCC address"
 msgstr "BCC: Adresse"
 
@@ -268,11 +292,11 @@ msgstr "Beim Start auf Updates überprüfen."
 msgid "Choose a file"
 msgstr "Datei auswählen"
 
-#: src/wx/content_panel.cc:241
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Eine oder mehrere Dateien auswählen"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Ordner wählen"
 
@@ -451,7 +475,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi Seriennummern müssen aus 6 Zahlen bestehen!"
 
-#: src/wx/content_panel.cc:75
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Nach unten"
 
@@ -611,6 +635,10 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Host Name oder IP-Adresse"
 
+#: src/wx/audio_panel.cc:277
+msgid "Hz"
+msgstr "Hz"
+
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Ich möchte bei dieser Faderstellung spielen"
@@ -663,7 +691,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr "Zeitfenster"
 
-#: src/wx/content_panel.cc:85
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Lücken in Zeitleiste automatisch schließen"
 
@@ -721,7 +749,7 @@ msgstr ""
 msgid "Ls"
 msgstr "SL"
 
-#: src/wx/content_panel.cc:438
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "FEHLT:"
 
@@ -759,7 +787,15 @@ msgstr "Maximale JPEG2000 Datenrate (Vorsicht!)"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Mehrere Inhalte ausgewählt"
 
@@ -811,6 +847,10 @@ msgstr ""
 msgid "Organisational unit"
 msgstr ""
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Andere"
@@ -914,8 +954,8 @@ msgstr "Lade Zertifikat"
 msgid "Red band"
 msgstr "Red band (USA, für explizite Inhalte)"
 
-#: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
+#: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -927,6 +967,10 @@ msgstr "Kino entfernen"
 msgid "Remove Screen"
 msgstr "Saal entfernen"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Wiederholen"
@@ -1095,7 +1139,7 @@ msgstr "Untertitel Sprache (z.B. EN)"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:168
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
@@ -1119,7 +1163,7 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Getestet von"
 
@@ -1165,7 +1209,7 @@ msgstr "Zeit"
 msgid "Timeline"
 msgstr "Zeitleiste"
 
-#: src/wx/content_panel.cc:77
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Zeitleiste..."
 
@@ -1206,7 +1250,7 @@ msgstr "Unbekannt"
 msgid "Until"
 msgstr "Bis"
 
-#: src/wx/content_panel.cc:73
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Nach oben"
 
@@ -1324,6 +1368,10 @@ msgstr ""
 msgid "audio"
 msgstr "Ton"
 
+#: src/wx/audio_panel.cc:275
+msgid "channels"
+msgstr "Kanäle"
+
 #: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "zähle..."
@@ -1358,24 +1406,6 @@ msgstr "mal"
 msgid "video"
 msgstr "Bild"
 
-#~ msgid "1 channel"
-#~ msgstr "1 Kanal"
-
-#~ msgid "Audio channels"
-#~ msgstr "Ton Kanäle"
-
-#~ msgid "Could not decode video for view (%s)"
-#~ msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
-
-#~ msgid "Hz"
-#~ msgstr "Hz"
-
-#~ msgid "With Subtitles"
-#~ msgstr "Mit Untertitelung"
-
-#~ msgid "channels"
-#~ msgstr "Kanäle"
-
 #~ msgid "Default creator"
 #~ msgstr "Standard 'creator' (DCI)"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 0191fc503..415d539a1 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -44,7 +44,11 @@ msgstr ""
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/video_panel.cc:193
+#: src/wx/audio_panel.cc:273
+msgid "1 channel"
+msgstr "1 canal"
+
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
@@ -107,13 +111,24 @@ msgstr "Añadir cine..."
 msgid "Add Screen..."
 msgstr "Añadir pantalla..."
 
-#: src/wx/content_panel.cc:67
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/content_panel.cc:69
-msgid "Add folder..."
-msgstr "Añadir carpeta..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62
 msgid "Add..."
@@ -165,7 +180,16 @@ msgid ""
 "%.1fdB."
 msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB."
 
-#: src/wx/config_dialog.cc:1022
+#: src/wx/audio_panel.cc:248
+#, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr ""
+
+#: src/wx/audio_panel.cc:253
+msgid "Audio will not be resampled."
+msgstr ""
+
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "Dirección IP"
@@ -270,11 +294,11 @@ msgstr "Buscar actualizaciones al iniciar"
 msgid "Choose a file"
 msgstr "Elige un fichero"
 
-#: src/wx/content_panel.cc:241
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Elige una carpeta"
 
@@ -456,7 +480,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Los números de serie de Doremi deben tener 6 cifras"
 
-#: src/wx/content_panel.cc:75
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Bajar"
 
@@ -616,6 +640,10 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
+#: src/wx/audio_panel.cc:277
+msgid "Hz"
+msgstr "Hz"
+
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
@@ -670,7 +698,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr "Tiempo"
 
-#: src/wx/content_panel.cc:85
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
 
@@ -728,7 +756,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/content_panel.cc:438
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "FALTA:"
 
@@ -766,7 +794,15 @@ msgstr "Ancho de banda JPEG2000 máximo"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Varios contenidos seleccionados"
 
@@ -819,6 +855,10 @@ msgstr "Duración"
 msgid "Organisational unit"
 msgstr ""
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Otros"
@@ -923,8 +963,8 @@ msgstr "Descargar certificado"
 msgid "Red band"
 msgstr ""
 
-#: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
+#: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Quitar"
 
@@ -936,6 +976,10 @@ msgstr "Quitar cine"
 msgid "Remove Screen"
 msgstr "Quitar pantalla"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Repetir"
@@ -1109,7 +1153,7 @@ msgstr "Idioma del subtítulo (ej. EN)"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Soportado por"
 
@@ -1134,7 +1178,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Comprobado por"
 
@@ -1179,7 +1223,7 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Línea de tiempo"
 
-#: src/wx/content_panel.cc:77
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
@@ -1221,7 +1265,7 @@ msgstr "Desconocido"
 msgid "Until"
 msgstr "Hasta"
 
-#: src/wx/content_panel.cc:73
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Subir"
 
@@ -1342,6 +1386,10 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
+#: src/wx/audio_panel.cc:275
+msgid "channels"
+msgstr "canales"
+
 #: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "contando..."
@@ -1376,24 +1424,6 @@ msgstr "veces"
 msgid "video"
 msgstr "vídeo"
 
-#~ msgid "1 channel"
-#~ msgstr "1 canal"
-
-#~ msgid "Audio channels"
-#~ msgstr "Canales de audio"
-
-#~ msgid "Could not decode video for view (%s)"
-#~ msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
-
-#~ msgid "Hz"
-#~ msgstr "Hz"
-
-#~ msgid "With Subtitles"
-#~ msgstr "Con subtítulos"
-
-#~ msgid "channels"
-#~ msgstr "canales"
-
 #~ msgid "Default creator"
 #~ msgstr "Creador por defecto"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 46c4822d6..0ba92f95b 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/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: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-14 11:27+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -45,7 +45,11 @@ msgstr "-6dB"
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/video_panel.cc:193
+#: src/wx/audio_panel.cc:273
+msgid "1 channel"
+msgstr "1 canal"
+
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
@@ -106,13 +110,24 @@ msgstr "Ajout cinéma"
 msgid "Add Screen..."
 msgstr "Ajout une salle"
 
-#: src/wx/content_panel.cc:67
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/content_panel.cc:69
-msgid "Add folder..."
-msgstr "Ajout dossier..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62
 msgid "Add..."
@@ -166,7 +181,17 @@ msgstr ""
 "Le son du canal audio %d sera transféré au canal %d du DCP avec un gain de "
 "%.1fdB."
 
-#: src/wx/config_dialog.cc:1022
+#: src/wx/audio_panel.cc:248
+#, fuzzy, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr "L'audio sera rééchantillonné de %dHz à %dHz."
+
+#: src/wx/audio_panel.cc:253
+#, fuzzy
+msgid "Audio will not be resampled."
+msgstr "L'audio sera rééchantillonné de %dHz à %dHz."
+
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "Adresse CC"
@@ -269,11 +294,11 @@ msgstr "Recherche de mises à jour au démarrage."
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#: src/wx/content_panel.cc:241
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
@@ -452,7 +477,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Les numéros de série Doremi doivent être composés de 6 chiffres"
 
-#: src/wx/content_panel.cc:75
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Descendre"
 
@@ -610,6 +635,10 @@ msgstr "Hôtes"
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
+#: src/wx/audio_panel.cc:277
+msgid "Hz"
+msgstr "Hz"
+
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Je veux lire avec une table de mixage"
@@ -662,7 +691,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr "Temps"
 
-#: src/wx/content_panel.cc:85
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Conserver la vidéo dans la séquence"
 
@@ -720,7 +749,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Sr.G"
 
-#: src/wx/content_panel.cc:438
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
@@ -758,7 +787,15 @@ msgstr "Qualité JPEG2000 Maxi"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Contenus multiples sélectionnés"
 
@@ -811,6 +848,10 @@ msgstr "Durée"
 msgid "Organisational unit"
 msgstr ""
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Autre"
@@ -914,8 +955,8 @@ msgstr "Téléchargement Certificat"
 msgid "Red band"
 msgstr "Red Band"
 
-#: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
+#: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -927,6 +968,10 @@ msgstr "Supprimer le cinéma"
 msgid "Remove Screen"
 msgstr "Supprimer la salle"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Répéter"
@@ -1096,7 +1141,7 @@ msgstr "Langue de sous-titres (ex. FR)"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Soutenu par"
 
@@ -1120,7 +1165,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version test"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Testé par"
 
@@ -1166,7 +1211,7 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/content_panel.cc:77
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Timeline..."
 
@@ -1207,7 +1252,7 @@ msgstr "inconnu."
 msgid "Until"
 msgstr "Jusqu'au"
 
-#: src/wx/content_panel.cc:73
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Monter"
 
@@ -1325,6 +1370,10 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
+#: src/wx/audio_panel.cc:275
+msgid "channels"
+msgstr "canaux"
+
 #: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "calcul..."
@@ -1359,24 +1408,6 @@ msgstr "fois"
 msgid "video"
 msgstr "vidéo"
 
-#~ msgid "1 channel"
-#~ msgstr "1 canal"
-
-#~ msgid "Audio channels"
-#~ msgstr "Canaux audios"
-
-#~ msgid "Could not decode video for view (%s)"
-#~ msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
-
-#~ msgid "Hz"
-#~ msgstr "Hz"
-
-#~ msgid "With Subtitles"
-#~ msgstr "Avec sous-titres"
-
-#~ msgid "channels"
-#~ msgstr "canaux"
-
 #~ msgid "Default creator"
 #~ msgstr "Créateur par défaut"
 
@@ -1452,9 +1483,6 @@ msgstr "vidéo"
 #~ msgid "A/B mode"
 #~ msgstr "A/B mode"
 
-#~ msgid "Audio will be resampled from %dHz to %dHz\n"
-#~ msgstr "L'audio sera rééchantillonné de %dHz à %dHz\n"
-
 #~ msgid "Colour look-up table"
 #~ msgstr "Espace colorimétrique"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 35cb8db88..875be0ddf 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -43,7 +43,11 @@ msgstr ""
 msgid "1 / "
 msgstr ""
 
-#: src/wx/video_panel.cc:193
+#: src/wx/audio_panel.cc:273
+msgid "1 channel"
+msgstr "1 canale"
+
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr ""
 
@@ -105,13 +109,24 @@ msgstr "Aggiungi Cinema"
 msgid "Add Screen..."
 msgstr "Aggiungi Schermo"
 
-#: src/wx/content_panel.cc:67
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Aggiungi File"
 
-#: src/wx/content_panel.cc:69
-msgid "Add folder..."
-msgstr "Aggiungi cartella"
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62
 msgid "Add..."
@@ -166,7 +181,17 @@ msgstr ""
 "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP con "
 "guadagno di %.1fdB."
 
-#: src/wx/config_dialog.cc:1022
+#: src/wx/audio_panel.cc:248
+#, fuzzy, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr "L'Audio sarà ricampionato da %dHz a %dHz"
+
+#: src/wx/audio_panel.cc:253
+#, fuzzy
+msgid "Audio will not be resampled."
+msgstr "L'Audio sarà ricampionato da %dHz a %dHz."
+
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "Indirizzo IP"
@@ -272,11 +297,11 @@ msgstr "Controlla gli aggiornamentio alla partenza"
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: src/wx/content_panel.cc:241
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Scegli uno o più file"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Scegli una cartella"
 
@@ -461,7 +486,7 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/content_panel.cc:75
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr ""
 
@@ -622,6 +647,10 @@ msgstr ""
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
+#: src/wx/audio_panel.cc:277
+msgid "Hz"
+msgstr "Hz"
+
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
@@ -676,7 +705,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/wx/content_panel.cc:85
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Tieni i video in sequenza"
 
@@ -734,7 +763,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/content_panel.cc:438
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
@@ -775,7 +804,15 @@ msgstr "Banda passante JPEG2000"
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/video_panel.cc:301
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Molteplici sorgenti selezionate"
 
@@ -828,6 +865,10 @@ msgstr "Durata"
 msgid "Organisational unit"
 msgstr ""
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr ""
@@ -932,8 +973,8 @@ msgstr ""
 msgid "Red band"
 msgstr ""
 
-#: src/wx/config_dialog.cc:599 src/wx/content_menu.cc:59
-#: src/wx/content_panel.cc:71 src/wx/editable_list.h:68
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
+#: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -945,6 +986,10 @@ msgstr "Rimuovi Cinema"
 msgid "Remove Screen"
 msgstr "Rimuovi Schermo"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr ""
@@ -1118,7 +1163,7 @@ msgstr "Lingua dei Sottotitoli (es. FR)"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr ""
 
@@ -1144,7 +1189,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr ""
 
@@ -1189,7 +1234,7 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/content_panel.cc:77
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr ""
 
@@ -1232,7 +1277,7 @@ msgstr "sconosciuto"
 msgid "Until"
 msgstr "Fino a"
 
-#: src/wx/content_panel.cc:73
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Su"
 
@@ -1352,6 +1397,10 @@ msgstr ""
 msgid "audio"
 msgstr "Audio"
 
+#: src/wx/audio_panel.cc:275
+msgid "channels"
+msgstr "canali"
+
 #: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "conteggio..."
@@ -1387,24 +1436,6 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
-#~ msgid "1 channel"
-#~ msgstr "1 canale"
-
-#~ msgid "Audio channels"
-#~ msgstr "Canali audio"
-
-#~ msgid "Could not decode video for view (%s)"
-#~ msgstr "Non posso decodificare il video per guardarlo (%s)"
-
-#~ msgid "Hz"
-#~ msgstr "Hz"
-
-#~ msgid "With Subtitles"
-#~ msgstr "Con sottotitoli"
-
-#~ msgid "channels"
-#~ msgstr "canali"
-
 #, fuzzy
 #~ msgid "Default creator"
 #~ msgstr "Contenitore predefinito"
@@ -1456,9 +1487,6 @@ msgstr "Video"
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
-#~ msgid "Audio will be resampled from %dHz to %dHz\n"
-#~ msgstr "L'Audio sarà ricampionato da %dHz a %dHz\n"
-
 #~ msgid "Colour look-up table"
 #~ msgstr "Tabella per ricerca del colore"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index e792f84be..c4d3a7c2b 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/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: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-09-04 20:17+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -45,7 +45,11 @@ msgstr "-6dB"
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/video_panel.cc:193
+#: src/wx/audio_panel.cc:273
+msgid "1 channel"
+msgstr "1 channel"
+
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
@@ -106,13 +110,24 @@ msgstr "Voeg Bioscoop toe..."
 msgid "Add Screen..."
 msgstr "Voeg Scherm toe..."
 
-#: src/wx/content_panel.cc:67
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Voeg bestande(n) toe..."
 
-#: src/wx/content_panel.cc:69
-msgid "Add folder..."
-msgstr "Voeg map toe..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62
 msgid "Add..."
@@ -175,7 +190,16 @@ msgstr ""
 "Audio wordt doorgestuurd van content kanaal %d naar DCP kanaal %d met gain "
 "%1fdB."
 
-#: src/wx/config_dialog.cc:1022
+#: src/wx/audio_panel.cc:248
+#, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr ""
+
+#: src/wx/audio_panel.cc:253
+msgid "Audio will not be resampled."
+msgstr ""
+
+#: src/wx/config_dialog.cc:683
 msgid "BCC address"
 msgstr "BCC adres"
 
@@ -277,11 +301,11 @@ msgstr "Selecteer voor updates controle bij startup"
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
-#: src/wx/content_panel.cc:241
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Kies bestand(en)"
 
-#: src/wx/content_menu.cc:191 src/wx/content_panel.cc:264
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Kies map"
 
@@ -460,7 +484,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi serial numbers moeten bestaan uit 6 digits"
 
-#: src/wx/content_panel.cc:75
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Naar beneden"
 
@@ -618,6 +642,10 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Host naam of IP address"
 
+#: src/wx/audio_panel.cc:277
+msgid "Hz"
+msgstr "Hz"
+
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Ik wil dit afspelen met fader"
@@ -728,7 +756,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/content_panel.cc:438
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "ONTBREEKT:"
 
@@ -766,7 +794,15 @@ msgstr "Maximum JPEG2000 bandbreedte"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
+#: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Meedere content geselecteerd"
 
@@ -820,6 +856,10 @@ msgstr ""
 msgid "Organisational unit"
 msgstr ""
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Andere"
@@ -936,6 +976,10 @@ msgstr "Verwijder Bioscoop"
 msgid "Remove Screen"
 msgstr "Verwijder Scherm"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Herhaal"
@@ -1104,7 +1148,7 @@ msgstr "Ondertitel Taal (vb  NL)"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Ondersteund door"
 
@@ -1128,7 +1172,7 @@ msgstr "Grondgebied (vb NL)"
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Getest door"
 
@@ -1332,6 +1376,10 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
+#: src/wx/audio_panel.cc:275
+msgid "channels"
+msgstr "kanalen"
+
 #: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "tellen..."
@@ -1366,24 +1414,6 @@ msgstr "tijden"
 msgid "video"
 msgstr "video"
 
-#~ msgid "1 channel"
-#~ msgstr "1 channel"
-
-#~ msgid "Audio channels"
-#~ msgstr "Audio kanalen"
-
-#~ msgid "Could not decode video for view (%s)"
-#~ msgstr "Kan video niet decoderen voor preview (%s)"
-
-#~ msgid "Hz"
-#~ msgstr "Hz"
-
-#~ msgid "With Subtitles"
-#~ msgstr "Met ondertiteling"
-
-#~ msgid "channels"
-#~ msgstr "kanalen"
-
 #~ msgid "Default creator"
 #~ msgstr "Standaard maker"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 441643cce..e52360abd 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/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: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -44,7 +44,11 @@ msgstr ""
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/video_panel.cc:193
+#: src/wx/audio_panel.cc:273
+msgid "1 channel"
+msgstr "1 kanal"
+
+#: src/wx/video_panel.cc:197
 msgid "2D"
 msgstr "2D"
 
@@ -107,13 +111,24 @@ msgstr "Lägg till Cinema..."
 msgid "Add Screen..."
 msgstr "Lägg till Skärm..."
 
-#: src/wx/content_panel.cc:67
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Lägg till fil(er)..."
 
-#: src/wx/content_panel.cc:69
-msgid "Add folder..."
-msgstr "Lägg till folder..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/config_dialog.cc:597 src/wx/editable_list.h:62
 msgid "Add..."
@@ -169,7 +184,17 @@ msgstr ""
 "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d med "
 "förstärkning %.1fdB."
 
-#: src/wx/config_dialog.cc:1022
+#: src/wx/audio_panel.cc:248
+#, fuzzy, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr "Audio kommer att samplas om från %dHz till %dHz."
+
+#: src/wx/audio_panel.cc:253
+#, fuzzy
+msgid "Audio will not be resampled."
+msgstr "Audio kommer att samplas om från %dHz till %dHz."
+
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "IP-adress"
@@ -467,7 +492,7 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/content_panel.cc:75
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Ner"
 
@@ -629,6 +654,10 @@ msgstr "Dator"
 msgid "Host name or IP address"
 msgstr "Datornamn eller IP-adress"
 
+#: src/wx/audio_panel.cc:277
+msgid "Hz"
+msgstr "Hz"
+
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
@@ -744,7 +773,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Vs"
 
-#: src/wx/content_panel.cc:438
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
@@ -783,6 +812,14 @@ msgstr "JPEG2000-bandbredd"
 msgid "Mbit/s"
 msgstr ""
 
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
 # Låter mysko
 #: src/wx/video_panel.cc:301
 msgid "Multiple content selected"
@@ -839,6 +876,10 @@ msgstr "Längd"
 msgid "Organisational unit"
 msgstr ""
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr ""
@@ -957,6 +998,10 @@ msgstr "Ta bort Cinema"
 msgid "Remove Screen"
 msgstr "Ta bort Skärm"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Upprepa"
@@ -1131,7 +1176,7 @@ msgstr "Undertextspråk (ex. SV)"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Stöd från"
 
@@ -1156,7 +1201,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"
@@ -1202,7 +1247,7 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: src/wx/content_panel.cc:77
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Tidslinje..."
 
@@ -1248,7 +1293,7 @@ msgstr "okänt"
 msgid "Until"
 msgstr "Tills"
 
-#: src/wx/content_panel.cc:73
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Upp"
 
@@ -1368,6 +1413,10 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
+#: src/wx/audio_panel.cc:275
+msgid "channels"
+msgstr "kanaler"
+
 #: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "räknar..."
@@ -1403,23 +1452,8 @@ msgstr "tider"
 msgid "video"
 msgstr "video"
 
-#~ msgid "1 channel"
-#~ msgstr "1 kanal"
-
-#~ msgid "Audio channels"
-#~ msgstr "Audio-kanaler"
-
-#~ msgid "Could not decode video for view (%s)"
-#~ msgstr "Kunde inte avkoda video för visning (%s)"
-
-#~ msgid "Hz"
-#~ msgstr "Hz"
-
-#~ msgid "With Subtitles"
-#~ msgstr "Med Undertexter"
-
-#~ msgid "channels"
-#~ msgstr "kanaler"
+#~ msgid "Add folder..."
+#~ msgstr "Lägg till folder..."
 
 #, fuzzy
 #~ msgid "Default creator"
@@ -1489,9 +1523,6 @@ msgstr "video"
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
-#~ msgid "Audio will be resampled from %dHz to %dHz\n"
-#~ msgstr "Audio kommer att samplas om från %dHz till %dHz\n"
-
 #~ msgid "Colour look-up table"
 #~ msgstr "Färguppslagningstabell"
 
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index 13baef6b7..556e6f1b3 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -715,7 +715,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 				DCPTime const d = DCPTime (cv->content()->end() - new_position).abs ();
 				if (first || d < nearest_distance) {
 					nearest_distance = d;
-					nearest_new_position = cv->content()->end();
+					nearest_new_position = cv->content()->end() + DCPTime::delta ();
 				}
 			}
 			
@@ -727,7 +727,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 				
 				if (d < nearest_distance) {
 					nearest_distance = d;
-					nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim ();
+					nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim () - DCPTime::delta();
 				}
 			}
 			
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index 8ac90b8de..2da375ecd 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -31,6 +31,7 @@ using boost::shared_ptr;
 
 TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 	: wxDialog (cp->panel(), wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+	, _film (film)
 	, _timeline (this, cp, film)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
@@ -38,6 +39,8 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 	wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL);
 	_snap = new wxCheckBox (this, wxID_ANY, _("Snap"));
 	controls->Add (_snap);
+	_sequence_video = new wxCheckBox (this, wxID_ANY, _("Keep video in sequence"));
+	controls->Add (_sequence_video, 1, wxLEFT, 12);
 
 	sizer->Add (controls, 0, wxALL, 12);
 	sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
@@ -48,6 +51,10 @@ TimelineDialog::TimelineDialog (ContentPanel* cp, shared_ptr<Film> film)
 
 	_snap->SetValue (_timeline.snap ());
 	_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::snap_toggled, this));
+	film_changed (Film::SEQUENCE_VIDEO);
+	_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video_toggled, this));
+
+	film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
 }
 
 void
@@ -55,3 +62,27 @@ TimelineDialog::snap_toggled ()
 {
 	_timeline.set_snap (_snap->GetValue ());
 }
+
+void
+TimelineDialog::sequence_video_toggled ()
+{
+	shared_ptr<Film> film = _film.lock ();
+	if (!film) {
+		return;
+	}
+		
+	film->set_sequence_video (_sequence_video->GetValue ());
+}
+
+void
+TimelineDialog::film_changed (Film::Property p)
+{
+	shared_ptr<Film> film = _film.lock ();
+	if (!film) {
+		return;
+	}
+
+	if (p == Film::SEQUENCE_VIDEO) {
+		_sequence_video->SetValue (film->sequence_video ());
+	}
+}
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 2f5fa5ec7..802aaf245 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -31,7 +31,11 @@ public:
 
 private:
 	void snap_toggled ();
+	void sequence_video_toggled ();
+	void film_changed (Film::Property);
 	
+	boost::weak_ptr<Film> _film;
 	Timeline _timeline;
 	wxCheckBox* _snap;
+	wxCheckBox* _sequence_video;
 };
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index a8510cbba..569da6c8b 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -164,7 +164,8 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	grid->Add (_filters_button, wxGBPosition (r, 3), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	++r;
 	
-	add_label_to_grid_bag_sizer (grid, this, _("Colour conversion"), true, wxGBPosition (r, 0));
+	_enable_colour_conversion = new wxCheckBox (this, wxID_ANY, _("Colour conversion"));
+	grid->Add (_enable_colour_conversion, wxGBPosition (r, 0), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
 	_colour_conversion = new wxStaticText (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
 	grid->Add (_colour_conversion, wxGBPosition (r, 1), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL);
 	_colour_conversion_button = new wxButton (this, wxID_ANY, _("Edit..."));
@@ -201,6 +202,7 @@ VideoPanel::VideoPanel (ContentPanel* p)
 	_fade_out->Changed.connect (boost::bind (&VideoPanel::fade_out_changed, this));
 	
 	_filters_button->Bind           (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
+	_enable_colour_conversion->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&VideoPanel::enable_colour_conversion_clicked, this));
 	_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
 }
 
@@ -238,9 +240,21 @@ VideoPanel::film_content_changed (int property)
 	} else if (property == VideoContentProperty::VIDEO_FRAME_RATE) {
 		setup_description ();
 	} else if (property == VideoContentProperty::COLOUR_CONVERSION) {
-		optional<size_t> preset = vcs ? vcs->colour_conversion().preset () : optional<size_t> ();
-		vector<PresetColourConversion> cc = Config::instance()->colour_conversions ();
-		_colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
+		if (!vcs) {
+			_colour_conversion->SetLabel (wxT (""));
+		} else if (vcs->colour_conversion ()) {
+			optional<size_t> preset = vcs->colour_conversion().get().preset ();
+			vector<PresetColourConversion> cc = Config::instance()->colour_conversions ();
+			_colour_conversion->SetLabel (preset ? std_to_wx (cc[preset.get()].name) : _("Custom"));
+			_enable_colour_conversion->SetValue (true);
+			_colour_conversion->Enable (true);
+			_colour_conversion_button->Enable (true);
+		} else {
+			_colour_conversion->SetLabel (_("None"));
+			_enable_colour_conversion->SetValue (false);
+			_colour_conversion->Enable (false);
+			_colour_conversion_button->Enable (false);
+		}
 	} else if (property == FFmpegContentProperty::FILTERS) {
 		if (fcs) {
 			string const p = Filter::ffmpeg_string (fcs->filters ());
@@ -372,7 +386,11 @@ VideoPanel::edit_colour_conversion_clicked ()
 		return;
 	}
 
-	ColourConversion conversion = vc.front()->colour_conversion ();
+	if (!vc.front()->colour_conversion ()) {
+		return;
+	}
+
+	ColourConversion conversion = vc.front()->colour_conversion().get ();
 	ContentColourConversionDialog* d = new ContentColourConversionDialog (this);
 	d->set (conversion);
 	d->ShowModal ();
@@ -424,3 +442,18 @@ VideoPanel::fade_out_changed ()
 		(*i)->set_fade_out (_fade_out->get (_parent->film()->video_frame_rate ()));
 	}
 }
+
+void
+VideoPanel::enable_colour_conversion_clicked ()
+{
+	VideoContentList vc = _parent->selected_video ();
+	if (vc.size() != 1) {
+		return;
+	}
+
+	if (_enable_colour_conversion->GetValue()) {
+		vc.front()->set_default_colour_conversion ();
+	} else {
+		vc.front()->unset_colour_conversion ();
+	}
+}
diff --git a/src/wx/video_panel.h b/src/wx/video_panel.h
index aa0c6ed53..28d6aa4bb 100644
--- a/src/wx/video_panel.h
+++ b/src/wx/video_panel.h
@@ -45,6 +45,7 @@ public:
 
 private:
 	void edit_filters_clicked ();
+	void enable_colour_conversion_clicked ();
 	void edit_colour_conversion_clicked ();
 	void fade_in_changed ();
 	void fade_out_changed ();
@@ -62,6 +63,7 @@ private:
 	wxStaticText* _description;
 	wxStaticText* _filters;
 	wxButton* _filters_button;
+	wxCheckBox* _enable_colour_conversion;
 	wxStaticText* _colour_conversion;
 	wxButton* _colour_conversion_button;
 };