Merge master.

25 files changed, 2159 insertions, 907 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index ad1408cff..ca8d0bc53 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -70,6 +70,7 @@ Config::Config ()
 		)
 	, _check_for_updates (false)
 	, _check_for_test_updates (false)
+	, _maximum_j2k_bandwidth (250000000)
 {
 	_allowed_dcp_frame_rates.push_back (24);
 	_allowed_dcp_frame_rates.push_back (25);
@@ -185,6 +186,8 @@ Config::read ()
 
 	_check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false);
 	_check_for_test_updates = f.optional_bool_child("CheckForTestUpdates").get_value_or (false);
+
+	_maximum_j2k_bandwidth = f.optional_number_child<int> ("MaximumJ2KBandwidth").get_value_or (250000000);
 }
 
 void
@@ -362,6 +365,8 @@ Config::write () const
 	root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0");
 	root->add_child("CheckForTestUpdates")->add_child_text (_check_for_test_updates ? "1" : "0");
 
+	root->add_child("MaximumJ2KBandwidth")->add_child_text (lexical_cast<string> (_maximum_j2k_bandwidth));
+
 	doc.write_to_file_formatted (file(false).string ());
 }
 
@@ -387,3 +392,10 @@ Config::drop ()
 	delete _instance;
 	_instance = 0;
 }
+
+void
+Config::changed ()
+{
+	write ();
+	Changed ();
+}
diff --git a/src/lib/config.h b/src/lib/config.h
index 68aae7414..ee11dcadb 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@ public:
 
 	void set_use_any_servers (bool u) {
 		_use_any_servers = u;
-		write ();
+		changed ();
 	}
 
 	bool use_any_servers () const {
@@ -76,7 +76,7 @@ public:
 	/** @param s New list of servers */
 	void set_servers (std::vector<std::string> s) {
 		_servers = s;
-		write ();
+		changed ();
 	}
 
 	/** @return Host names / IP addresses of J2K encoding servers that should definitely be used */
@@ -89,7 +89,7 @@ public:
 		return _tms_ip;
 	}
 	
-	/** @return The path on a TMS that we should write DCPs to */
+	/** @return The path on a TMS that we should changed DCPs to */
 	std::string tms_path () const {
 		return _tms_path;
 	}
@@ -180,150 +180,162 @@ public:
 	bool check_for_test_updates () const {
 		return _check_for_test_updates;
 	}
+
+	int maximum_j2k_bandwidth () const {
+		return _maximum_j2k_bandwidth;
+	}
 	
 	/** @param n New number of local encoding threads */
 	void set_num_local_encoding_threads (int n) {
 		_num_local_encoding_threads = n;
-		write ();
+		changed ();
 	}
 
 	void set_default_directory (boost::filesystem::path d) {
 		_default_directory = d;
-		write ();
+		changed ();
 	}
 
 	/** @param p New server port */
 	void set_server_port_base (int p) {
 		_server_port_base = p;
-		write ();
+		changed ();
 	}
 
 	/** @param i IP address of a TMS that we can copy DCPs to */
 	void set_tms_ip (std::string i) {
 		_tms_ip = i;
-		write ();
+		changed ();
 	}
 
-	/** @param p Path on a TMS that we should write DCPs to */
+	/** @param p Path on a TMS that we should changed DCPs to */
 	void set_tms_path (std::string p) {
 		_tms_path = p;
-		write ();
+		changed ();
 	}
 
 	/** @param u User name to log into the TMS with */
 	void set_tms_user (std::string u) {
 		_tms_user = u;
-		write ();
+		changed ();
 	}
 
 	/** @param p Password to log into the TMS with */
 	void set_tms_password (std::string p) {
 		_tms_password = p;
-		write ();
+		changed ();
 	}
 
 	void add_cinema (boost::shared_ptr<Cinema> c) {
 		_cinemas.push_back (c);
+		changed ();
 	}
 
 	void remove_cinema (boost::shared_ptr<Cinema> c) {
 		_cinemas.remove (c);
+		changed ();
 	}
 
 	void set_allowed_dcp_frame_rates (std::list<int> const & r) {
 		_allowed_dcp_frame_rates = r;
-		write ();
+		changed ();
 	}
 
 	void set_default_dci_metadata (DCIMetadata d) {
 		_default_dci_metadata = d;
-		write ();
+		changed ();
 	}
 
 	void set_language (std::string l) {
 		_language = l;
-		write ();
+		changed ();
 	}
 
 	void unset_language () {
 		_language = boost::none;
-		write ();
+		changed ();
 	}
 
 	void set_default_still_length (int s) {
 		_default_still_length = s;
-		write ();
+		changed ();
 	}
 
 	void set_default_container (Ratio const * c) {
 		_default_container = c;
-		write ();
+		changed ();
 	}
 
 	void set_default_dcp_content_type (DCPContentType const * t) {
 		_default_dcp_content_type = t;
-		write ();
+		changed ();
 	}
 
 	void set_dcp_metadata (dcp::XMLMetadata m) {
 		_dcp_metadata = m;
-		write ();
+		changed ();
 	}
 
 	void set_default_j2k_bandwidth (int b) {
 		_default_j2k_bandwidth = b;
-		write ();
+		changed ();
 	}
 
 	void set_default_audio_delay (int d) {
 		_default_audio_delay = d;
-		write ();
+		changed ();
 	}
 
 	void set_colour_conversions (std::vector<PresetColourConversion> const & c) {
 		_colour_conversions = c;
-		write ();
+		changed ();
 	}
 
 	void set_mail_server (std::string s) {
 		_mail_server = s;
-		write ();
+		changed ();
 	}
 
 	void set_mail_user (std::string u) {
 		_mail_user = u;
-		write ();
+		changed ();
 	}
 
 	void set_mail_password (std::string p) {
 		_mail_password = p;
-		write ();
+		changed ();
 	}
 
 	void set_kdm_from (std::string f) {
 		_kdm_from = f;
-		write ();
+		changed ();
 	}
 
 	void set_kdm_email (std::string e) {
 		_kdm_email = e;
-		write ();
+		changed ();
 	}
 
 	void set_check_for_updates (bool c) {
 		_check_for_updates = c;
-		write ();
+		changed ();
 	}
 
 	void set_check_for_test_updates (bool c) {
 		_check_for_test_updates = c;
-		write ();
+		changed ();
 	}
-	
-	void write () const;
 
+	void set_maximum_j2k_bandwidth (int b) {
+		_maximum_j2k_bandwidth = b;
+		changed ();
+	}
+	
 	boost::filesystem::path signer_chain_directory () const;
 
+	void changed ();
+	boost::signals2::signal<void ()> Changed;
+
 	static Config* instance ();
 	static void drop ();
 
@@ -332,6 +344,7 @@ private:
 	boost::filesystem::path file (bool) const;
 	void read ();
 	void read_old_metadata ();
+	void write () const;
 
 	/** number of threads to use for J2K encoding on the local machine */
 	int _num_local_encoding_threads;
@@ -375,6 +388,8 @@ private:
 	/** true to check for updates on startup */
 	bool _check_for_updates;
 	bool _check_for_test_updates;
+	/** maximum allowed J2K bandwidth in bits per second */
+	int _maximum_j2k_bandwidth;
 
 	/** Singleton instance, or 0 */
 	static Config* _instance;
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 3044efd8d..2b7a2e18f 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
     Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
 
     This program is free software; you can redistribute it and/or modify
@@ -288,12 +288,7 @@ DCPVideoFrame::encode_remotely (ServerDescription serv)
 	stringstream xml;
 	doc.write_to_stream (xml, "UTF-8");
 
-	_log->log (String::compose (
-			   N_("Sending to remote; pixel format %1, components %2, lines (%3,%4,%5), line sizes (%6,%7,%8)"),
-			   _image->pixel_format(), _image->components(),
-			   _image->lines(0), _image->lines(1), _image->lines(2),
-			   _image->line_size()[0], _image->line_size()[1], _image->line_size()[2]
-			   ));
+	_log->log (String::compose (N_("Sending frame %1 to remote"), _frame));
 
 	socket->write (xml.str().length() + 1);
 	socket->write ((uint8_t *) xml.str().c_str(), xml.str().length() + 1);
diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 6b1c6a200..8f31b596e 100644
--- a/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@ -76,6 +76,7 @@ Encoder::~Encoder ()
 void
 Encoder::add_worker_threads (ServerDescription d)
 {
+	_film->log()->log (String::compose (N_("Adding %1 worker threads for remote %2"), d.host_name ()));
 	for (int i = 0; i < d.threads(); ++i) {
 		_threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, d)));
 	}
diff --git a/src/lib/film.cc b/src/lib/film.cc
index 79833b366..267138ce6 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -245,7 +245,12 @@ Film::make_dcp ()
 	if (dcp_name().find ("/") != string::npos) {
 		throw BadSettingError (_("name"), _("cannot contain slashes"));
 	}
-	
+
+	/* It seems to make sense to auto-save metadata here, since the make DCP may last
+	   a long time, and crashes/power failures are moderately likely.
+	 */
+	write_metadata ();
+
 	log()->log (String::compose ("DCP-o-matic %1 git %2 using %3", dcpomatic_version, dcpomatic_git_commit, dependency_version_summary()));
 
 	{
diff --git a/src/lib/internet.cc b/src/lib/internet.cc
new file mode 100644
index 000000000..c3f9dce65
--- /dev/null
+++ b/src/lib/internet.cc
@@ -0,0 +1,149 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <string>
+#include <boost/function.hpp>
+#include <boost/optional.hpp>
+#include <boost/filesystem.hpp>
+#include <curl/curl.h>
+#include <zip.h>
+#include "util.h"
+
+#include "i18n.h"
+
+using std::string;
+using std::stringstream;
+using std::list;
+using boost::optional;
+using boost::function;
+
+static size_t
+get_from_zip_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
+{
+	FILE* f = reinterpret_cast<FILE*> (stream);
+	return fwrite (buffer, size, nmemb, f);
+}
+
+/** @param url URL of ZIP file.
+ *  @param file Filename within ZIP file.
+ *  @param load Function passed a (temporary) filesystem path of the unpacked file.
+ */
+optional<string>
+get_from_zip_url (string url, string file, function<void (boost::filesystem::path)> load)
+{
+	/* Download the ZIP file to temp_zip */
+	CURL* curl = curl_easy_init ();
+	curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
+	
+	ScopedTemporary temp_zip;
+	FILE* f = temp_zip.open ("wb");
+	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_zip_url_data);
+	curl_easy_setopt (curl, CURLOPT_WRITEDATA, f);
+	curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
+
+	CURLcode const cr = curl_easy_perform (curl);
+
+	temp_zip.close ();
+	curl_easy_cleanup (curl);
+	if (cr != CURLE_OK) {
+		return String::compose (_("Download failed (%1/%2 error %3)"), url, file, cr);
+	}
+
+	/* Open the ZIP file and read `file' out of it */
+	
+	struct zip* zip = zip_open (temp_zip.c_str(), 0, 0);
+	if (!zip) {
+		return optional<string> (_("Could not open downloaded ZIP file"));
+	}
+	
+	struct zip_file* zip_file = zip_fopen (zip, file.c_str(), 0);
+	if (!zip_file) {
+		return optional<string> (_("Unexpected ZIP file contents"));
+	}
+	
+	ScopedTemporary temp_cert;
+	f = temp_cert.open ("wb");
+	char buffer[4096];
+	while (1) {
+		int const N = zip_fread (zip_file, buffer, sizeof (buffer));
+		fwrite (buffer, 1, N, f);
+		if (N < int (sizeof (buffer))) {
+			break;
+		}
+	}
+	temp_cert.close ();
+	
+	load (temp_cert.file ());
+	return optional<string> ();
+}
+
+
+static size_t
+ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
+{
+	string* s = reinterpret_cast<string *> (data);
+	uint8_t* b = reinterpret_cast<uint8_t *> (buffer);
+	for (size_t i = 0; i < (size * nmemb); ++i) {
+		*s += b[i];
+	}
+	return nmemb;
+}
+
+list<string>
+ftp_ls (string url)
+{
+	CURL* curl = curl_easy_init ();
+	if (!curl) {
+		return list<string> ();
+	}
+
+	if (url.substr (url.length() - 1, 1) != "/") {
+		url += "/";
+	}
+	curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
+
+	string ls_raw;
+	struct curl_slist* commands = 0;
+	commands = curl_slist_append (commands, "NLST");
+	curl_easy_setopt (curl, CURLOPT_POSTQUOTE, commands);
+	curl_easy_setopt (curl, CURLOPT_WRITEDATA, &ls_raw);
+	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ftp_ls_data);
+	curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
+	CURLcode const r = curl_easy_perform (curl);
+	if (r != CURLE_OK) {
+		return list<string> ();
+	}
+
+	stringstream s (ls_raw);
+	string line;
+	list<string> ls;
+	while (s.good ()) {
+		getline (s, line);
+		if (line.length() > 55) {
+			string const file = line.substr (55);
+			if (file != "." && file != "..") {
+				ls.push_back (file);
+			}
+		}
+	}
+
+	curl_easy_cleanup (curl);
+
+	return ls;
+}
diff --git a/src/lib/internet.h b/src/lib/internet.h
new file mode 100644
index 000000000..d7427fe48
--- /dev/null
+++ b/src/lib/internet.h
@@ -0,0 +1,25 @@
+/*
+    Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#include <boost/optional.hpp>
+#include <boost/function.hpp>
+#include <boost/filesystem.hpp>
+
+boost::optional<std::string> get_from_zip_url (std::string url, std::string file, boost::function<void (boost::filesystem::path)> load);
+std::list<std::string> ftp_ls (std::string dir);
diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index c46e65d8b..1e8a3319c 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -64,7 +64,7 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
-	if (property == ContentProperty::LENGTH) {
+	if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
 		maybe_sequence_video ();
 	}
 	
@@ -81,14 +81,21 @@ Playlist::maybe_sequence_video ()
 	_sequencing_video = true;
 	
 	ContentList cl = _content;
-	DCPTime next;
+	DCPTime next_left;
+	DCPTime next_right;
 	for (ContentList::iterator i = _content.begin(); i != _content.end(); ++i) {
-		if (!dynamic_pointer_cast<VideoContent> (*i)) {
+		shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (*i);
+		if (!vc) {
 			continue;
 		}
 		
-		(*i)->set_position (next);
-		next = (*i)->end() + DCPTime::delta ();
+		if (vc->video_frame_type() == VIDEO_FRAME_TYPE_3D_RIGHT) {
+			vc->set_position (next_right);
+			next_right = vc->end() + DCPTime::delta ();
+		} else {
+			vc->set_position (next_left);
+			next_left = vc->end() + DCPTime::delta ();
+		}
 	}
 
 	/* This won't change order, so it does not need a sort */
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index e0d48dab0..d602e9601 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-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-01-14 19:45+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,23 @@ msgstr ""
 "X-Generator: Poedit 1.6.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/lib/sndfile_content.cc:60
+#: src/lib/sndfile_content.cc:62
 msgid "%1 [audio]"
 msgstr "%1 [Ton]"
 
-#: src/lib/ffmpeg_content.cc:202
+#: src/lib/ffmpeg_content.cc:207
 msgid "%1 [movie]"
 msgstr "%1 [Film]"
 
-#: src/lib/sndfile_content.cc:81
+#: src/lib/sndfile_content.cc:83
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 Kanäle, %2kHz, %3 samples"
 
-#: src/lib/ffmpeg_content.cc:237
+#: src/lib/ffmpeg_content.cc:242
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 Bilder; %2 Bilder pro Sekunde"
 
-#: src/lib/video_content.cc:200
+#: src/lib/video_content.cc:205
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixel (%3:1)"
 
@@ -54,7 +54,7 @@ msgstr "1.66"
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/filter.cc:88
+#: src/lib/filter.cc:70
 msgid "3D denoiser"
 msgstr "3D Rauschunterdrückung"
 
@@ -70,7 +70,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Werbung"
 
-#: src/lib/job.cc:74
+#: src/lib/job.cc:71
 msgid "An error occurred whilst handling the file %1."
 msgstr "Beim bearbeiten der Datei %1 trat ein Fehler auf."
 
@@ -90,7 +90,7 @@ msgstr "Bi-Kubisch"
 msgid "Bilinear"
 msgstr "Bi-Liniar"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:322
 msgid "Cancelled"
 msgstr "Abgebrochen"
 
@@ -98,15 +98,15 @@ msgstr "Abgebrochen"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Cannot handle pixel format %1 during %2"
 
-#: src/lib/util.cc:768
+#: src/lib/util.cc:802
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:74
+#: src/lib/writer.cc:77
 msgid "Checking existing image data"
 msgstr "Überprüfe bestehende Bilddateien"
 
-#: src/lib/writer.cc:448
+#: src/lib/writer.cc:460
 msgid "Computing audio digest"
 msgstr "Ton berechnen"
 
@@ -114,11 +114,11 @@ msgstr "Ton berechnen"
 msgid "Computing digest"
 msgstr "Teil berechnen"
 
-#: src/lib/writer.cc:445
+#: src/lib/writer.cc:456
 msgid "Computing image digest"
 msgstr "Bild berechnen"
 
-#: src/lib/util.cc:798
+#: src/lib/util.cc:838
 msgid "Content and DCP have the same rate.\n"
 msgstr "Inhalt und DCP haben die selbe Rate.\n"
 
@@ -130,20 +130,21 @@ msgstr "Zusammengesetzter Inhalt muss die gleiche Tonverzögerung haben."
 msgid "Content to be joined must have the same audio gain."
 msgstr "Zusammengesetzter Inhalt muss den gleichen Tonpegel haben."
 
-#: src/lib/video_content.cc:133
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Farbumwandlung haben."
 
-#: src/lib/video_content.cc:125
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same crop."
 msgstr "Zusammengesetzter Inhalt muss das gleiche Beschneiden haben."
 
-#: src/lib/video_content.cc:113
+#: src/lib/video_content.cc:120
 msgid "Content to be joined must have the same picture size."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Bildgröße haben."
 
-#: src/lib/video_content.cc:129
-msgid "Content to be joined must have the same ratio."
+#: src/lib/video_content.cc:136
+#, fuzzy
+msgid "Content to be joined must have the same scale setting."
 msgstr "Zusammengesetzter Inhalt muss das geliche Verhältnis haben"
 
 #: src/lib/subtitle_content.cc:74
@@ -160,19 +161,19 @@ msgstr "Zusammengesetzter Inhalt muss den gleichen Untertitelversatz haben."
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Untertitelgröße haben."
 
-#: src/lib/video_content.cc:117
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Bildrate haben."
 
-#: src/lib/video_content.cc:121
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame type."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Bildart (z.B. 2D) haben."
 
-#: src/lib/ffmpeg_content.cc:107
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same audio stream."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Tonspur haben."
 
-#: src/lib/ffmpeg_content.cc:103
+#: src/lib/ffmpeg_content.cc:108
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Zusammengesetzter Inhalt muss die gleiche Untertitelspur haben."
 
@@ -180,47 +181,48 @@ msgstr "Zusammengesetzter Inhalt muss die gleiche Untertitelspur haben."
 msgid "Copy DCP to TMS"
 msgstr "DCP zu TMS übertragen"
 
-#: src/lib/scp_dcp_job.cc:129
+#: src/lib/scp_dcp_job.cc:135
 msgid "Could not connect to server %1 (%2)"
 msgstr "Keine Verbindung zu Server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:151
+#: src/lib/scp_dcp_job.cc:157
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Konnte nicht Remote Ordner %1 (%2) erstellen."
 
-#: src/lib/job.cc:94
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "%1 konnte nicht geöffnet werden."
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/scp_dcp_job.cc:182
 msgid "Could not open %1 to send"
 msgstr "%1 konnte nicht zum senden geöffnet werden"
 
-#: src/lib/film.cc:962
+#: src/lib/internet.cc:72
+#, fuzzy
+msgid "Could not open downloaded ZIP file"
+msgstr "Datei %1 kann nicht geöffnet werden."
+
+#: src/lib/film.cc:990
 msgid "Could not read DCP to make KDM for"
 msgstr "DCP konnte nicht zur Schlüsselerstellung geöffnet werden"
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_dcp_job.cc:152
 msgid "Could not start SCP session (%1)"
 msgstr "SCP Session (%1) konnte nicht gestartet werden"
 
-#: src/lib/scp_dcp_job.cc:190
+#: src/lib/scp_dcp_job.cc:196
 msgid "Could not write to remote file (%1)"
 msgstr "Remote Datei (%1) kann nicht gespeichert werden"
 
-#: src/lib/filter.cc:77
-msgid "Cubic interpolating deinterlacer"
-msgstr "Kubisch interpolierender Deinterlacer"
-
-#: src/lib/util.cc:810
+#: src/lib/util.cc:850
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "DCP läuft mit %1% der Orginal Geschwindigkeit.\n"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:841
 msgid "DCP will use every other frame of the content.\n"
 msgstr "DCP benutzt jedes ungerade Bild des Inhalts.\n"
 
-#: src/lib/job.cc:95
+#: src/lib/job.cc:91
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -228,14 +230,12 @@ msgstr ""
 "DCP-o-matic konnte die Datei %1 nicht öffnen. Vielleicht existiert sie nicht "
 "oder ist in einem unerwarteten Format."
 
-#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-msgid "De-blocking"
-msgstr "De-Blocking"
+#: src/lib/ffmpeg_content.cc:89
+msgid ""
+"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
+msgstr ""
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
-#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
-#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
+#: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
@@ -259,19 +259,19 @@ msgstr ""
 "Mit freundlichen Grüßen,\n"
 "DCP-o-matic"
 
-#: src/lib/filter.cc:74
-msgid "Deringing filter"
-msgstr "De-Ringer"
-
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 und CP750"
 
-#: src/lib/util.cc:803
+#: src/lib/internet.cc:65
+msgid "Download failed (%1/%2 error %3)"
+msgstr ""
+
+#: src/lib/util.cc:843
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Jedes Bild des Inhalts wird im DCP verdoppelt.\n"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:845
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Jedes Bild des Inhalts wird %1 mal im DCP wiederholt.\n"
 
@@ -279,11 +279,11 @@ msgstr "Jedes Bild des Inhalts wird %1 mal im DCP wiederholt.\n"
 msgid "Email KDMs for %1"
 msgstr "Email KDMs für %1"
 
-#: src/lib/writer.cc:115
+#: src/lib/writer.cc:120
 msgid "Encoding image data"
 msgstr "Bilddaten bearbeiten"
 
-#: src/lib/job.cc:314
+#: src/lib/job.cc:320
 msgid "Error (%1)"
 msgstr "Fehler (%1)"
 
@@ -291,23 +291,7 @@ msgstr "Fehler (%1)"
 msgid "Examine content"
 msgstr "Inhalt wird überprüft"
 
-#: src/lib/filter.cc:72
-msgid "Experimental horizontal deblocking filter 1"
-msgstr "Experimenteller horizontaler De-Blocker Filter 1"
-
-#: src/lib/filter.cc:73
-msgid "Experimental vertical deblocking filter 1"
-msgstr "Experimenteller vertikaler De-Blocker Filter 1"
-
-#: src/lib/filter.cc:79
-msgid "FFMPEG deinterlacer"
-msgstr "FFMPEG De-Interlacer"
-
-#: src/lib/filter.cc:80
-msgid "FIR low-pass deinterlacer"
-msgstr "FIR Tiefpass De-Interlacer"
-
-#: src/lib/scp_dcp_job.cc:139
+#: src/lib/scp_dcp_job.cc:145
 msgid "Failed to authenticate with server (%1)"
 msgstr "Authentifizierung mit Server (%1) fehlgeschlagen"
 
@@ -323,10 +307,6 @@ msgstr "Feature"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/filter.cc:85
-msgid "Force quantizer"
-msgstr "Quantizer erzwingen"
-
 #: src/lib/ratio.cc:43
 msgid "Full frame"
 msgstr "Ganzes Bild"
@@ -335,23 +315,19 @@ msgstr "Ganzes Bild"
 msgid "Gaussian"
 msgstr "Gauss Filter"
 
-#: src/lib/filter.cc:86
+#: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradient Debander"
 
-#: src/lib/filter.cc:89
+#: src/lib/util.cc:806
+msgid "Hearing impaired"
+msgstr ""
+
+#: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
 msgstr "3D Rauschunterdrückung Hoher Qualität"
 
-#: src/lib/filter.cc:68
-msgid "Horizontal deblocking filter"
-msgstr "Horizontaler De-Blocker"
-
-#: src/lib/filter.cc:70
-msgid "Horizontal deblocking filter A"
-msgstr "Horizontaler De-Blocker A"
-
-#: src/lib/job.cc:108 src/lib/job.cc:117
+#: src/lib/job.cc:111 src/lib/job.cc:121
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -359,7 +335,7 @@ msgstr ""
 "Dieser Fehler ist nicht bekannt. Am besten den Fehler an die DCP-o-matic "
 "Mailliste (carl@dcpomatic.com) schicken."
 
-#: src/lib/filter.cc:82
+#: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"
 msgstr "Kernel De-Interlacer"
 
@@ -367,45 +343,48 @@ msgstr "Kernel De-Interlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:766
+#: src/lib/util.cc:800
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:770
+#: src/lib/util.cc:808
+msgid "Left centre"
+msgstr ""
+
+#: src/lib/util.cc:810
+#, fuzzy
+msgid "Left rear surround"
+msgstr "Links Surround"
+
+#: src/lib/util.cc:804
 msgid "Left surround"
 msgstr "Links Surround"
 
-#: src/lib/util.cc:769
+#: src/lib/util.cc:803
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
-#: src/lib/filter.cc:75
-msgid "Linear blend deinterlacer"
-msgstr "Linear Blend De-Interlacer"
-
-#: src/lib/filter.cc:76
-msgid "Linear interpolating deinterlacer"
-msgstr "Linear interpolierender De-Interlacer"
-
-#: src/lib/filter.cc:78
-msgid "Median deinterlacer"
-msgstr "Median De-Interlacer"
-
-#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
-#: src/lib/filter.cc:87 src/lib/filter.cc:90
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: src/lib/filter.cc:81
+#: src/lib/filter.cc:65
 msgid "Motion compensating deinterlacer"
 msgstr "Kompensierender Bewegungsde-interlacer"
 
-#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
-#: src/lib/filter.cc:91
+#: src/lib/video_content.cc:447
+msgid "No scale"
+msgstr ""
+
+#: src/lib/video_content.cc:444
+msgid "No stretch"
+msgstr ""
+
+#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Rauschunterdrückung"
 
-#: src/lib/job.cc:312
+#: src/lib/job.cc:318
 msgid "OK (ran for %1)"
 msgstr "OK (Dauer %1)"
 
@@ -417,7 +396,11 @@ msgstr "Nur der erste Teil des Inhalts kann einen Anfangsschnitt haben."
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Nur das letzte Teil des Inhalts kann einen Endschnitt haben."
 
-#: src/lib/filter.cc:91
+#: src/lib/job.cc:103
+msgid "Out of memory"
+msgstr ""
+
+#: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
@@ -433,19 +416,28 @@ msgstr "Werbung"
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/config.cc:83 src/lib/config.cc:167
+#: src/lib/config.cc:84 src/lib/config.cc:168
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:767
+#: src/lib/util.cc:801
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:771
+#: src/lib/util.cc:809
+msgid "Right centre"
+msgstr ""
+
+#: src/lib/util.cc:811
+#, fuzzy
+msgid "Right rear surround"
+msgstr "Rechts Surround"
+
+#: src/lib/util.cc:805
 msgid "Right surround"
 msgstr "Rechts Surround"
 
-#: src/lib/scp_dcp_job.cc:134
+#: src/lib/scp_dcp_job.cc:140
 msgid "SSH error (%1)"
 msgstr "SSH Fehler (%1)"
 
@@ -469,19 +461,15 @@ msgstr "Spline"
 msgid "Teaser"
 msgstr "Teaser"
 
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:72
 msgid "Telecine filter"
 msgstr "Telecine Filter"
 
-#: src/lib/filter.cc:84
-msgid "Temporal noise reducer"
-msgstr "Temporale Rauschunterdrückung"
-
 #: src/lib/dcp_content_type.cc:47
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:80
+#: src/lib/job.cc:77
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -489,7 +477,21 @@ msgstr ""
 "Das Laufwer auf dem der Film gespeichert werden soll hat zu wenig Freien "
 "Speicher. Bitte Speicher freigeben und nochmals versuchen."
 
-#: src/lib/film.cc:385
+#: src/lib/job.cc:103
+msgid "There was not enough memory to do this."
+msgstr ""
+
+#: src/lib/film.cc:406
+#, fuzzy
+msgid ""
+"This film was created with a newer version of DCP-o-matic, and it cannot be "
+"loaded into this version.  Sorry!"
+msgstr ""
+"Dieser Film wurde mit einer alten DCP-o-matic Version erstellt und kann "
+"leider nicht in dieser Version geladen werden. Sie müssen den Film neu "
+"erstellen. Entschuldigung !"
+
+#: src/lib/film.cc:398
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -511,15 +513,19 @@ msgstr "Wandle %1 um."
 msgid "Transitional"
 msgstr "Übergang"
 
-#: src/lib/job.cc:116
+#: src/lib/internet.cc:77
+msgid "Unexpected ZIP file contents"
+msgstr ""
+
+#: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/lib/ffmpeg_decoder.cc:274
+#: src/lib/ffmpeg_decoder.cc:291
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Ton Sample Format (%1) nicht erkannt."
 
-#: src/lib/filter.cc:87
+#: src/lib/filter.cc:69
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Maske mit Gausscher Unschärfe"
 
@@ -527,13 +533,9 @@ msgstr "Maske mit Gausscher Unschärfe"
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/lib/filter.cc:69
-msgid "Vertical deblocking filter"
-msgstr "Vertikaler De-Blocker"
-
-#: src/lib/filter.cc:71
-msgid "Vertical deblocking filter A"
-msgstr "Vertikaler De-Blocker A"
+#: src/lib/util.cc:807
+msgid "Visually impaired"
+msgstr ""
 
 #: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
@@ -543,11 +545,11 @@ msgstr "Warte..."
 msgid "X"
 msgstr "X"
 
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Noch ein anderer De-Interlacer"
 
-#: src/lib/film.cc:289
+#: src/lib/film.cc:299
 msgid "You must add some content to the DCP before creating it"
 msgstr "Sie müssen einen Inhalt hinzufügen bevor Sie ein DCP erstellen können."
 
@@ -559,27 +561,27 @@ msgstr "[Bewegte Bilder]"
 msgid "[still]"
 msgstr "[Standbild]"
 
-#: src/lib/film.cc:242
+#: src/lib/film.cc:247
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:581
 msgid "connect timed out"
 msgstr "Zeit zur Verbindung abgelaufen"
 
-#: src/lib/scp_dcp_job.cc:120
+#: src/lib/scp_dcp_job.cc:126
 msgid "connecting"
 msgstr "verbinde..."
 
-#: src/lib/film.cc:285
+#: src/lib/film.cc:295
 msgid "container"
 msgstr "Container"
 
-#: src/lib/film.cc:293
+#: src/lib/film.cc:303
 msgid "content type"
 msgstr "Inhalt Typ"
 
-#: src/lib/scp_dcp_job.cc:169
+#: src/lib/scp_dcp_job.cc:175
 msgid "copying %1"
 msgstr "kopiere %1"
 
@@ -587,7 +589,7 @@ msgstr "kopiere %1"
 msgid "could not create file %1"
 msgstr "Datei %1 kann nicht erstellt werden."
 
-#: src/lib/ffmpeg.cc:175
+#: src/lib/ffmpeg.cc:176
 msgid "could not find audio decoder"
 msgstr "Kein Ton Decoder gefunden."
 
@@ -595,19 +597,15 @@ msgstr "Kein Ton Decoder gefunden."
 msgid "could not find stream information"
 msgstr "Keine Spur-Information gefunden"
 
-#: src/lib/ffmpeg_decoder.cc:527
-msgid "could not find subtitle decoder"
-msgstr "Untertitel-Decoder nicht gefunden"
-
-#: src/lib/ffmpeg.cc:154
+#: src/lib/ffmpeg.cc:155
 msgid "could not find video decoder"
 msgstr "Bild-Decoder nicht gefunden"
 
-#: src/lib/writer.cc:414
+#: src/lib/writer.cc:424
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
-#: src/lib/sndfile_decoder.cc:45
+#: src/lib/sndfile_decoder.cc:56
 msgid "could not open audio file for reading"
 msgstr "Tondatei kann nicht zum lesen geöffnet werden."
 
@@ -615,11 +613,11 @@ msgstr "Tondatei kann nicht zum lesen geöffnet werden."
 msgid "could not open file %1"
 msgstr "Datei %1 kann nicht geöffnet werden."
 
-#: src/lib/dcp_video_frame.cc:357
+#: src/lib/dcp_video_frame.cc:352
 msgid "could not open file for reading"
 msgstr "Datei konnte nicht zum lesen geöffnet werden."
 
-#: src/lib/dcp_video_frame.cc:363
+#: src/lib/dcp_video_frame.cc:358
 msgid "could not read encoded data"
 msgstr "Encodier Daten nicht gefunden."
 
@@ -647,43 +645,43 @@ msgstr "SSH Session kann nicht gestartet werden"
 msgid "could not write to file %1 (%2)"
 msgstr "Datei %1 kann nicht geschrieben werden (%2)"
 
-#: src/lib/util.cc:568
+#: src/lib/util.cc:601
 msgid "error during async_accept (%1)"
 msgstr "error during async_accept (%1)"
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:577
 msgid "error during async_connect (%1)"
 msgstr "error during async_connect (%1)"
 
-#: src/lib/util.cc:617
+#: src/lib/util.cc:650
 msgid "error during async_read (%1)"
 msgstr "error during async_read (%1)"
 
-#: src/lib/util.cc:589
+#: src/lib/util.cc:622
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/transcode_job.cc:100
 msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
-#: src/lib/util.cc:148
+#: src/lib/util.cc:152
 msgid "hour"
 msgstr "Stunde"
 
-#: src/lib/util.cc:145 src/lib/util.cc:150
+#: src/lib/util.cc:149 src/lib/util.cc:154
 msgid "hours"
 msgstr "Stunden"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:159
 msgid "minute"
 msgstr "Minute"
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:161
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/lib/util.cc:689
+#: src/lib/util.cc:722
 msgid "missing key %1 in key-value set"
 msgstr "Key %1 in Key-value set fehlt"
 
@@ -695,33 +693,33 @@ msgstr "Benötigte Einstellung %1 fehlt"
 msgid "moving"
 msgstr "wird verschoben"
 
-#: src/lib/ffmpeg_decoder.cc:559
+#: src/lib/ffmpeg_decoder.cc:575
 msgid "multi-part subtitles not yet supported"
 msgstr "Multi-Part Untertitel noch nicht unterstützt"
 
-#: src/lib/film.cc:242 src/lib/film.cc:297
+#: src/lib/film.cc:247 src/lib/film.cc:307
 msgid "name"
 msgstr "Name"
 
-#: src/lib/ffmpeg_decoder.cc:574
+#: src/lib/ffmpeg_decoder.cc:590
 msgid "non-bitmap subtitles not yet supported"
 msgstr "Nur Bitmap Untertitel werden unterstützt"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:309
+#: src/lib/job.cc:315
 msgid "remaining"
 msgstr "verbleibend"
 
-#: src/lib/config.cc:81 src/lib/video_content.cc:169
+#: src/lib/config.cc:82 src/lib/video_content.cc:174
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:82
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB nicht linearisiert"
 
-#: src/lib/util.cc:160
+#: src/lib/util.cc:164
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -733,6 +731,57 @@ msgstr "Standbild"
 msgid "unknown"
 msgstr "unbekannt"
 
+#~ msgid "Cubic interpolating deinterlacer"
+#~ msgstr "Kubisch interpolierender Deinterlacer"
+
+#~ msgid "De-blocking"
+#~ msgstr "De-Blocking"
+
+#~ msgid "Deringing filter"
+#~ msgstr "De-Ringer"
+
+#~ msgid "Experimental horizontal deblocking filter 1"
+#~ msgstr "Experimenteller horizontaler De-Blocker Filter 1"
+
+#~ msgid "Experimental vertical deblocking filter 1"
+#~ msgstr "Experimenteller vertikaler De-Blocker Filter 1"
+
+#~ msgid "FFMPEG deinterlacer"
+#~ msgstr "FFMPEG De-Interlacer"
+
+#~ msgid "FIR low-pass deinterlacer"
+#~ msgstr "FIR Tiefpass De-Interlacer"
+
+#~ msgid "Force quantizer"
+#~ msgstr "Quantizer erzwingen"
+
+#~ msgid "Horizontal deblocking filter"
+#~ msgstr "Horizontaler De-Blocker"
+
+#~ msgid "Horizontal deblocking filter A"
+#~ msgstr "Horizontaler De-Blocker A"
+
+#~ msgid "Linear blend deinterlacer"
+#~ msgstr "Linear Blend De-Interlacer"
+
+#~ msgid "Linear interpolating deinterlacer"
+#~ msgstr "Linear interpolierender De-Interlacer"
+
+#~ msgid "Median deinterlacer"
+#~ msgstr "Median De-Interlacer"
+
+#~ msgid "Temporal noise reducer"
+#~ msgstr "Temporale Rauschunterdrückung"
+
+#~ msgid "Vertical deblocking filter"
+#~ msgstr "Vertikaler De-Blocker"
+
+#~ msgid "Vertical deblocking filter A"
+#~ msgstr "Vertikaler De-Blocker A"
+
+#~ msgid "could not find subtitle decoder"
+#~ msgstr "Untertitel-Decoder nicht gefunden"
+
 #~ msgid "0%"
 #~ msgstr "0%"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 5cc2af307..5144bbb0f 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-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2013-11-09 03:09-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,24 +17,24 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: src/lib/sndfile_content.cc:60
+#: src/lib/sndfile_content.cc:62
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:202
+#: src/lib/ffmpeg_content.cc:207
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:81
+#: src/lib/sndfile_content.cc:83
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:237
+#: src/lib/ffmpeg_content.cc:242
 #, fuzzy
 msgid "%1 frames; %2 frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/video_content.cc:200
+#: src/lib/video_content.cc:205
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -54,7 +54,7 @@ msgstr "1.66"
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/filter.cc:88
+#: src/lib/filter.cc:70
 msgid "3D denoiser"
 msgstr "reducción de ruido 3D"
 
@@ -70,7 +70,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/job.cc:74
+#: src/lib/job.cc:71
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
@@ -91,7 +91,7 @@ msgstr "Bicúbico"
 msgid "Bilinear"
 msgstr "Bilineal"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:322
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -99,15 +99,15 @@ 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:768
+#: src/lib/util.cc:802
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:74
+#: src/lib/writer.cc:77
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:448
+#: src/lib/writer.cc:460
 msgid "Computing audio digest"
 msgstr ""
 
@@ -115,11 +115,11 @@ msgstr ""
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:445
+#: src/lib/writer.cc:456
 msgid "Computing image digest"
 msgstr ""
 
-#: src/lib/util.cc:798
+#: src/lib/util.cc:838
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
@@ -132,21 +132,22 @@ msgstr ""
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
-#: src/lib/video_content.cc:133
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same colour conversion."
 msgstr ""
 
-#: src/lib/video_content.cc:125
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same crop."
 msgstr ""
 
-#: src/lib/video_content.cc:113
+#: src/lib/video_content.cc:120
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/video_content.cc:129
-msgid "Content to be joined must have the same ratio."
-msgstr ""
+#: src/lib/video_content.cc:136
+#, fuzzy
+msgid "Content to be joined must have the same scale setting."
+msgstr "La fuente y el DCP tienen la misma velocidad."
 
 #: src/lib/subtitle_content.cc:74
 #, fuzzy
@@ -162,19 +163,19 @@ msgstr "La fuente y el DCP tienen la misma velocidad."
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
-#: src/lib/video_content.cc:117
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same video frame rate."
 msgstr ""
 
-#: src/lib/video_content.cc:121
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:107
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same audio stream."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:103
+#: src/lib/ffmpeg_content.cc:108
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
@@ -182,50 +183,51 @@ msgstr ""
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:129
+#: src/lib/scp_dcp_job.cc:135
 msgid "Could not connect to server %1 (%2)"
 msgstr "No se pudo conectar al servidor %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:151
+#: src/lib/scp_dcp_job.cc:157
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/job.cc:94
+#: src/lib/job.cc:90
 #, fuzzy
 msgid "Could not open %1"
 msgstr "no se pudo abrir el fichero %1"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/scp_dcp_job.cc:182
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
-#: src/lib/film.cc:962
+#: src/lib/internet.cc:72
+#, fuzzy
+msgid "Could not open downloaded ZIP file"
+msgstr "no se pudo abrir el fichero %1"
+
+#: src/lib/film.cc:990
 msgid "Could not read DCP to make KDM for"
 msgstr "No se pudo leer el DCP para hacer el KDM"
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_dcp_job.cc:152
 msgid "Could not start SCP session (%1)"
 msgstr "No se pudo iniciar la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:190
+#: src/lib/scp_dcp_job.cc:196
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/filter.cc:77
-msgid "Cubic interpolating deinterlacer"
-msgstr "Desentrelazado por interpolación cúbica"
-
-#: src/lib/util.cc:810
+#: src/lib/util.cc:850
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:841
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
 
-#: src/lib/job.cc:95
+#: src/lib/job.cc:91
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -233,14 +235,12 @@ msgstr ""
 "DCP-o-matic no pudo abrir el fichero %1. Quizás no existe o está en un "
 "formato inesperado."
 
-#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-msgid "De-blocking"
-msgstr "De-blocking"
+#: src/lib/ffmpeg_content.cc:89
+msgid ""
+"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
+msgstr ""
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
-#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
-#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
+#: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
@@ -256,21 +256,21 @@ msgid ""
 "DCP-o-matic"
 msgstr ""
 
-#: src/lib/filter.cc:74
-msgid "Deringing filter"
-msgstr "Deringing filter"
-
 #: src/lib/dolby_cp750.cc:27
 #, fuzzy
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:803
+#: src/lib/internet.cc:65
+msgid "Download failed (%1/%2 error %3)"
+msgstr ""
+
+#: src/lib/util.cc:843
 #, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:845
 #, fuzzy
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
@@ -279,11 +279,11 @@ msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 msgid "Email KDMs for %1"
 msgstr ""
 
-#: src/lib/writer.cc:115
+#: src/lib/writer.cc:120
 msgid "Encoding image data"
 msgstr ""
 
-#: src/lib/job.cc:314
+#: src/lib/job.cc:320
 msgid "Error (%1)"
 msgstr "Error (%1)"
 
@@ -291,23 +291,7 @@ msgstr "Error (%1)"
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/filter.cc:72
-msgid "Experimental horizontal deblocking filter 1"
-msgstr "Experimental horizontal deblocking filter 1"
-
-#: src/lib/filter.cc:73
-msgid "Experimental vertical deblocking filter 1"
-msgstr "Experimental vertical deblocking filter 1"
-
-#: src/lib/filter.cc:79
-msgid "FFMPEG deinterlacer"
-msgstr "Desentrelazado FFMPEG"
-
-#: src/lib/filter.cc:80
-msgid "FIR low-pass deinterlacer"
-msgstr "Desentrelazado paso bajo FIR"
-
-#: src/lib/scp_dcp_job.cc:139
+#: src/lib/scp_dcp_job.cc:145
 msgid "Failed to authenticate with server (%1)"
 msgstr "Fallo al identificarse con el servidor (%1)"
 
@@ -323,10 +307,6 @@ msgstr "Película"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/filter.cc:85
-msgid "Force quantizer"
-msgstr "Force quantizer"
-
 #: src/lib/ratio.cc:43
 msgid "Full frame"
 msgstr ""
@@ -335,23 +315,19 @@ msgstr ""
 msgid "Gaussian"
 msgstr "Gaussiano"
 
-#: src/lib/filter.cc:86
+#: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/filter.cc:89
+#: src/lib/util.cc:806
+msgid "Hearing impaired"
+msgstr ""
+
+#: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
 msgstr "Reductor de ruido 3D de alta calidad"
 
-#: src/lib/filter.cc:68
-msgid "Horizontal deblocking filter"
-msgstr "Horizontal deblocking filter"
-
-#: src/lib/filter.cc:70
-msgid "Horizontal deblocking filter A"
-msgstr "Horizontal deblocking filter A"
-
-#: src/lib/job.cc:108 src/lib/job.cc:117
+#: src/lib/job.cc:111 src/lib/job.cc:121
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -359,7 +335,7 @@ msgstr ""
 "Error desconocido. La mejor idea es informar del problema a la lista de "
 "correo de DCP-o-matic (carl@dcpomatic.com)"
 
-#: src/lib/filter.cc:82
+#: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
@@ -367,45 +343,49 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:766
+#: src/lib/util.cc:800
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:770
+#: src/lib/util.cc:808
+msgid "Left centre"
+msgstr ""
+
+#: src/lib/util.cc:810
+#, fuzzy
+msgid "Left rear surround"
+msgstr "Surround izquierda"
+
+#: src/lib/util.cc:804
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:769
+#: src/lib/util.cc:803
 msgid "Lfe (sub)"
 msgstr ""
 
-#: src/lib/filter.cc:75
-msgid "Linear blend deinterlacer"
-msgstr "Linear blend deinterlacer"
-
-#: src/lib/filter.cc:76
-msgid "Linear interpolating deinterlacer"
-msgstr "Linear interpolating deinterlacer"
-
-#: src/lib/filter.cc:78
-msgid "Median deinterlacer"
-msgstr "Median deinterlacer"
-
-#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
-#: src/lib/filter.cc:87 src/lib/filter.cc:90
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
 msgid "Misc"
 msgstr "Miscelánea"
 
-#: src/lib/filter.cc:81
+#: src/lib/filter.cc:65
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
-#: src/lib/filter.cc:91
+#: src/lib/video_content.cc:447
+msgid "No scale"
+msgstr ""
+
+#: src/lib/video_content.cc:444
+#, fuzzy
+msgid "No stretch"
+msgstr "Flat sin deformación"
+
+#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:312
+#: src/lib/job.cc:318
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
@@ -417,7 +397,11 @@ msgstr ""
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 
-#: src/lib/filter.cc:91
+#: src/lib/job.cc:103
+msgid "Out of memory"
+msgstr ""
+
+#: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
@@ -433,20 +417,29 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:83 src/lib/config.cc:167
+#: src/lib/config.cc:84 src/lib/config.cc:168
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:767
+#: src/lib/util.cc:801
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:771
+#: src/lib/util.cc:809
+msgid "Right centre"
+msgstr ""
+
+#: src/lib/util.cc:811
+#, fuzzy
+msgid "Right rear surround"
+msgstr "Surround derecha"
+
+#: src/lib/util.cc:805
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/scp_dcp_job.cc:134
+#: src/lib/scp_dcp_job.cc:140
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
@@ -470,19 +463,15 @@ msgstr "Spline"
 msgid "Teaser"
 msgstr "Teaser"
 
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:72
 msgid "Telecine filter"
 msgstr "Filtro telecine"
 
-#: src/lib/filter.cc:84
-msgid "Temporal noise reducer"
-msgstr "Temporal noise reducer"
-
 #: src/lib/dcp_content_type.cc:47
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:80
+#: src/lib/job.cc:77
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -490,7 +479,21 @@ msgstr ""
 "En el dispositivo donde se encuentra la película queda poco espacio. Libere "
 "espacio en el disco y pruebe de nuevo."
 
-#: src/lib/film.cc:385
+#: src/lib/job.cc:103
+msgid "There was not enough memory to do this."
+msgstr ""
+
+#: src/lib/film.cc:406
+#, fuzzy
+msgid ""
+"This film was created with a newer version of DCP-o-matic, and it cannot be "
+"loaded into this version.  Sorry!"
+msgstr ""
+"Esta película se creó con una versión antigua de DCP-o-matic, y "
+"desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
+"volver a añadir y configurar ton contenido. ¡Lo siento!"
+
+#: src/lib/film.cc:398
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -512,15 +515,19 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:116
+#: src/lib/internet.cc:77
+msgid "Unexpected ZIP file contents"
+msgstr ""
+
+#: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:274
+#: src/lib/ffmpeg_decoder.cc:291
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
-#: src/lib/filter.cc:87
+#: src/lib/filter.cc:69
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
@@ -528,13 +535,9 @@ msgstr "Máscara de desenfoque Gaussiano"
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/filter.cc:69
-msgid "Vertical deblocking filter"
-msgstr "Vertical deblocking filter"
-
-#: src/lib/filter.cc:71
-msgid "Vertical deblocking filter A"
-msgstr "Vertical deblocking filter A"
+#: src/lib/util.cc:807
+msgid "Visually impaired"
+msgstr ""
 
 #: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
@@ -544,11 +547,11 @@ msgstr "Esperando"
 msgid "X"
 msgstr "X"
 
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:289
+#: src/lib/film.cc:299
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
@@ -561,28 +564,28 @@ msgstr ""
 msgid "[still]"
 msgstr "imagen fija"
 
-#: src/lib/film.cc:242
+#: src/lib/film.cc:247
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:581
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
-#: src/lib/scp_dcp_job.cc:120
+#: src/lib/scp_dcp_job.cc:126
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:285
+#: src/lib/film.cc:295
 #, fuzzy
 msgid "container"
 msgstr "contenido"
 
-#: src/lib/film.cc:293
+#: src/lib/film.cc:303
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: src/lib/scp_dcp_job.cc:169
+#: src/lib/scp_dcp_job.cc:175
 msgid "copying %1"
 msgstr "copiando %1"
 
@@ -591,7 +594,7 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/ffmpeg.cc:175
+#: src/lib/ffmpeg.cc:176
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
 
@@ -599,19 +602,15 @@ msgstr "no se encontró el decodificador de audio"
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg_decoder.cc:527
-msgid "could not find subtitle decoder"
-msgstr "no se pudo encontrar decodificador de subtítutlos"
-
-#: src/lib/ffmpeg.cc:154
+#: src/lib/ffmpeg.cc:155
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
-#: src/lib/writer.cc:414
+#: src/lib/writer.cc:424
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr ""
 
-#: src/lib/sndfile_decoder.cc:45
+#: src/lib/sndfile_decoder.cc:56
 #, fuzzy
 msgid "could not open audio file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
@@ -621,11 +620,11 @@ msgstr "no se pudo abrir el fichero para lectura"
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero %1"
 
-#: src/lib/dcp_video_frame.cc:357
+#: src/lib/dcp_video_frame.cc:352
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/dcp_video_frame.cc:363
+#: src/lib/dcp_video_frame.cc:358
 #, fuzzy
 msgid "could not read encoded data"
 msgstr "no se encontró el decodificador de audio"
@@ -657,43 +656,43 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/util.cc:568
+#: src/lib/util.cc:601
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:577
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:617
+#: src/lib/util.cc:650
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:589
+#: src/lib/util.cc:622
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/transcode_job.cc:100
 msgid "frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/util.cc:148
+#: src/lib/util.cc:152
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:145 src/lib/util.cc:150
+#: src/lib/util.cc:149 src/lib/util.cc:154
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:159
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:161
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:689
+#: src/lib/util.cc:722
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -705,33 +704,33 @@ msgstr "falta una configuración obligatoria %1"
 msgid "moving"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:559
+#: src/lib/ffmpeg_decoder.cc:575
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:242 src/lib/film.cc:297
+#: src/lib/film.cc:247 src/lib/film.cc:307
 msgid "name"
 msgstr "nombre"
 
-#: src/lib/ffmpeg_decoder.cc:574
+#: src/lib/ffmpeg_decoder.cc:590
 msgid "non-bitmap subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:309
+#: src/lib/job.cc:315
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/config.cc:81 src/lib/video_content.cc:169
+#: src/lib/config.cc:82 src/lib/video_content.cc:174
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:82
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
-#: src/lib/util.cc:160
+#: src/lib/util.cc:164
 msgid "seconds"
 msgstr "segundos"
 
@@ -745,6 +744,57 @@ msgstr "imagen fija"
 msgid "unknown"
 msgstr "Error desconocido"
 
+#~ msgid "Cubic interpolating deinterlacer"
+#~ msgstr "Desentrelazado por interpolación cúbica"
+
+#~ msgid "De-blocking"
+#~ msgstr "De-blocking"
+
+#~ msgid "Deringing filter"
+#~ msgstr "Deringing filter"
+
+#~ msgid "Experimental horizontal deblocking filter 1"
+#~ msgstr "Experimental horizontal deblocking filter 1"
+
+#~ msgid "Experimental vertical deblocking filter 1"
+#~ msgstr "Experimental vertical deblocking filter 1"
+
+#~ msgid "FFMPEG deinterlacer"
+#~ msgstr "Desentrelazado FFMPEG"
+
+#~ msgid "FIR low-pass deinterlacer"
+#~ msgstr "Desentrelazado paso bajo FIR"
+
+#~ msgid "Force quantizer"
+#~ msgstr "Force quantizer"
+
+#~ msgid "Horizontal deblocking filter"
+#~ msgstr "Horizontal deblocking filter"
+
+#~ msgid "Horizontal deblocking filter A"
+#~ msgstr "Horizontal deblocking filter A"
+
+#~ msgid "Linear blend deinterlacer"
+#~ msgstr "Linear blend deinterlacer"
+
+#~ msgid "Linear interpolating deinterlacer"
+#~ msgstr "Linear interpolating deinterlacer"
+
+#~ msgid "Median deinterlacer"
+#~ msgstr "Median deinterlacer"
+
+#~ msgid "Temporal noise reducer"
+#~ msgstr "Temporal noise reducer"
+
+#~ msgid "Vertical deblocking filter"
+#~ msgstr "Vertical deblocking filter"
+
+#~ msgid "Vertical deblocking filter A"
+#~ msgstr "Vertical deblocking filter A"
+
+#~ msgid "could not find subtitle decoder"
+#~ msgstr "no se pudo encontrar decodificador de subtítutlos"
+
 #~ msgid "0%"
 #~ msgstr "0%"
 
@@ -801,9 +851,6 @@ msgstr "Error desconocido"
 #~ msgid "Examine content of %1"
 #~ msgstr "Examinar contenido de %1"
 
-#~ msgid "Flat without stretch"
-#~ msgstr "Flat sin deformación"
-
 #~ msgid "Scope without stretch"
 #~ msgstr "Scope sin deformación"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 0a9936e4b..940db7988 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-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-01-25 16:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/sndfile_content.cc:60
+#: src/lib/sndfile_content.cc:62
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:202
+#: src/lib/ffmpeg_content.cc:207
 msgid "%1 [movie]"
 msgstr "%1 [vidéo]"
 
-#: src/lib/sndfile_content.cc:81
+#: src/lib/sndfile_content.cc:83
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 canaux, %2kHz, %3 samples"
 
-#: src/lib/ffmpeg_content.cc:237
+#: src/lib/ffmpeg_content.cc:242
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 images ; %2 images par seconde"
 
-#: src/lib/video_content.cc:200
+#: src/lib/video_content.cc:205
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -53,7 +53,7 @@ msgstr "1.66"
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/filter.cc:88
+#: src/lib/filter.cc:70
 msgid "3D denoiser"
 msgstr "Débruitage 3D"
 
@@ -69,7 +69,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Advertisement"
 
-#: src/lib/job.cc:74
+#: src/lib/job.cc:71
 msgid "An error occurred whilst handling the file %1."
 msgstr "Une erreur s'est produite lors du traitement du fichier %1."
 
@@ -90,7 +90,7 @@ msgstr "Bicubique"
 msgid "Bilinear"
 msgstr "Bilinéaire"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:322
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -98,15 +98,15 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:768
+#: src/lib/util.cc:802
 msgid "Centre"
 msgstr "Centre"
 
-#: src/lib/writer.cc:74
+#: src/lib/writer.cc:77
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/writer.cc:448
+#: src/lib/writer.cc:460
 msgid "Computing audio digest"
 msgstr "Fabrication rendu audio"
 
@@ -114,11 +114,11 @@ msgstr "Fabrication rendu audio"
 msgid "Computing digest"
 msgstr "fabrication rendu"
 
-#: src/lib/writer.cc:445
+#: src/lib/writer.cc:456
 msgid "Computing image digest"
 msgstr "Fabrication rendu image"
 
-#: src/lib/util.cc:798
+#: src/lib/util.cc:838
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "Le DCP et la source ont les mêmes cadences.\n"
@@ -131,21 +131,22 @@ msgstr ""
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
-#: src/lib/video_content.cc:133
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same colour conversion."
 msgstr ""
 
-#: src/lib/video_content.cc:125
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same crop."
 msgstr ""
 
-#: src/lib/video_content.cc:113
+#: src/lib/video_content.cc:120
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/video_content.cc:129
-msgid "Content to be joined must have the same ratio."
-msgstr ""
+#: src/lib/video_content.cc:136
+#, fuzzy
+msgid "Content to be joined must have the same scale setting."
+msgstr "Le DCP et la source ont les mêmes cadences."
 
 #: src/lib/subtitle_content.cc:74
 #, fuzzy
@@ -161,19 +162,19 @@ msgstr "Le DCP et la source ont les mêmes cadences."
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
-#: src/lib/video_content.cc:117
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same video frame rate."
 msgstr ""
 
-#: src/lib/video_content.cc:121
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:107
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same audio stream."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:103
+#: src/lib/ffmpeg_content.cc:108
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
@@ -181,62 +182,61 @@ msgstr ""
 msgid "Copy DCP to TMS"
 msgstr "Copier le DCP dans le TMS"
 
-#: src/lib/scp_dcp_job.cc:129
+#: src/lib/scp_dcp_job.cc:135
 msgid "Could not connect to server %1 (%2)"
 msgstr "Connexion au serveur %1 (%2) impossible"
 
-#: src/lib/scp_dcp_job.cc:151
+#: src/lib/scp_dcp_job.cc:157
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
-#: src/lib/job.cc:94
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "lecture du fichier %1 impossible"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/scp_dcp_job.cc:182
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
-#: src/lib/film.cc:962
+#: src/lib/internet.cc:72
+#, fuzzy
+msgid "Could not open downloaded ZIP file"
+msgstr "lecture du fichier (%1) impossible"
+
+#: src/lib/film.cc:990
 msgid "Could not read DCP to make KDM for"
 msgstr "DCP illisible pour fabrication de KDM"
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_dcp_job.cc:152
 msgid "Could not start SCP session (%1)"
 msgstr "Démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:190
+#: src/lib/scp_dcp_job.cc:196
 msgid "Could not write to remote file (%1)"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/filter.cc:77
-msgid "Cubic interpolating deinterlacer"
-msgstr "Désentrelacement cubique interpolé"
-
-#: src/lib/util.cc:810
+#: src/lib/util.cc:850
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:841
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
-#: src/lib/job.cc:95
+#: src/lib/job.cc:91
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
 msgstr "DCP-o-matic ne peut pas ouvrir le fichier %1"
 
-#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-msgid "De-blocking"
-msgstr "De-bloc"
+#: src/lib/ffmpeg_content.cc:89
+msgid ""
+"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
+msgstr ""
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
-#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
-#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
+#: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
@@ -252,21 +252,21 @@ msgid ""
 "DCP-o-matic"
 msgstr ""
 
-#: src/lib/filter.cc:74
-msgid "Deringing filter"
-msgstr "Filtre anti bourdonnement"
-
 #: src/lib/dolby_cp750.cc:27
 #, fuzzy
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:803
+#: src/lib/internet.cc:65
+msgid "Download failed (%1/%2 error %3)"
+msgstr ""
+
+#: src/lib/util.cc:843
 #, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:845
 #, fuzzy
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
@@ -275,11 +275,11 @@ msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 msgid "Email KDMs for %1"
 msgstr ""
 
-#: src/lib/writer.cc:115
+#: src/lib/writer.cc:120
 msgid "Encoding image data"
 msgstr "encodage des données image"
 
-#: src/lib/job.cc:314
+#: src/lib/job.cc:320
 msgid "Error (%1)"
 msgstr "Erreur (%1)"
 
@@ -287,23 +287,7 @@ msgstr "Erreur (%1)"
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/filter.cc:72
-msgid "Experimental horizontal deblocking filter 1"
-msgstr "Filtre dé-bloc horizontal 1"
-
-#: src/lib/filter.cc:73
-msgid "Experimental vertical deblocking filter 1"
-msgstr "Filtre dé-bloc vertical 1"
-
-#: src/lib/filter.cc:79
-msgid "FFMPEG deinterlacer"
-msgstr "Désentrelaceur FFMPEG"
-
-#: src/lib/filter.cc:80
-msgid "FIR low-pass deinterlacer"
-msgstr "Désentrelaceur passe-bas FIR"
-
-#: src/lib/scp_dcp_job.cc:139
+#: src/lib/scp_dcp_job.cc:145
 msgid "Failed to authenticate with server (%1)"
 msgstr "L'authentification du serveur (%1) a échouée"
 
@@ -319,10 +303,6 @@ msgstr "Feature"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/filter.cc:85
-msgid "Force quantizer"
-msgstr "Forcer la quantification"
-
 #: src/lib/ratio.cc:43
 msgid "Full frame"
 msgstr "Pleine matrice"
@@ -331,23 +311,19 @@ msgstr "Pleine matrice"
 msgid "Gaussian"
 msgstr "Gaussien"
 
-#: src/lib/filter.cc:86
+#: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Corrections des bandes du dégradé"
 
-#: src/lib/filter.cc:89
+#: src/lib/util.cc:806
+msgid "Hearing impaired"
+msgstr ""
+
+#: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
 msgstr "Débruiteur 3D haute qualité"
 
-#: src/lib/filter.cc:68
-msgid "Horizontal deblocking filter"
-msgstr "Filtre dé-bloc horizontal"
-
-#: src/lib/filter.cc:70
-msgid "Horizontal deblocking filter A"
-msgstr "Filtre dé-bloc horizontal"
-
-#: src/lib/job.cc:108 src/lib/job.cc:117
+#: src/lib/job.cc:111 src/lib/job.cc:121
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -355,7 +331,7 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
 "(carl@dcpomatic.com)"
 
-#: src/lib/filter.cc:82
+#: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"
 msgstr "Désentrelaceur noyau"
 
@@ -363,45 +339,49 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:766
+#: src/lib/util.cc:800
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:770
+#: src/lib/util.cc:808
+msgid "Left centre"
+msgstr ""
+
+#: src/lib/util.cc:810
+#, fuzzy
+msgid "Left rear surround"
+msgstr "Arrière gauche"
+
+#: src/lib/util.cc:804
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:769
+#: src/lib/util.cc:803
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
-#: src/lib/filter.cc:75
-msgid "Linear blend deinterlacer"
-msgstr "Désentrelaceur par mélange interpolé"
-
-#: src/lib/filter.cc:76
-msgid "Linear interpolating deinterlacer"
-msgstr "Désentrelaceur linéaire interpolé"
-
-#: src/lib/filter.cc:78
-msgid "Median deinterlacer"
-msgstr "Désentrelaceur médian"
-
-#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
-#: src/lib/filter.cc:87 src/lib/filter.cc:90
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
 msgid "Misc"
 msgstr "Divers"
 
-#: src/lib/filter.cc:81
+#: src/lib/filter.cc:65
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
-#: src/lib/filter.cc:91
+#: src/lib/video_content.cc:447
+msgid "No scale"
+msgstr ""
+
+#: src/lib/video_content.cc:444
+#, fuzzy
+msgid "No stretch"
+msgstr "Flat sans déformation"
+
+#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
 
-#: src/lib/job.cc:312
+#: src/lib/job.cc:318
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
@@ -413,7 +393,11 @@ msgstr "Seul le premier contenu à joindre peut avoir un coupure de début."
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Seul le dernier contenu à joindre peut avoir une coupure en fin."
 
-#: src/lib/filter.cc:91
+#: src/lib/job.cc:103
+msgid "Out of memory"
+msgstr ""
+
+#: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
 msgstr "Réduction de bruit par ondelettes"
 
@@ -429,19 +413,28 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:83 src/lib/config.cc:167
+#: src/lib/config.cc:84 src/lib/config.cc:168
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:767
+#: src/lib/util.cc:801
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:771
+#: src/lib/util.cc:809
+msgid "Right centre"
+msgstr ""
+
+#: src/lib/util.cc:811
+#, fuzzy
+msgid "Right rear surround"
+msgstr "Arrière droite"
+
+#: src/lib/util.cc:805
 msgid "Right surround"
 msgstr "Arrière droite"
 
-#: src/lib/scp_dcp_job.cc:134
+#: src/lib/scp_dcp_job.cc:140
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
@@ -465,19 +458,15 @@ msgstr "Spline"
 msgid "Teaser"
 msgstr "Teaser"
 
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:72
 msgid "Telecine filter"
 msgstr "Filtre télécinéma"
 
-#: src/lib/filter.cc:84
-msgid "Temporal noise reducer"
-msgstr "Réduction de bruit temporel"
-
 #: src/lib/dcp_content_type.cc:47
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:80
+#: src/lib/job.cc:77
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -485,7 +474,21 @@ msgstr ""
 "Le disque contenant le film est plein. Libérez de l'espace et essayez à "
 "nouveau."
 
-#: src/lib/film.cc:385
+#: src/lib/job.cc:103
+msgid "There was not enough memory to do this."
+msgstr ""
+
+#: src/lib/film.cc:406
+#, fuzzy
+msgid ""
+"This film was created with a newer version of DCP-o-matic, and it cannot be "
+"loaded into this version.  Sorry!"
+msgstr ""
+"Ce projet a été créé avec une ancienne version de DCP-o-matic, chargement "
+"impossible. Créez un nouveau projet, ajoutez du contenu et  reparamétrez. "
+"Désolé !"
+
+#: src/lib/film.cc:398
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -507,15 +510,19 @@ msgstr "Transcodage %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:116
+#: src/lib/internet.cc:77
+msgid "Unexpected ZIP file contents"
+msgstr ""
+
+#: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/lib/ffmpeg_decoder.cc:274
+#: src/lib/ffmpeg_decoder.cc:291
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Échantillonnage audio (%1) inconnu"
 
-#: src/lib/filter.cc:87
+#: src/lib/filter.cc:69
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
@@ -523,13 +530,9 @@ msgstr "Adoucissement et flou Gaussien"
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/filter.cc:69
-msgid "Vertical deblocking filter"
-msgstr "Filtre dé-bloc vertical"
-
-#: src/lib/filter.cc:71
-msgid "Vertical deblocking filter A"
-msgstr "Filtre dé-bloc vertical A"
+#: src/lib/util.cc:807
+msgid "Visually impaired"
+msgstr ""
 
 #: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
@@ -539,11 +542,11 @@ msgstr "En cours"
 msgid "X"
 msgstr "X"
 
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:289
+#: src/lib/film.cc:299
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
@@ -557,27 +560,27 @@ msgstr "[diaporama]"
 msgid "[still]"
 msgstr "[fixe]"
 
-#: src/lib/film.cc:242
+#: src/lib/film.cc:247
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:581
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
-#: src/lib/scp_dcp_job.cc:120
+#: src/lib/scp_dcp_job.cc:126
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:285
+#: src/lib/film.cc:295
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:293
+#: src/lib/film.cc:303
 msgid "content type"
 msgstr "type de contenu"
 
-#: src/lib/scp_dcp_job.cc:169
+#: src/lib/scp_dcp_job.cc:175
 msgid "copying %1"
 msgstr "copie de %1"
 
@@ -585,7 +588,7 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg.cc:175
+#: src/lib/ffmpeg.cc:176
 msgid "could not find audio decoder"
 msgstr "décodeur audio introuvable"
 
@@ -593,19 +596,15 @@ msgstr "décodeur audio introuvable"
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:527
-msgid "could not find subtitle decoder"
-msgstr "décodeur de sous-titre introuvable"
-
-#: src/lib/ffmpeg.cc:154
+#: src/lib/ffmpeg.cc:155
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
-#: src/lib/writer.cc:414
+#: src/lib/writer.cc:424
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
 
-#: src/lib/sndfile_decoder.cc:45
+#: src/lib/sndfile_decoder.cc:56
 msgid "could not open audio file for reading"
 msgstr "lecture du fichier audio impossible"
 
@@ -613,11 +612,11 @@ msgstr "lecture du fichier audio impossible"
 msgid "could not open file %1"
 msgstr "lecture du fichier (%1) impossible"
 
-#: src/lib/dcp_video_frame.cc:357
+#: src/lib/dcp_video_frame.cc:352
 msgid "could not open file for reading"
 msgstr "lecture du fichier impossible"
 
-#: src/lib/dcp_video_frame.cc:363
+#: src/lib/dcp_video_frame.cc:358
 msgid "could not read encoded data"
 msgstr "lecture des données encodées impossible"
 
@@ -646,43 +645,43 @@ 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:568
+#: src/lib/util.cc:601
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:577
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:617
+#: src/lib/util.cc:650
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:589
+#: src/lib/util.cc:622
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/transcode_job.cc:100
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:148
+#: src/lib/util.cc:152
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:145 src/lib/util.cc:150
+#: src/lib/util.cc:149 src/lib/util.cc:154
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:159
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:161
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:689
+#: src/lib/util.cc:722
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -694,33 +693,33 @@ msgstr "paramètre %1 manquant"
 msgid "moving"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:559
+#: src/lib/ffmpeg_decoder.cc:575
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:242 src/lib/film.cc:297
+#: src/lib/film.cc:247 src/lib/film.cc:307
 msgid "name"
 msgstr "nom"
 
-#: src/lib/ffmpeg_decoder.cc:574
+#: src/lib/ffmpeg_decoder.cc:590
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sous-titres non-bitmap non supportés actuellement"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:309
+#: src/lib/job.cc:315
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/config.cc:81 src/lib/video_content.cc:169
+#: src/lib/config.cc:82 src/lib/video_content.cc:174
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:82
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
-#: src/lib/util.cc:160
+#: src/lib/util.cc:164
 msgid "seconds"
 msgstr "secondes"
 
@@ -734,6 +733,57 @@ msgstr "%1 [fixe]"
 msgid "unknown"
 msgstr "Erreur inconnue"
 
+#~ msgid "Cubic interpolating deinterlacer"
+#~ msgstr "Désentrelacement cubique interpolé"
+
+#~ msgid "De-blocking"
+#~ msgstr "De-bloc"
+
+#~ msgid "Deringing filter"
+#~ msgstr "Filtre anti bourdonnement"
+
+#~ msgid "Experimental horizontal deblocking filter 1"
+#~ msgstr "Filtre dé-bloc horizontal 1"
+
+#~ msgid "Experimental vertical deblocking filter 1"
+#~ msgstr "Filtre dé-bloc vertical 1"
+
+#~ msgid "FFMPEG deinterlacer"
+#~ msgstr "Désentrelaceur FFMPEG"
+
+#~ msgid "FIR low-pass deinterlacer"
+#~ msgstr "Désentrelaceur passe-bas FIR"
+
+#~ msgid "Force quantizer"
+#~ msgstr "Forcer la quantification"
+
+#~ msgid "Horizontal deblocking filter"
+#~ msgstr "Filtre dé-bloc horizontal"
+
+#~ msgid "Horizontal deblocking filter A"
+#~ msgstr "Filtre dé-bloc horizontal"
+
+#~ msgid "Linear blend deinterlacer"
+#~ msgstr "Désentrelaceur par mélange interpolé"
+
+#~ msgid "Linear interpolating deinterlacer"
+#~ msgstr "Désentrelaceur linéaire interpolé"
+
+#~ msgid "Median deinterlacer"
+#~ msgstr "Désentrelaceur médian"
+
+#~ msgid "Temporal noise reducer"
+#~ msgstr "Réduction de bruit temporel"
+
+#~ msgid "Vertical deblocking filter"
+#~ msgstr "Filtre dé-bloc vertical"
+
+#~ msgid "Vertical deblocking filter A"
+#~ msgstr "Filtre dé-bloc vertical A"
+
+#~ msgid "could not find subtitle decoder"
+#~ msgstr "décodeur de sous-titre introuvable"
+
 #~ msgid "0%"
 #~ msgstr "0%"
 
@@ -790,9 +840,6 @@ msgstr "Erreur inconnue"
 #~ msgid "Examine content of %1"
 #~ msgstr "Examen du contenu de %1"
 
-#~ msgid "Flat without stretch"
-#~ msgstr "Flat sans déformation"
-
 #~ msgid "Scope without stretch"
 #~ msgstr "Scope sans déformation"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 584baad6e..8ca337e45 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-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/sndfile_content.cc:60
+#: src/lib/sndfile_content.cc:62
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:202
+#: src/lib/ffmpeg_content.cc:207
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/sndfile_content.cc:81
+#: src/lib/sndfile_content.cc:83
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:237
+#: src/lib/ffmpeg_content.cc:242
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 fotogrammi; %2 fotogrammi al secondo"
 
-#: src/lib/video_content.cc:200
+#: src/lib/video_content.cc:205
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -53,7 +53,7 @@ msgstr "1.66"
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/filter.cc:88
+#: src/lib/filter.cc:70
 msgid "3D denoiser"
 msgstr "Riduttore di rumore 3D"
 
@@ -69,7 +69,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Pubblicità"
 
-#: src/lib/job.cc:74
+#: src/lib/job.cc:71
 msgid "An error occurred whilst handling the file %1."
 msgstr "Errore durante l'elaborazione del file %1."
 
@@ -90,7 +90,7 @@ msgstr "Bicubica"
 msgid "Bilinear"
 msgstr "Bilineare"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:322
 msgid "Cancelled"
 msgstr "Cancellato"
 
@@ -98,15 +98,15 @@ 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:768
+#: src/lib/util.cc:802
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:74
+#: src/lib/writer.cc:77
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:448
+#: src/lib/writer.cc:460
 msgid "Computing audio digest"
 msgstr ""
 
@@ -114,11 +114,11 @@ msgstr ""
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:445
+#: src/lib/writer.cc:456
 msgid "Computing image digest"
 msgstr ""
 
-#: src/lib/util.cc:798
+#: src/lib/util.cc:838
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
@@ -131,21 +131,23 @@ msgstr ""
 msgid "Content to be joined must have the same audio gain."
 msgstr ""
 
-#: src/lib/video_content.cc:133
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same colour conversion."
 msgstr ""
 
-#: src/lib/video_content.cc:125
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same crop."
 msgstr ""
 
-#: src/lib/video_content.cc:113
+#: src/lib/video_content.cc:120
 msgid "Content to be joined must have the same picture size."
 msgstr ""
 
-#: src/lib/video_content.cc:129
-msgid "Content to be joined must have the same ratio."
+#: src/lib/video_content.cc:136
+#, fuzzy
+msgid "Content to be joined must have the same scale setting."
 msgstr ""
+"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
 #: src/lib/subtitle_content.cc:74
 msgid "Content to be joined must have the same subtitle X offset."
@@ -161,19 +163,19 @@ msgstr ""
 msgid "Content to be joined must have the same subtitle scale."
 msgstr ""
 
-#: src/lib/video_content.cc:117
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same video frame rate."
 msgstr ""
 
-#: src/lib/video_content.cc:121
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame type."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:107
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same audio stream."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:103
+#: src/lib/ffmpeg_content.cc:108
 msgid "Content to be joined must use the same subtitle stream."
 msgstr ""
 
@@ -181,49 +183,50 @@ msgstr ""
 msgid "Copy DCP to TMS"
 msgstr "Copia del DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:129
+#: src/lib/scp_dcp_job.cc:135
 msgid "Could not connect to server %1 (%2)"
 msgstr "Non posso connetermi al server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:151
+#: src/lib/scp_dcp_job.cc:157
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
-#: src/lib/job.cc:94
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Non riesco ad aprire %1"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/scp_dcp_job.cc:182
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
-#: src/lib/film.cc:962
+#: src/lib/internet.cc:72
+#, fuzzy
+msgid "Could not open downloaded ZIP file"
+msgstr "non riesco ad aprire %1"
+
+#: src/lib/film.cc:990
 msgid "Could not read DCP to make KDM for"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_dcp_job.cc:152
 msgid "Could not start SCP session (%1)"
 msgstr "Non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:190
+#: src/lib/scp_dcp_job.cc:196
 msgid "Could not write to remote file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/filter.cc:77
-msgid "Cubic interpolating deinterlacer"
-msgstr "Deinterlacciatore cubico interpolato"
-
-#: src/lib/util.cc:810
+#: src/lib/util.cc:850
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:841
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
 
-#: src/lib/job.cc:95
+#: src/lib/job.cc:91
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -231,14 +234,12 @@ msgstr ""
 "DCP-o-matic non può aprire il file %1. Non esiste oppure è in un formato non "
 "riconosciuto."
 
-#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-msgid "De-blocking"
-msgstr "Sbloccaggio"
+#: src/lib/ffmpeg_content.cc:89
+msgid ""
+"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
+msgstr ""
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
-#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
-#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
+#: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
@@ -262,20 +263,20 @@ msgstr ""
 "Distinti saluti,\n"
 "DCP-o-matic"
 
-#: src/lib/filter.cc:74
-msgid "Deringing filter"
-msgstr "Filtro deringing"
-
 #: src/lib/dolby_cp750.cc:27
 #, fuzzy
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:803
+#: src/lib/internet.cc:65
+msgid "Download failed (%1/%2 error %3)"
+msgstr ""
+
+#: src/lib/util.cc:843
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà duplicato nel DCP.\n"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:845
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà ripetuto %1 volte nel DCP.\n"
 
@@ -283,11 +284,11 @@ msgstr "Ogni fotogramma del sorgente sarà ripetuto %1 volte nel DCP.\n"
 msgid "Email KDMs for %1"
 msgstr ""
 
-#: src/lib/writer.cc:115
+#: src/lib/writer.cc:120
 msgid "Encoding image data"
 msgstr ""
 
-#: src/lib/job.cc:314
+#: src/lib/job.cc:320
 msgid "Error (%1)"
 msgstr "Errore (%1)"
 
@@ -295,23 +296,7 @@ msgstr "Errore (%1)"
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
-#: src/lib/filter.cc:72
-msgid "Experimental horizontal deblocking filter 1"
-msgstr "Filtro deblocking orizzontale sperimentale 1"
-
-#: src/lib/filter.cc:73
-msgid "Experimental vertical deblocking filter 1"
-msgstr "Filtro deblocking verticale sperimentale 1"
-
-#: src/lib/filter.cc:79
-msgid "FFMPEG deinterlacer"
-msgstr "Deinterlacciatore FFMPEG"
-
-#: src/lib/filter.cc:80
-msgid "FIR low-pass deinterlacer"
-msgstr "Deinterlacciatore FIR low-pass"
-
-#: src/lib/scp_dcp_job.cc:139
+#: src/lib/scp_dcp_job.cc:145
 msgid "Failed to authenticate with server (%1)"
 msgstr "Autenticazione col server fallita (%1) "
 
@@ -327,10 +312,6 @@ msgstr "Caratteristica"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/filter.cc:85
-msgid "Force quantizer"
-msgstr "Forza quantizzatore"
-
 #: src/lib/ratio.cc:43
 msgid "Full frame"
 msgstr "Schermo intero"
@@ -339,23 +320,19 @@ msgstr "Schermo intero"
 msgid "Gaussian"
 msgstr "Gaussiana"
 
-#: src/lib/filter.cc:86
+#: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/filter.cc:89
+#: src/lib/util.cc:806
+msgid "Hearing impaired"
+msgstr ""
+
+#: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
 msgstr "Riduttore di rumore 3D di alta qualità"
 
-#: src/lib/filter.cc:68
-msgid "Horizontal deblocking filter"
-msgstr "Filtro deblocking orizzontale"
-
-#: src/lib/filter.cc:70
-msgid "Horizontal deblocking filter A"
-msgstr "Filtro deblocking orizzontale A"
-
-#: src/lib/job.cc:108 src/lib/job.cc:117
+#: src/lib/job.cc:111 src/lib/job.cc:121
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -363,7 +340,7 @@ msgstr ""
 "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un "
 "report del problema alla mailing list di DCP-o-matic (carl@dcpomatic.com)"
 
-#: src/lib/filter.cc:82
+#: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"
 msgstr "Deinterlacciatore Kernel"
 
@@ -371,45 +348,49 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:766
+#: src/lib/util.cc:800
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:770
+#: src/lib/util.cc:808
+msgid "Left centre"
+msgstr ""
+
+#: src/lib/util.cc:810
+#, fuzzy
+msgid "Left rear surround"
+msgstr "Surround sinistro"
+
+#: src/lib/util.cc:804
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:769
+#: src/lib/util.cc:803
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
-#: src/lib/filter.cc:75
-msgid "Linear blend deinterlacer"
-msgstr "Deinterlacciatore lineare miscelato"
-
-#: src/lib/filter.cc:76
-msgid "Linear interpolating deinterlacer"
-msgstr "Deinterlacciatore lineare interpolato"
-
-#: src/lib/filter.cc:78
-msgid "Median deinterlacer"
-msgstr "Deinterlacciatore mediano"
-
-#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
-#: src/lib/filter.cc:87 src/lib/filter.cc:90
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
 msgid "Misc"
 msgstr "Varie"
 
-#: src/lib/filter.cc:81
+#: src/lib/filter.cc:65
 msgid "Motion compensating deinterlacer"
 msgstr "Dinterlacciatore con compensazione di movimento"
 
-#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
-#: src/lib/filter.cc:91
+#: src/lib/video_content.cc:447
+msgid "No scale"
+msgstr ""
+
+#: src/lib/video_content.cc:444
+#, fuzzy
+msgid "No stretch"
+msgstr "Flat senza stiramento"
+
+#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
 
-#: src/lib/job.cc:312
+#: src/lib/job.cc:318
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito in %1)"
 
@@ -421,7 +402,11 @@ msgstr ""
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr ""
 
-#: src/lib/filter.cc:91
+#: src/lib/job.cc:103
+msgid "Out of memory"
+msgstr ""
+
+#: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
 
@@ -437,20 +422,29 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:83 src/lib/config.cc:167
+#: src/lib/config.cc:84 src/lib/config.cc:168
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:767
+#: src/lib/util.cc:801
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:771
+#: src/lib/util.cc:809
+msgid "Right centre"
+msgstr ""
+
+#: src/lib/util.cc:811
+#, fuzzy
+msgid "Right rear surround"
+msgstr "Surround destro"
+
+#: src/lib/util.cc:805
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/scp_dcp_job.cc:134
+#: src/lib/scp_dcp_job.cc:140
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
@@ -474,19 +468,15 @@ msgstr "Spline"
 msgid "Teaser"
 msgstr "Teaser"
 
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:72
 msgid "Telecine filter"
 msgstr "Filtro telecinema"
 
-#: src/lib/filter.cc:84
-msgid "Temporal noise reducer"
-msgstr "Riduttore temporale di rumore"
-
 #: src/lib/dcp_content_type.cc:47
 msgid "Test"
 msgstr "Prova"
 
-#: src/lib/job.cc:80
+#: src/lib/job.cc:77
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -494,7 +484,22 @@ msgstr ""
 "Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
 "altro spazio e riprovare."
 
-#: src/lib/film.cc:385
+#: src/lib/job.cc:103
+msgid "There was not enough memory to do this."
+msgstr ""
+
+#: src/lib/film.cc:406
+#, fuzzy
+msgid ""
+"This film was created with a newer version of DCP-o-matic, and it cannot be "
+"loaded into this version.  Sorry!"
+msgstr ""
+"Questo film è stato creato con una vecchia versione di DCP-o-matic, e "
+"purtroppo non può essere caricato in questa versione. Sarà necessario creare "
+"un nuovo film, ri-aggiungere i tuoi contenuti e configurarlo di nuovo. Ci "
+"dispiace!"
+
+#: src/lib/film.cc:398
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -517,15 +522,19 @@ msgstr "Transcodifica %1"
 msgid "Transitional"
 msgstr "Di transizione"
 
-#: src/lib/job.cc:116
+#: src/lib/internet.cc:77
+msgid "Unexpected ZIP file contents"
+msgstr ""
+
+#: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: src/lib/ffmpeg_decoder.cc:274
+#: src/lib/ffmpeg_decoder.cc:291
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato di campionamento audio non riconosciuto (%1)"
 
-#: src/lib/filter.cc:87
+#: src/lib/filter.cc:69
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Maschera unsharp e sfocatura Gaussiana"
 
@@ -533,13 +542,9 @@ msgstr "Maschera unsharp e sfocatura Gaussiana"
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/filter.cc:69
-msgid "Vertical deblocking filter"
-msgstr "Filtro di sblocco verticale"
-
-#: src/lib/filter.cc:71
-msgid "Vertical deblocking filter A"
-msgstr "Filtro A di sblocco verticale"
+#: src/lib/util.cc:807
+msgid "Visually impaired"
+msgstr ""
 
 #: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
@@ -549,11 +554,11 @@ msgstr "Aspetta"
 msgid "X"
 msgstr "X"
 
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:289
+#: src/lib/film.cc:299
 msgid "You must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
@@ -566,27 +571,27 @@ msgstr ""
 msgid "[still]"
 msgstr "ancora"
 
-#: src/lib/film.cc:242
+#: src/lib/film.cc:247
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:581
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
-#: src/lib/scp_dcp_job.cc:120
+#: src/lib/scp_dcp_job.cc:126
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:285
+#: src/lib/film.cc:295
 msgid "container"
 msgstr "contenitore"
 
-#: src/lib/film.cc:293
+#: src/lib/film.cc:303
 msgid "content type"
 msgstr "tipo di contenuto"
 
-#: src/lib/scp_dcp_job.cc:169
+#: src/lib/scp_dcp_job.cc:175
 msgid "copying %1"
 msgstr "copia %1"
 
@@ -594,7 +599,7 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:175
+#: src/lib/ffmpeg.cc:176
 msgid "could not find audio decoder"
 msgstr "non riesco a trovare il decoder audio"
 
@@ -602,19 +607,15 @@ msgstr "non riesco a trovare il decoder audio"
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg_decoder.cc:527
-msgid "could not find subtitle decoder"
-msgstr "non riesco a trovare il decoder dei sottotitoli"
-
-#: src/lib/ffmpeg.cc:154
+#: src/lib/ffmpeg.cc:155
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
-#: src/lib/writer.cc:414
+#: src/lib/writer.cc:424
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr ""
 
-#: src/lib/sndfile_decoder.cc:45
+#: src/lib/sndfile_decoder.cc:56
 msgid "could not open audio file for reading"
 msgstr "non riesco ad aprire il file in lettura"
 
@@ -622,11 +623,11 @@ msgstr "non riesco ad aprire il file in lettura"
 msgid "could not open file %1"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/dcp_video_frame.cc:357
+#: src/lib/dcp_video_frame.cc:352
 msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
-#: src/lib/dcp_video_frame.cc:363
+#: src/lib/dcp_video_frame.cc:358
 #, fuzzy
 msgid "could not read encoded data"
 msgstr "non riesco a trovare il decoder audio"
@@ -656,43 +657,43 @@ 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:568
+#: src/lib/util.cc:601
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:577
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:617
+#: src/lib/util.cc:650
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:589
+#: src/lib/util.cc:622
 msgid "error during async_write (%1)"
 msgstr ""
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/transcode_job.cc:100
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:148
+#: src/lib/util.cc:152
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:145 src/lib/util.cc:150
+#: src/lib/util.cc:149 src/lib/util.cc:154
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:159
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:161
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:689
+#: src/lib/util.cc:722
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -704,33 +705,33 @@ msgstr "persa la regolazione richiesta %1"
 msgid "moving"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:559
+#: src/lib/ffmpeg_decoder.cc:575
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:242 src/lib/film.cc:297
+#: src/lib/film.cc:247 src/lib/film.cc:307
 msgid "name"
 msgstr "nome"
 
-#: src/lib/ffmpeg_decoder.cc:574
+#: src/lib/ffmpeg_decoder.cc:590
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sottotitoli non-bitmap non ancora supportati"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:309
+#: src/lib/job.cc:315
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/config.cc:81 src/lib/video_content.cc:169
+#: src/lib/config.cc:82 src/lib/video_content.cc:174
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:82
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non linearizzato"
 
-#: src/lib/util.cc:160
+#: src/lib/util.cc:164
 msgid "seconds"
 msgstr "secondi"
 
@@ -744,6 +745,57 @@ msgstr "ancora"
 msgid "unknown"
 msgstr "Errore sconosciuto"
 
+#~ msgid "Cubic interpolating deinterlacer"
+#~ msgstr "Deinterlacciatore cubico interpolato"
+
+#~ msgid "De-blocking"
+#~ msgstr "Sbloccaggio"
+
+#~ msgid "Deringing filter"
+#~ msgstr "Filtro deringing"
+
+#~ msgid "Experimental horizontal deblocking filter 1"
+#~ msgstr "Filtro deblocking orizzontale sperimentale 1"
+
+#~ msgid "Experimental vertical deblocking filter 1"
+#~ msgstr "Filtro deblocking verticale sperimentale 1"
+
+#~ msgid "FFMPEG deinterlacer"
+#~ msgstr "Deinterlacciatore FFMPEG"
+
+#~ msgid "FIR low-pass deinterlacer"
+#~ msgstr "Deinterlacciatore FIR low-pass"
+
+#~ msgid "Force quantizer"
+#~ msgstr "Forza quantizzatore"
+
+#~ msgid "Horizontal deblocking filter"
+#~ msgstr "Filtro deblocking orizzontale"
+
+#~ msgid "Horizontal deblocking filter A"
+#~ msgstr "Filtro deblocking orizzontale A"
+
+#~ msgid "Linear blend deinterlacer"
+#~ msgstr "Deinterlacciatore lineare miscelato"
+
+#~ msgid "Linear interpolating deinterlacer"
+#~ msgstr "Deinterlacciatore lineare interpolato"
+
+#~ msgid "Median deinterlacer"
+#~ msgstr "Deinterlacciatore mediano"
+
+#~ msgid "Temporal noise reducer"
+#~ msgstr "Riduttore temporale di rumore"
+
+#~ msgid "Vertical deblocking filter"
+#~ msgstr "Filtro di sblocco verticale"
+
+#~ msgid "Vertical deblocking filter A"
+#~ msgstr "Filtro A di sblocco verticale"
+
+#~ msgid "could not find subtitle decoder"
+#~ msgstr "non riesco a trovare il decoder dei sottotitoli"
+
 #~ msgid "0%"
 #~ msgstr "0%"
 
@@ -780,9 +832,6 @@ msgstr "Errore sconosciuto"
 #~ msgid "Examine content of %1"
 #~ msgstr "Esamino il contenuto di %1"
 
-#~ msgid "Flat without stretch"
-#~ msgstr "Flat senza stiramento"
-
 #~ msgid "Scope without stretch"
 #~ msgstr "Scope senza stiramento"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
new file mode 100644
index 000000000..b3f266e16
--- /dev/null
+++ b/src/lib/po/nl_NL.po
@@ -0,0 +1,730 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: DCP-o-matic\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"PO-Revision-Date: 2014-03-30 19:39+0100\n"
+"Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
+"Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
+"Language: nl_NL\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.6.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: src/lib/sndfile_content.cc:62
+msgid "%1 [audio]"
+msgstr "%1 [audio]"
+
+#: src/lib/ffmpeg_content.cc:207
+msgid "%1 [movie]"
+msgstr "%1 [film]"
+
+#: src/lib/sndfile_content.cc:83
+msgid "%1 channels, %2kHz, %3 samples"
+msgstr "%1 kanalen, %2kHz, %3 samples"
+
+#: src/lib/ffmpeg_content.cc:242
+msgid "%1 frames; %2 frames per second"
+msgstr "%1 frames; %2 frames per seconde"
+
+#: src/lib/video_content.cc:205
+msgid "%1x%2 pixels (%3:1)"
+msgstr "%1x%2 pixels (%3:1)"
+
+#: src/lib/ratio.cc:35
+msgid "1.19"
+msgstr "1.19"
+
+#: src/lib/ratio.cc:38
+msgid "1.375"
+msgstr "1.375"
+
+#: src/lib/ratio.cc:39
+msgid "1.66"
+msgstr "1.66"
+
+#: src/lib/ratio.cc:40
+msgid "16:9"
+msgstr "16:9"
+
+#: src/lib/filter.cc:70
+msgid "3D denoiser"
+msgstr "3D ruisonderdrukking"
+
+#: src/lib/ratio.cc:36
+msgid "4:3"
+msgstr "4:3"
+
+#: src/lib/ratio.cc:37
+msgid "Academy"
+msgstr "Academie"
+
+#: src/lib/dcp_content_type.cc:53
+msgid "Advertisement"
+msgstr "Advertentie"
+
+#: src/lib/job.cc:71
+msgid "An error occurred whilst handling the file %1."
+msgstr "Er is een fout opgetreden met bestand %1."
+
+#: src/lib/analyse_audio_job.cc:48
+msgid "Analyse audio"
+msgstr "Analyseer audio"
+
+#: src/lib/scaler.cc:64
+msgid "Area"
+msgstr "Gebied"
+
+#: src/lib/scaler.cc:62
+msgid "Bicubic"
+msgstr "Bicubic"
+
+#: src/lib/scaler.cc:69
+msgid "Bilinear"
+msgstr "Bilinear"
+
+#: src/lib/job.cc:322
+msgid "Cancelled"
+msgstr "Afgebroken"
+
+#: src/lib/exceptions.cc:60
+msgid "Cannot handle pixel format %1 during %2"
+msgstr "Fout met pixel formaat %1 tijdens %2"
+
+#: src/lib/util.cc:802
+msgid "Centre"
+msgstr "Midden"
+
+#: src/lib/writer.cc:77
+msgid "Checking existing image data"
+msgstr "Controleer bestaande videodata"
+
+#: src/lib/writer.cc:460
+msgid "Computing audio digest"
+msgstr "Verwerk audio data"
+
+#: src/lib/image_content.cc:100
+msgid "Computing digest"
+msgstr "Verwerken..."
+
+#: src/lib/writer.cc:456
+msgid "Computing image digest"
+msgstr "Verwerk video data"
+
+#: src/lib/util.cc:838
+msgid "Content and DCP have the same rate.\n"
+msgstr "Inhoud en DCP hebben dezelfde framerate .\n"
+
+#: src/lib/audio_content.cc:82
+msgid "Content to be joined must have the same audio delay."
+msgstr "Toegevoegde bestanden moeten dezelfde audio vertraging hebben."
+
+#: src/lib/audio_content.cc:78
+msgid "Content to be joined must have the same audio gain."
+msgstr "Toegevoegde bestanden moeten dezelfde audio gain hebben."
+
+#: src/lib/video_content.cc:140
+msgid "Content to be joined must have the same colour conversion."
+msgstr "Toegevoegde bestanden moeten dezelfde kleurindeling hebben."
+
+#: src/lib/video_content.cc:132
+msgid "Content to be joined must have the same crop."
+msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
+
+#: src/lib/video_content.cc:120
+msgid "Content to be joined must have the same picture size."
+msgstr "Toegevoegde bestanden moeten dezelfde grootte hebben."
+
+#: src/lib/video_content.cc:136
+msgid "Content to be joined must have the same scale setting."
+msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
+
+#: src/lib/subtitle_content.cc:74
+msgid "Content to be joined must have the same subtitle X offset."
+msgstr "Toegevoegde bestanden moeten dezelfde ondertitel X offset hebben."
+
+#: src/lib/subtitle_content.cc:78
+msgid "Content to be joined must have the same subtitle Y offset."
+msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben."
+
+#: src/lib/subtitle_content.cc:82
+msgid "Content to be joined must have the same subtitle scale."
+msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
+
+#: src/lib/video_content.cc:124
+msgid "Content to be joined must have the same video frame rate."
+msgstr "Toegevoegde bestanden moeten dezelfde video frame rate hebben."
+
+#: src/lib/video_content.cc:128
+msgid "Content to be joined must have the same video frame type."
+msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben."
+
+#: src/lib/ffmpeg_content.cc:112
+msgid "Content to be joined must use the same audio stream."
+msgstr "Toegevoegde bestanden moeten dezelfde audio stream gebruiken."
+
+#: src/lib/ffmpeg_content.cc:108
+msgid "Content to be joined must use the same subtitle stream."
+msgstr "Toegevoegde bestanden moeten dezelfde ondertitel stream gebruiken."
+
+#: src/lib/scp_dcp_job.cc:110
+msgid "Copy DCP to TMS"
+msgstr "Kopieer DCP to TMS"
+
+#: src/lib/scp_dcp_job.cc:135
+msgid "Could not connect to server %1 (%2)"
+msgstr "Kan niet verbinden met server %1 (%2)"
+
+#: src/lib/scp_dcp_job.cc:157
+msgid "Could not create remote directory %1 (%2)"
+msgstr "Kan geen remote map maken %1 (%2)"
+
+#: src/lib/job.cc:90
+msgid "Could not open %1"
+msgstr "Kan niet openen %1"
+
+#: src/lib/scp_dcp_job.cc:182
+msgid "Could not open %1 to send"
+msgstr "Kan niet openen %1 om te verzenden"
+
+#: src/lib/internet.cc:72
+msgid "Could not open downloaded ZIP file"
+msgstr "Kan gedownloade ZIP bestand niet openen"
+
+#: src/lib/film.cc:990
+msgid "Could not read DCP to make KDM for"
+msgstr "Kan DCP niet lezen om KDM te maken"
+
+#: src/lib/scp_dcp_job.cc:152
+msgid "Could not start SCP session (%1)"
+msgstr "Kan SCP sessie niet starten (%1)"
+
+#: src/lib/scp_dcp_job.cc:196
+msgid "Could not write to remote file (%1)"
+msgstr "Kan niet schrijven naar bestand op FTP server"
+
+#: src/lib/util.cc:850
+msgid "DCP will run at %1%% of the content speed.\n"
+msgstr "DCP renderd met %1%% van de content framerate.\n"
+
+#: src/lib/util.cc:841
+msgid "DCP will use every other frame of the content.\n"
+msgstr "DCP zal alleen elk ander frame van de content gebruiken.\n"
+
+#: src/lib/job.cc:91
+msgid ""
+"DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
+"an unexpected format."
+msgstr ""
+"DCP-o-matic kan bestand niet openen %1 . Misschien bestaat het niet of wordt "
+"het formaat niet ondersteund."
+
+#: src/lib/ffmpeg_content.cc:89
+msgid ""
+"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
+msgstr ""
+"DCP-o-matic ondersteund niet langer het `%1' filter, daarom is het "
+"uitgeschakeld."
+
+#: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
+msgid "De-interlacing"
+msgstr "De-interlacing"
+
+#: src/lib/config.cc:69
+msgid ""
+"Dear Projectionist\n"
+"\n"
+"Please find attached KDMs for $CPL_NAME.\n"
+"\n"
+"The KDMs are valid from $START_TIME until $END_TIME.\n"
+"\n"
+"Best regards,\n"
+"DCP-o-matic"
+msgstr ""
+"Geachte operator\n"
+"\n"
+"Bijgevoegd zijn KDMs voor $CPL_NAME.\n"
+"\n"
+"De KDMs zijn geldig van $START_TIME tot $END_TIME.\n"
+"\n"
+"Met vriendelijke groet,\n"
+"DCP-o-matic"
+
+#: src/lib/dolby_cp750.cc:27
+msgid "Dolby CP650 and CP750"
+msgstr "Dolby CP650 and CP750"
+
+#: src/lib/internet.cc:65
+msgid "Download failed (%1/%2 error %3)"
+msgstr "Fout met download(%1/%2 error %3)"
+
+#: src/lib/util.cc:843
+msgid "Each content frame will be doubled in the DCP.\n"
+msgstr "Elk content frame zal verdubbeld worden de DCP.\n"
+
+#: src/lib/util.cc:845
+msgid "Each content frame will be repeated %1 more times in the DCP.\n"
+msgstr "Elk content frame zal %1  herhaald worden in de DCP.\n"
+
+#: src/lib/send_kdm_email_job.cc:50
+msgid "Email KDMs for %1"
+msgstr "Email KDMs voor %1"
+
+#: src/lib/writer.cc:120
+msgid "Encoding image data"
+msgstr "Encoding bestandsdata"
+
+#: src/lib/job.cc:320
+msgid "Error (%1)"
+msgstr "Fout (%1)"
+
+#: src/lib/examine_content_job.cc:46
+msgid "Examine content"
+msgstr "Controleer content"
+
+#: src/lib/scp_dcp_job.cc:145
+msgid "Failed to authenticate with server (%1)"
+msgstr "Inlog fout met server (%1)"
+
+#: src/lib/scaler.cc:70
+msgid "Fast Bilinear"
+msgstr "Fast Bilinear"
+
+#: src/lib/dcp_content_type.cc:44
+msgid "Feature"
+msgstr "Kenmerken"
+
+#: src/lib/ratio.cc:41
+msgid "Flat"
+msgstr "Onbewerkt"
+
+#: src/lib/ratio.cc:43
+msgid "Full frame"
+msgstr "Full frame"
+
+#: src/lib/scaler.cc:65
+msgid "Gaussian"
+msgstr "Gaussian"
+
+#: src/lib/filter.cc:68
+msgid "Gradient debander"
+msgstr "Gradient debander"
+
+#: src/lib/util.cc:806
+msgid "Hearing impaired"
+msgstr "Slechthorenden"
+
+#: src/lib/filter.cc:71
+msgid "High quality 3D denoiser"
+msgstr "High quality 3D denoiser"
+
+#: src/lib/job.cc:111 src/lib/job.cc:121
+msgid ""
+"It is not known what caused this error.  The best idea is to report the "
+"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+msgstr ""
+"Dit is een onbekende fout. U kunt deze het beste melden bij de DCP-o-matic "
+"mailing lijst (carl@dcpomatic.com)"
+
+#: src/lib/filter.cc:66
+msgid "Kernel deinterlacer"
+msgstr "Kernel deinterlacer"
+
+#: src/lib/scaler.cc:66
+msgid "Lanczos"
+msgstr "Lanczos"
+
+#: src/lib/util.cc:800
+msgid "Left"
+msgstr "Links"
+
+#: src/lib/util.cc:808
+msgid "Left centre"
+msgstr "Links midden"
+
+#: src/lib/util.cc:810
+msgid "Left rear surround"
+msgstr "Links achter surround"
+
+#: src/lib/util.cc:804
+msgid "Left surround"
+msgstr "links surround"
+
+#: src/lib/util.cc:803
+msgid "Lfe (sub)"
+msgstr "Lfe (sub)"
+
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
+msgid "Misc"
+msgstr "Diverse"
+
+#: src/lib/filter.cc:65
+msgid "Motion compensating deinterlacer"
+msgstr "Motion compensating deinterlacer"
+
+#: src/lib/video_content.cc:447
+msgid "No scale"
+msgstr "Niet vergroten of verkleinen"
+
+#: src/lib/video_content.cc:444
+msgid "No stretch"
+msgstr "Niet uitvullen"
+
+#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
+msgid "Noise reduction"
+msgstr "Ruis reductie"
+
+#: src/lib/job.cc:318
+msgid "OK (ran for %1)"
+msgstr "OK (bezig.. %1)"
+
+#: src/lib/content.cc:100
+msgid "Only the first piece of content to be joined can have a start trim."
+msgstr ""
+"Alleen het eerste deel van de toegevoegde content kan een start trim "
+"bevatten."
+
+#: src/lib/content.cc:104
+msgid "Only the last piece of content to be joined can have an end trim."
+msgstr ""
+"Alleen het laatste deel van de toegevoegde content kan een eind trim "
+"bevatten."
+
+#: src/lib/job.cc:103
+msgid "Out of memory"
+msgstr "Te weinig geheugen"
+
+#: src/lib/filter.cc:73
+msgid "Overcomplete wavelet denoiser"
+msgstr "Overcomplete wavelet denoiser"
+
+#: src/lib/dcp_content_type.cc:51
+msgid "Policy"
+msgstr "Beleid"
+
+#: src/lib/dcp_content_type.cc:52
+msgid "Public Service Announcement"
+msgstr "Publieke Service aankondiging"
+
+#: src/lib/dcp_content_type.cc:49
+msgid "Rating"
+msgstr "Beoordeling"
+
+#: src/lib/config.cc:84 src/lib/config.cc:168
+msgid "Rec. 709"
+msgstr "Rec. 709"
+
+#: src/lib/util.cc:801
+msgid "Right"
+msgstr "Rechts"
+
+#: src/lib/util.cc:809
+msgid "Right centre"
+msgstr "Rechts midden"
+
+#: src/lib/util.cc:811
+msgid "Right rear surround"
+msgstr "Rechtsachter surround"
+
+#: src/lib/util.cc:805
+msgid "Right surround"
+msgstr "Rechts surround"
+
+#: src/lib/scp_dcp_job.cc:140
+msgid "SSH error (%1)"
+msgstr "SSH fout (%1)"
+
+#: src/lib/ratio.cc:42
+msgid "Scope"
+msgstr "Gebied"
+
+#: src/lib/dcp_content_type.cc:45
+msgid "Short"
+msgstr "Korte film"
+
+#: src/lib/scaler.cc:67
+msgid "Sinc"
+msgstr "Sinc"
+
+#: src/lib/scaler.cc:68
+msgid "Spline"
+msgstr "Spline"
+
+#: src/lib/dcp_content_type.cc:50
+msgid "Teaser"
+msgstr "Teaser"
+
+#: src/lib/filter.cc:72
+msgid "Telecine filter"
+msgstr "Telecine filter"
+
+#: src/lib/dcp_content_type.cc:47
+msgid "Test"
+msgstr "Test"
+
+#: src/lib/job.cc:77
+msgid ""
+"The drive that the film is stored on is low in disc space.  Free some more "
+"space and try again."
+msgstr ""
+"De harddisk waar de film is opgeslagen heeft te weinig ruimte.  Maak rumte "
+"en probeer opnieuw."
+
+#: src/lib/job.cc:103
+msgid "There was not enough memory to do this."
+msgstr "Er was niet genoeg geheugen om dit uit te voeren."
+
+#: src/lib/film.cc:406
+msgid ""
+"This film was created with a newer version of DCP-o-matic, and it cannot be "
+"loaded into this version.  Sorry!"
+msgstr ""
+"Deze film is gemaakt met een nieuwere versie van DCP-o-matic en kan niet "
+"geopend worden. Sorry!"
+
+#: src/lib/film.cc:398
+msgid ""
+"This film was created with an older version of DCP-o-matic, and "
+"unfortunately it cannot be loaded into this version.  You will need to "
+"create a new Film, re-add your content and set it up again.  Sorry!"
+msgstr ""
+"Deze film is gemaakt met een oudere versie van DCP-o-matic en kan niet "
+"geopend worden met deze versie. U moet een nieuw project  maken en de "
+"content opnieuw importeren. Sorry!. "
+
+#: src/lib/dcp_content_type.cc:46
+msgid "Trailer"
+msgstr "Trailer"
+
+#: src/lib/transcode_job.cc:50
+msgid "Transcode %1"
+msgstr "Omzetten %1"
+
+#: src/lib/dcp_content_type.cc:48
+msgid "Transitional"
+msgstr "Bumper"
+
+#: src/lib/internet.cc:77
+msgid "Unexpected ZIP file contents"
+msgstr "Onverwachte ZIP file inhoud"
+
+#: src/lib/job.cc:120
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
+#: src/lib/ffmpeg_decoder.cc:291
+msgid "Unrecognised audio sample format (%1)"
+msgstr "Niet herkenbaar audio sample formaat (%1)"
+
+#: src/lib/filter.cc:69
+msgid "Unsharp mask and Gaussian blur"
+msgstr "Unsharp mask and Gaussian blur"
+
+#: src/lib/colour_conversion.cc:145
+msgid "Untitled"
+msgstr "Niet benoemd"
+
+#: src/lib/util.cc:807
+msgid "Visually impaired"
+msgstr "Slechtzienden"
+
+#: src/lib/scp_dcp_job.cc:102
+msgid "Waiting"
+msgstr "Wachten"
+
+#: src/lib/scaler.cc:63
+msgid "X"
+msgstr "X"
+
+#: src/lib/filter.cc:67
+msgid "Yet Another Deinterlacing Filter"
+msgstr "Yet Another Deinterlacing Filter"
+
+#: src/lib/film.cc:299
+msgid "You must add some content to the DCP before creating it"
+msgstr "U moet wat content toevoegen voor het maken van de DCP"
+
+#: src/lib/image_content.cc:68
+msgid "[moving images]"
+msgstr "[bewegend beeld]"
+
+#: src/lib/image_content.cc:66
+msgid "[still]"
+msgstr "[still]"
+
+#: src/lib/film.cc:247
+msgid "cannot contain slashes"
+msgstr "er mag geen '\" gebruikt worden"
+
+#: src/lib/util.cc:581
+msgid "connect timed out"
+msgstr "verbinding timeout"
+
+#: src/lib/scp_dcp_job.cc:126
+msgid "connecting"
+msgstr "verbinden"
+
+#: src/lib/film.cc:295
+msgid "container"
+msgstr "container"
+
+#: src/lib/film.cc:303
+msgid "content type"
+msgstr "content type"
+
+#: src/lib/scp_dcp_job.cc:175
+msgid "copying %1"
+msgstr "kopieeren %1"
+
+#: src/lib/exceptions.cc:36
+msgid "could not create file %1"
+msgstr "kan geen bestand maken %1"
+
+#: src/lib/ffmpeg.cc:176
+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/ffmpeg.cc:155
+msgid "could not find video decoder"
+msgstr "kan geen videodecoder vinden"
+
+#: src/lib/writer.cc:424
+msgid "could not move audio MXF into the DCP (%1)"
+msgstr "kan MXF audio niet plaatsen in DCP (%1)"
+
+#: src/lib/sndfile_decoder.cc:56
+msgid "could not open audio file for reading"
+msgstr "kan audio bestand niet openen om te lezen"
+
+#: src/lib/exceptions.cc:29
+msgid "could not open file %1"
+msgstr "kan bestand niet openen %1"
+
+#: src/lib/dcp_video_frame.cc:352
+msgid "could not open file for reading"
+msgstr "kan bestand niet openen om te lezen"
+
+#: src/lib/dcp_video_frame.cc:358
+msgid "could not read encoded data"
+msgstr "kan encoded data niet lezen"
+
+#: src/lib/exceptions.cc:42
+msgid "could not read from file %1 (%2)"
+msgstr "kan bestand niet lezen %1 (%2)"
+
+#: src/lib/resampler.cc:102
+msgid "could not run sample-rate converter"
+msgstr "kan sample-rate converter niet starten"
+
+#: src/lib/resampler.cc:83
+msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
+msgstr "kan sample-rate converter niet starten gedurende %1 samples (%2) (%3)"
+
+#: src/lib/scp_dcp_job.cc:87
+msgid "could not start SCP session (%1)"
+msgstr "kan SCP sessie niet starten (%1)"
+
+#: src/lib/scp_dcp_job.cc:53
+msgid "could not start SSH session"
+msgstr "kan SSH sessie niet starten"
+
+#: src/lib/exceptions.cc:48
+msgid "could not write to file %1 (%2)"
+msgstr "kan niet schrijven naar bestand %1 (%2)"
+
+#: src/lib/util.cc:601
+msgid "error during async_accept (%1)"
+msgstr "fout met async_accepteren (FTP) (%1)"
+
+#: src/lib/util.cc:577
+msgid "error during async_connect (%1)"
+msgstr "fout met async_verbinden (FTP) (%1)"
+
+#: src/lib/util.cc:650
+msgid "error during async_read (%1)"
+msgstr "fout met async_lezen (FTP) (%1)"
+
+#: src/lib/util.cc:622
+msgid "error during async_write (%1)"
+msgstr "fout met async_schrijven (FTP) (%1)"
+
+#: src/lib/transcode_job.cc:100
+msgid "frames per second"
+msgstr "frames per seconde"
+
+#: src/lib/util.cc:152
+msgid "hour"
+msgstr "uur"
+
+#: src/lib/util.cc:149 src/lib/util.cc:154
+msgid "hours"
+msgstr "uren"
+
+#: src/lib/util.cc:159
+msgid "minute"
+msgstr "minuut"
+
+#: src/lib/util.cc:161
+msgid "minutes"
+msgstr "minuten"
+
+#: src/lib/util.cc:722
+msgid "missing key %1 in key-value set"
+msgstr "ontbrekende key %1 in key-value set"
+
+#: src/lib/exceptions.cc:54
+msgid "missing required setting %1"
+msgstr "ontbrekende verplichte setting %1"
+
+#: src/lib/image_content.cc:83
+msgid "moving"
+msgstr "bewegend"
+
+#: src/lib/ffmpeg_decoder.cc:575
+msgid "multi-part subtitles not yet supported"
+msgstr "ondertitels met meerdere delen worden nog niet ondersteund."
+
+#: src/lib/film.cc:247 src/lib/film.cc:307
+msgid "name"
+msgstr "naam"
+
+#: src/lib/ffmpeg_decoder.cc:590
+msgid "non-bitmap subtitles not yet supported"
+msgstr "non-bitmap ondertitels worden nog niet ondersteund"
+
+#. / TRANSLATORS: remaining here follows an amount of time that is remaining
+#. / on an operation.
+#: src/lib/job.cc:315
+msgid "remaining"
+msgstr "resterend"
+
+#: src/lib/config.cc:82 src/lib/video_content.cc:174
+msgid "sRGB"
+msgstr "sRGB"
+
+#: src/lib/config.cc:83
+msgid "sRGB non-linearised"
+msgstr "sRGB non-linearised"
+
+#: src/lib/util.cc:164
+msgid "seconds"
+msgstr "secondes"
+
+#: src/lib/image_content.cc:81
+msgid "still"
+msgstr "still"
+
+#: src/lib/ffmpeg_examiner.cc:168
+msgid "unknown"
+msgstr "onbekend"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index cd87e3258..5fc0daa29 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-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,23 +17,23 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/lib/sndfile_content.cc:60
+#: src/lib/sndfile_content.cc:62
 msgid "%1 [audio]"
 msgstr "%1 [ljud]"
 
-#: src/lib/ffmpeg_content.cc:202
+#: src/lib/ffmpeg_content.cc:207
 msgid "%1 [movie]"
 msgstr "%1 [film]"
 
-#: src/lib/sndfile_content.cc:81
+#: src/lib/sndfile_content.cc:83
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 kanaler, %2kHz, %3 sampel"
 
-#: src/lib/ffmpeg_content.cc:237
+#: src/lib/ffmpeg_content.cc:242
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 bilder; %2 bilder per sekund"
 
-#: src/lib/video_content.cc:200
+#: src/lib/video_content.cc:205
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixlar (%3:1)"
 
@@ -53,7 +53,7 @@ msgstr "1,66"
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/filter.cc:88
+#: src/lib/filter.cc:70
 msgid "3D denoiser"
 msgstr "3D brusreducering"
 
@@ -69,7 +69,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Advertisement"
 
-#: src/lib/job.cc:74
+#: src/lib/job.cc:71
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ett fel inträffade vid hantering av filen %1"
 
@@ -89,7 +89,7 @@ msgstr "Bikubisk"
 msgid "Bilinear"
 msgstr "Bilinjär"
 
-#: src/lib/job.cc:316
+#: src/lib/job.cc:322
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -97,15 +97,15 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:768
+#: src/lib/util.cc:802
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:74
+#: src/lib/writer.cc:77
 msgid "Checking existing image data"
 msgstr "Kontrollerar befintligt bilddata"
 
-#: src/lib/writer.cc:448
+#: src/lib/writer.cc:460
 msgid "Computing audio digest"
 msgstr "Beräknar audiosammanfattning"
 
@@ -113,11 +113,11 @@ msgstr "Beräknar audiosammanfattning"
 msgid "Computing digest"
 msgstr "Beräknar sammanfattning"
 
-#: src/lib/writer.cc:445
+#: src/lib/writer.cc:456
 msgid "Computing image digest"
 msgstr "Beräknar bildsammanfattning"
 
-#: src/lib/util.cc:798
+#: src/lib/util.cc:838
 msgid "Content and DCP have the same rate.\n"
 msgstr "Källa och DCP har samma bildfrekvens.\n"
 
@@ -129,20 +129,21 @@ msgstr "Innehåll som ska sammanfogas måste använda samma audiofördröjning."
 msgid "Content to be joined must have the same audio gain."
 msgstr "Innehåll som ska sammanfogas måste använda samma audioförstärkning."
 
-#: src/lib/video_content.cc:133
+#: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Innehåll som ska sammanfogas måste använda samma färgkonvertering."
 
-#: src/lib/video_content.cc:125
+#: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same crop."
 msgstr "Innehåll som ska sammanfogas måste använda samma beskärning."
 
-#: src/lib/video_content.cc:113
+#: src/lib/video_content.cc:120
 msgid "Content to be joined must have the same picture size."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
 
-#: src/lib/video_content.cc:129
-msgid "Content to be joined must have the same ratio."
+#: src/lib/video_content.cc:136
+#, fuzzy
+msgid "Content to be joined must have the same scale setting."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
 
 #: src/lib/subtitle_content.cc:74
@@ -161,19 +162,19 @@ msgstr ""
 msgid "Content to be joined must have the same subtitle scale."
 msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
 
-#: src/lib/video_content.cc:117
+#: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Innehåll som ska sammanfogas måste använda samma videobildhastighet."
 
-#: src/lib/video_content.cc:121
+#: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame type."
 msgstr "Innehåll som ska sammanfogas måste använda samma videobildtyp."
 
-#: src/lib/ffmpeg_content.cc:107
+#: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same audio stream."
 msgstr "Innehåll som ska sammanfogas måste använda samma audioström."
 
-#: src/lib/ffmpeg_content.cc:103
+#: src/lib/ffmpeg_content.cc:108
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
 
@@ -181,47 +182,48 @@ msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
 msgid "Copy DCP to TMS"
 msgstr "Kopiera DCP till TMS"
 
-#: src/lib/scp_dcp_job.cc:129
+#: src/lib/scp_dcp_job.cc:135
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kunde inte ansluta till server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:151
+#: src/lib/scp_dcp_job.cc:157
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 
-#: src/lib/job.cc:94
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Kunde inte öppna %1"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/scp_dcp_job.cc:182
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
-#: src/lib/film.cc:962
+#: src/lib/internet.cc:72
+#, fuzzy
+msgid "Could not open downloaded ZIP file"
+msgstr "kunde inte öppna fil %1"
+
+#: src/lib/film.cc:990
 msgid "Could not read DCP to make KDM for"
 msgstr "Kunde inte läsa DCP för att skapa KDM"
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_dcp_job.cc:152
 msgid "Could not start SCP session (%1)"
 msgstr "Kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:190
+#: src/lib/scp_dcp_job.cc:196
 msgid "Could not write to remote file (%1)"
 msgstr "Kunde inte skriva till fjärrfil (%1)"
 
-#: src/lib/filter.cc:77
-msgid "Cubic interpolating deinterlacer"
-msgstr "Kubiskt interpolerande avflätare"
-
-#: src/lib/util.cc:810
+#: src/lib/util.cc:850
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "DCP kommer att köras på %1%% av källans hastighet.\n"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:841
 msgid "DCP will use every other frame of the content.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
-#: src/lib/job.cc:95
+#: src/lib/job.cc:91
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -229,14 +231,12 @@ msgstr ""
 "DCP-o-matic kunde inte öppna filen %1. Saknas den, eller har den ett "
 "oförväntat format?"
 
-#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-msgid "De-blocking"
-msgstr "Kantighetsutjämning"
+#: src/lib/ffmpeg_content.cc:89
+msgid ""
+"DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
+msgstr ""
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
-#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
-#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
+#: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
 msgid "De-interlacing"
 msgstr "Avflätning"
 
@@ -259,19 +259,19 @@ msgstr ""
 "Vänliga hälsningar,\n"
 "DCP-o-matic"
 
-#: src/lib/filter.cc:74
-msgid "Deringing filter"
-msgstr "Avringningsfilter"
-
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 och CP750"
 
-#: src/lib/util.cc:803
+#: src/lib/internet.cc:65
+msgid "Download failed (%1/%2 error %3)"
+msgstr ""
+
+#: src/lib/util.cc:843
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Varje bild från källan kommer att användas två gånger i DCPn.\n"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:845
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr ""
 "Varje bild från källan kommer att användas ytterligare %1 gång(er) i DCPn.\n"
@@ -280,11 +280,11 @@ msgstr ""
 msgid "Email KDMs for %1"
 msgstr "E-posta KDM:er för %1"
 
-#: src/lib/writer.cc:115
+#: src/lib/writer.cc:120
 msgid "Encoding image data"
 msgstr "Kodar bild-data"
 
-#: src/lib/job.cc:314
+#: src/lib/job.cc:320
 msgid "Error (%1)"
 msgstr "Fel (%1)"
 
@@ -292,23 +292,7 @@ msgstr "Fel (%1)"
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
-#: src/lib/filter.cc:72
-msgid "Experimental horizontal deblocking filter 1"
-msgstr "Experimentellt filter för horisontal kantighetsutjämning 1"
-
-#: src/lib/filter.cc:73
-msgid "Experimental vertical deblocking filter 1"
-msgstr "Experimentellt filter för vertikal kantighetsutjämning 1"
-
-#: src/lib/filter.cc:79
-msgid "FFMPEG deinterlacer"
-msgstr "FFMPEG-avflätare"
-
-#: src/lib/filter.cc:80
-msgid "FIR low-pass deinterlacer"
-msgstr "FIR lågpass-avflätare"
-
-#: src/lib/scp_dcp_job.cc:139
+#: src/lib/scp_dcp_job.cc:145
 msgid "Failed to authenticate with server (%1)"
 msgstr "Misslyckades att autentisera med server (%1)"
 
@@ -324,10 +308,6 @@ msgstr "Feature"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/filter.cc:85
-msgid "Force quantizer"
-msgstr "Tvinga kvantiserare"
-
 #: src/lib/ratio.cc:43
 msgid "Full frame"
 msgstr "Full frame"
@@ -336,23 +316,19 @@ msgstr "Full frame"
 msgid "Gaussian"
 msgstr "Gaussisk"
 
-#: src/lib/filter.cc:86
+#: src/lib/filter.cc:68
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/filter.cc:89
+#: src/lib/util.cc:806
+msgid "Hearing impaired"
+msgstr ""
+
+#: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
 msgstr "Högkvalitets 3D-brusreducering"
 
-#: src/lib/filter.cc:68
-msgid "Horizontal deblocking filter"
-msgstr "Filter för horisontal kantighetsutjämning"
-
-#: src/lib/filter.cc:70
-msgid "Horizontal deblocking filter A"
-msgstr "Filter för horisontal kantighetsutjämning A"
-
-#: src/lib/job.cc:108 src/lib/job.cc:117
+#: src/lib/job.cc:111 src/lib/job.cc:121
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -360,7 +336,7 @@ msgstr ""
 "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
 "problemet är till DCP-o-matics mejl-lista (carl@dcpomatic.com)"
 
-#: src/lib/filter.cc:82
+#: src/lib/filter.cc:66
 msgid "Kernel deinterlacer"
 msgstr "Kernel-avflätare"
 
@@ -368,45 +344,49 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:766
+#: src/lib/util.cc:800
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:770
+#: src/lib/util.cc:808
+msgid "Left centre"
+msgstr ""
+
+#: src/lib/util.cc:810
+#, fuzzy
+msgid "Left rear surround"
+msgstr "Vänster surround"
+
+#: src/lib/util.cc:804
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:769
+#: src/lib/util.cc:803
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
-#: src/lib/filter.cc:75
-msgid "Linear blend deinterlacer"
-msgstr "Linjär blandningsavflätare"
-
-#: src/lib/filter.cc:76
-msgid "Linear interpolating deinterlacer"
-msgstr "Linjär interpolationsavflätare"
-
-#: src/lib/filter.cc:78
-msgid "Median deinterlacer"
-msgstr "Median-avflätare"
-
-#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
-#: src/lib/filter.cc:87 src/lib/filter.cc:90
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/lib/filter.cc:81
+#: src/lib/filter.cc:65
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
-#: src/lib/filter.cc:91
+#: src/lib/video_content.cc:447
+msgid "No scale"
+msgstr ""
+
+#: src/lib/video_content.cc:444
+#, fuzzy
+msgid "No stretch"
+msgstr "Flat utan utsträckning"
+
+#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Brusreducering"
 
-#: src/lib/job.cc:312
+#: src/lib/job.cc:318
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
@@ -419,7 +399,11 @@ msgstr ""
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "Endast den sista delen av innehållet som läggs ihop kan slut-trimmas."
 
-#: src/lib/filter.cc:91
+#: src/lib/job.cc:103
+msgid "Out of memory"
+msgstr ""
+
+#: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
 msgstr "Överkomplett wavelet-brusreducering"
 
@@ -435,19 +419,28 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/config.cc:83 src/lib/config.cc:167
+#: src/lib/config.cc:84 src/lib/config.cc:168
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:767
+#: src/lib/util.cc:801
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:771
+#: src/lib/util.cc:809
+msgid "Right centre"
+msgstr ""
+
+#: src/lib/util.cc:811
+#, fuzzy
+msgid "Right rear surround"
+msgstr "Höger surround"
+
+#: src/lib/util.cc:805
 msgid "Right surround"
 msgstr "Höger surround"
 
-#: src/lib/scp_dcp_job.cc:134
+#: src/lib/scp_dcp_job.cc:140
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
@@ -471,19 +464,15 @@ msgstr "Spline"
 msgid "Teaser"
 msgstr "Teaser"
 
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:72
 msgid "Telecine filter"
 msgstr "Telecine-filter"
 
-#: src/lib/filter.cc:84
-msgid "Temporal noise reducer"
-msgstr "Temporal brusreducering"
-
 #: src/lib/dcp_content_type.cc:47
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:80
+#: src/lib/job.cc:77
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -491,7 +480,21 @@ msgstr ""
 "Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och "
 "försök igen."
 
-#: src/lib/film.cc:385
+#: src/lib/job.cc:103
+msgid "There was not enough memory to do this."
+msgstr ""
+
+#: src/lib/film.cc:406
+#, fuzzy
+msgid ""
+"This film was created with a newer version of DCP-o-matic, and it cannot be "
+"loaded into this version.  Sorry!"
+msgstr ""
+"Denna film skapades i en äldre version av DCP-o-matic, och tyvärr kan den "
+"inte öppnas i denna version. Du måste skapa en ny Film, lägga till ditt "
+"innehåll och konfigurera allt igen. Ursäkta!"
+
+#: src/lib/film.cc:398
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -513,16 +516,20 @@ msgstr "Konvertera %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:116
+#: src/lib/internet.cc:77
+msgid "Unexpected ZIP file contents"
+msgstr ""
+
+#: src/lib/job.cc:120
 msgid "Unknown error"
 msgstr "Okänt fel"
 
 # Svengelska
-#: src/lib/ffmpeg_decoder.cc:274
+#: src/lib/ffmpeg_decoder.cc:291
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt audio-sampelformat (%1)"
 
-#: src/lib/filter.cc:87
+#: src/lib/filter.cc:69
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Oskärpemask och Gaussisk suddighet"
 
@@ -530,13 +537,9 @@ msgstr "Oskärpemask och Gaussisk suddighet"
 msgid "Untitled"
 msgstr "Utan titel"
 
-#: src/lib/filter.cc:69
-msgid "Vertical deblocking filter"
-msgstr "Filter för vertikal kantighetsutjämning"
-
-#: src/lib/filter.cc:71
-msgid "Vertical deblocking filter A"
-msgstr "Filter för vertikal kantighetsutjämning A"
+#: src/lib/util.cc:807
+msgid "Visually impaired"
+msgstr ""
 
 #: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
@@ -547,11 +550,11 @@ msgid "X"
 msgstr "X"
 
 # Filtret heter så, ska ej översättas
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:67
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:289
+#: src/lib/film.cc:299
 msgid "You must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
@@ -563,28 +566,28 @@ msgstr "[rörliga bilder]"
 msgid "[still]"
 msgstr "[stillbild]"
 
-#: src/lib/film.cc:242
+#: src/lib/film.cc:247
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:548
+#: src/lib/util.cc:581
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
-#: src/lib/scp_dcp_job.cc:120
+#: src/lib/scp_dcp_job.cc:126
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:285
+#: src/lib/film.cc:295
 msgid "container"
 msgstr "behållare"
 
-#: src/lib/film.cc:293
+#: src/lib/film.cc:303
 msgid "content type"
 msgstr "innehållstyp"
 
-#: src/lib/scp_dcp_job.cc:169
+#: src/lib/scp_dcp_job.cc:175
 msgid "copying %1"
 msgstr "kopierar %1"
 
@@ -592,7 +595,7 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:175
+#: src/lib/ffmpeg.cc:176
 msgid "could not find audio decoder"
 msgstr "kunde inte hitta audio-avkodare"
 
@@ -600,19 +603,15 @@ msgstr "kunde inte hitta audio-avkodare"
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg_decoder.cc:527
-msgid "could not find subtitle decoder"
-msgstr "kunde inte hitta undertext-avkodare"
-
-#: src/lib/ffmpeg.cc:154
+#: src/lib/ffmpeg.cc:155
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
-#: src/lib/writer.cc:414
+#: src/lib/writer.cc:424
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)"
 
-#: src/lib/sndfile_decoder.cc:45
+#: src/lib/sndfile_decoder.cc:56
 msgid "could not open audio file for reading"
 msgstr "kunde inte öppna audio-fil för läsning"
 
@@ -620,11 +619,11 @@ msgstr "kunde inte öppna audio-fil för läsning"
 msgid "could not open file %1"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/dcp_video_frame.cc:357
+#: src/lib/dcp_video_frame.cc:352
 msgid "could not open file for reading"
 msgstr "kunde inte öppna fil för läsning"
 
-#: src/lib/dcp_video_frame.cc:363
+#: src/lib/dcp_video_frame.cc:358
 msgid "could not read encoded data"
 msgstr "kunde inte läsa kodat data"
 
@@ -653,43 +652,43 @@ 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:568
+#: src/lib/util.cc:601
 msgid "error during async_accept (%1)"
 msgstr "fel vid async_accept (%1)"
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:577
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/util.cc:617
+#: src/lib/util.cc:650
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/util.cc:589
+#: src/lib/util.cc:622
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
-#: src/lib/transcode_job.cc:94
+#: src/lib/transcode_job.cc:100
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:148
+#: src/lib/util.cc:152
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:145 src/lib/util.cc:150
+#: src/lib/util.cc:149 src/lib/util.cc:154
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:155
+#: src/lib/util.cc:159
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:161
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:689
+#: src/lib/util.cc:722
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -702,33 +701,33 @@ msgstr "saknad nödvändig inställning %1"
 msgid "moving"
 msgstr "rörlig"
 
-#: src/lib/ffmpeg_decoder.cc:559
+#: src/lib/ffmpeg_decoder.cc:575
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:242 src/lib/film.cc:297
+#: src/lib/film.cc:247 src/lib/film.cc:307
 msgid "name"
 msgstr "namn"
 
-#: src/lib/ffmpeg_decoder.cc:574
+#: src/lib/ffmpeg_decoder.cc:590
 msgid "non-bitmap subtitles not yet supported"
 msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:309
+#: src/lib/job.cc:315
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/config.cc:81 src/lib/video_content.cc:169
+#: src/lib/config.cc:82 src/lib/video_content.cc:174
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:82
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB icke-linjär"
 
-#: src/lib/util.cc:160
+#: src/lib/util.cc:164
 msgid "seconds"
 msgstr "sekunder"
 
@@ -740,6 +739,57 @@ msgstr "stillbild"
 msgid "unknown"
 msgstr "okänd"
 
+#~ msgid "Cubic interpolating deinterlacer"
+#~ msgstr "Kubiskt interpolerande avflätare"
+
+#~ msgid "De-blocking"
+#~ msgstr "Kantighetsutjämning"
+
+#~ msgid "Deringing filter"
+#~ msgstr "Avringningsfilter"
+
+#~ msgid "Experimental horizontal deblocking filter 1"
+#~ msgstr "Experimentellt filter för horisontal kantighetsutjämning 1"
+
+#~ msgid "Experimental vertical deblocking filter 1"
+#~ msgstr "Experimentellt filter för vertikal kantighetsutjämning 1"
+
+#~ msgid "FFMPEG deinterlacer"
+#~ msgstr "FFMPEG-avflätare"
+
+#~ msgid "FIR low-pass deinterlacer"
+#~ msgstr "FIR lågpass-avflätare"
+
+#~ msgid "Force quantizer"
+#~ msgstr "Tvinga kvantiserare"
+
+#~ msgid "Horizontal deblocking filter"
+#~ msgstr "Filter för horisontal kantighetsutjämning"
+
+#~ msgid "Horizontal deblocking filter A"
+#~ msgstr "Filter för horisontal kantighetsutjämning A"
+
+#~ msgid "Linear blend deinterlacer"
+#~ msgstr "Linjär blandningsavflätare"
+
+#~ msgid "Linear interpolating deinterlacer"
+#~ msgstr "Linjär interpolationsavflätare"
+
+#~ msgid "Median deinterlacer"
+#~ msgstr "Median-avflätare"
+
+#~ msgid "Temporal noise reducer"
+#~ msgstr "Temporal brusreducering"
+
+#~ msgid "Vertical deblocking filter"
+#~ msgstr "Filter för vertikal kantighetsutjämning"
+
+#~ msgid "Vertical deblocking filter A"
+#~ msgstr "Filter för vertikal kantighetsutjämning A"
+
+#~ msgid "could not find subtitle decoder"
+#~ msgstr "kunde inte hitta undertext-avkodare"
+
 #~ msgid "0%"
 #~ msgstr "0%"
 
@@ -777,9 +827,6 @@ msgstr "okänd"
 #~ msgid "Examine content of %1"
 #~ msgstr "Undersök innehållet i %1"
 
-#~ msgid "Flat without stretch"
-#~ msgstr "Flat utan utsträckning"
-
 #~ msgid "Scope without stretch"
 #~ msgstr "Scope utan utsträckning"
 
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 3d5825ad4..1080d24c4 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ try
 
 	string const data = DCPOMATIC_HELLO;
 	
-	while (1) {
+	while (true) {
 		if (Config::instance()->use_any_servers ()) {
 			/* Broadcast to look for servers */
 			try {
@@ -103,12 +103,11 @@ ServerFinder::listen_thread ()
 try
 {
 	while (1) {
-		shared_ptr<Socket> sock (new Socket (10));
+		shared_ptr<Socket> sock (new Socket (60));
 
 		try {
 			sock->accept (Config::instance()->server_port_base() + 1);
 		} catch (std::exception& e) {
-			dcpomatic_sleep (60);
 			continue;
 		}
 
diff --git a/src/lib/sndfile_content.cc b/src/lib/sndfile_content.cc
index 71b549d51..2d7fa1c1c 100644
--- a/src/lib/sndfile_content.cc
+++ b/src/lib/sndfile_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -165,3 +165,4 @@ SndfileContent::set_audio_mapping (AudioMapping m)
 
 	signal_changed (AudioContentProperty::AUDIO_MAPPING);
 }
+
diff --git a/src/lib/types.h b/src/lib/types.h
index 8c89ecd17..35c7a91f9 100644
--- a/src/lib/types.h
+++ b/src/lib/types.h
@@ -70,7 +70,11 @@ enum VideoFrameType
 	VIDEO_FRAME_TYPE_2D,
 	VIDEO_FRAME_TYPE_3D_LEFT_RIGHT,
 	VIDEO_FRAME_TYPE_3D_TOP_BOTTOM,
-	VIDEO_FRAME_TYPE_3D_ALTERNATE
+	VIDEO_FRAME_TYPE_3D_ALTERNATE,
+	/** This content is all the left frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_LEFT,
+	/** This content is all the right frames of some 3D */
+	VIDEO_FRAME_TYPE_3D_RIGHT
 };
 
 enum Eyes
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 1339be73d..40e9d9c2e 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
     Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
@@ -957,3 +957,38 @@ dependency_version_summary ()
 
 	return s.str ();
 }
+
+ScopedTemporary::ScopedTemporary ()
+	: _open (0)
+{
+	_file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path ();
+}
+
+ScopedTemporary::~ScopedTemporary ()
+{
+	close ();	
+	boost::system::error_code ec;
+	boost::filesystem::remove (_file, ec);
+}
+
+char const *
+ScopedTemporary::c_str () const
+{
+	return _file.string().c_str ();
+}
+
+FILE*
+ScopedTemporary::open (char const * params)
+{
+	_open = fopen (c_str(), params);
+	return _open;
+}
+
+void
+ScopedTemporary::close ()
+{
+	if (_open) {
+		fclose (_open);
+		_open = 0;
+	}
+}
diff --git a/src/lib/util.h b/src/lib/util.h
index 2ae97814c..579b1c231 100644
--- a/src/lib/util.h
+++ b/src/lib/util.h
@@ -141,6 +141,24 @@ private:
 	char* _old;
 };
 
+class ScopedTemporary
+{
+public:
+	ScopedTemporary ();
+	~ScopedTemporary ();
+
+	boost::filesystem::path file () const {
+		return _file;
+	}
+	
+	char const * c_str () const;
+	FILE* open (char const *);
+	void close ();
+
+private:
+	boost::filesystem::path _file;
+	FILE* _open;
+};
 
 #endif
 
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 5864342a2..9edbc104a 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -333,6 +333,8 @@ VideoContent::video_size_after_3d_split () const
 	switch (video_frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
 	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
 		return s;
 	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
 		return dcp::Size (s.width / 2, s.height);
diff --git a/src/lib/video_content.h b/src/lib/video_content.h
index eeb49cfa5..6b91997c9 100644
--- a/src/lib/video_content.h
+++ b/src/lib/video_content.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 34299bd3c..6a7a62b74 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -118,6 +118,12 @@ VideoDecoder::video (shared_ptr<const Image> image, VideoFrame frame)
 		_decoded_video.push_back (ContentVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, frame));
 		break;
 	}
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+		_decoded_video.push_back (ContentVideo (image, EYES_LEFT, frame));
+		break;
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
+		_decoded_video.push_back (ContentVideo (image, EYES_RIGHT, frame));
+		break;
 	default:
 		assert (false);
 	}
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 202ec9a0f..8508a0716 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -105,16 +105,18 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 		_first_nonexistant_frame > 0
 		);
 
-	_sound_mxf.reset (new dcp::SoundMXF (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ()));
+	if (_film->audio_channels ()) {
+		_sound_mxf.reset (new dcp::SoundMXF (dcp::Fraction (_film->video_frame_rate(), 1), _film->audio_frame_rate (), _film->audio_channels ()));
 
-	if (_film->encrypted ()) {
-		_sound_mxf->set_key (_film->key ());
-	}
+		if (_film->encrypted ()) {
+			_sound_mxf->set_key (_film->key ());
+		}
 	
-	/* Write the sound MXF into the film directory so that we leave the creation
-	   of the DCP directory until the last minute.
-	*/
-	_sound_mxf_writer = _sound_mxf->start_write (_film->directory() / _film->audio_mxf_filename(), _film->interop() ? dcp::INTEROP : dcp::SMPTE);
+		/* Write the sound MXF into the film directory so that we leave the creation
+		   of the DCP directory until the last minute.
+		*/
+		_sound_mxf_writer = _sound_mxf->start_write (_film->directory() / _film->audio_mxf_filename(), _film->interop() ? dcp::INTEROP : dcp::SMPTE);
+	}
 
 	_thread = new boost::thread (boost::bind (&Writer::thread, this));
 
@@ -191,7 +193,9 @@ Writer::fake_write (int frame, Eyes eyes)
 void
 Writer::write (shared_ptr<const AudioBuffers> audio)
 {
-	_sound_mxf_writer->write (audio->data(), audio->frames());
+	if (_sound_mxf_writer) {
+		_sound_mxf_writer->write (audio->data(), audio->frames());
+	}
 }
 
 /** This must be called from Writer::thread() with an appropriate lock held */
@@ -368,7 +372,9 @@ Writer::finish ()
 	terminate_thread (true);
 
 	_picture_mxf_writer->finalize ();
-	_sound_mxf_writer->finalize ();
+	if (_sound_mxf_writer) {
+		_sound_mxf_writer->finalize ();
+	}
 	
 	/* Hard-link the video MXF into the DCP */
 	boost::filesystem::path video_from;
@@ -389,15 +395,17 @@ Writer::finish ()
 
 	/* Move the audio MXF into the DCP */
 
-	boost::filesystem::path audio_to;
-	audio_to /= _film->dir (_film->dcp_name ());
-	audio_to /= _film->audio_mxf_filename ();
-	
-	boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec);
-	if (ec) {
-		throw FileError (
-			String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), _film->file (_film->audio_mxf_filename ())
-			);
+	if (_sound_mxf) {
+		boost::filesystem::path audio_to;
+		audio_to /= _film->dir (_film->dcp_name ());
+		audio_to /= _film->audio_mxf_filename ();
+		
+		boost::filesystem::rename (_film->file (_film->audio_mxf_filename ()), audio_to, ec);
+		if (ec) {
+			throw FileError (
+				String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), _film->file (_film->audio_mxf_filename ())
+				);
+		}
 	}
 
 	dcp::DCP dcp (_film->dir (_film->dcp_name()));
@@ -433,8 +441,10 @@ Writer::finish ()
 	job->sub (_("Computing image digest"));
 	_picture_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
 
-	job->sub (_("Computing audio digest"));
-	_sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
+	if (_sound_mxf) {
+		job->sub (_("Computing audio digest"));
+		_sound_mxf->hash (boost::bind (&Job::set_progress, job.get(), _1, false));
+	}
 
 	dcp::XMLMetadata meta = Config::instance()->dcp_metadata ();
 	meta.set_issue_date_now ();
diff --git a/src/lib/writer.h b/src/lib/writer.h
index af535c004..e817b1ca2 100644
--- a/src/lib/writer.h
+++ b/src/lib/writer.h
@@ -55,8 +55,6 @@ public:
 		    state but we use the data that is already on disk.
 		*/
 		FAKE,
-		/** this is a repeat of the last frame to be written */
-		REPEAT
 	} type;
 
 	/** encoded data for FULL */
diff --git a/src/lib/wscript b/src/lib/wscript
index 00ed171a3..433f50b3f 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -33,6 +33,7 @@ sources = """
           film.cc
           filter.cc
           frame_rate_change.cc
+          internet.cc
           image.cc
           image_content.cc
           image_decoder.cc