Merge master.

47 files changed, 3476 insertions, 1265 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 812772f10..8dea61747 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -99,6 +99,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	translated_by.Add (wxT ("Lilian Lefranc"));
 	translated_by.Add (wxT ("Olivier Perriere"));
 	translated_by.Add (wxT ("Markus Raab"));
+	translated_by.Add (wxT ("Theo Kooijmans"));
 	add_section (_("Translated by"), translated_by);
 
 	wxArrayString artwork_by;
@@ -118,6 +119,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Silvio Giuliano"));
 	supported_by.Add (wxT ("Flor Guillaume"));
 	supported_by.Add (wxT ("Jonathan Jensen"));
+	supported_by.Add (wxT ("Chris Kay"));
 	supported_by.Add (wxT ("Adam Klotblixt"));
 	supported_by.Add (wxT ("Filip Kovcin"));
 	supported_by.Add (wxT ("Carsten Kurz"));
@@ -141,6 +143,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Wolfgang Woehl"));
 	supported_by.Add (wxT ("Wolfram Weber"));
 	supported_by.Add (wxT ("Frank de Wulf"));
+	supported_by.Add (wxT ("Pavel Zhdanko"));
 	add_section (_("Supported by"), supported_by);
 
 	wxArrayString tested_by;
@@ -179,6 +182,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	tested_by.Add (wxT ("Greg Rooke"));
 	tested_by.Add (wxT ("Karim Senoucci"));
 	tested_by.Add (wxT ("Simon Vannarath"));
+	tested_by.Add (wxT ("Andrew Walls"));
 	tested_by.Add (wxT ("Andreas Weiss"));
 	tested_by.Add (wxT ("Paul Willmott"));
 	tested_by.Add (wxT ("Wolfgang Woehl"));
diff --git a/src/wx/audio_gain_dialog.cc b/src/wx/audio_gain_dialog.cc
index 7622e443e..b9b2c1fb7 100644
--- a/src/wx/audio_gain_dialog.cc
+++ b/src/wx/audio_gain_dialog.cc
@@ -23,34 +23,19 @@
 #include "wx_util.h"
 
 AudioGainDialog::AudioGainDialog (wxWindow* parent, int c, int d, float v)
-	: wxDialog (parent, wxID_ANY, _("Channel gain"))
+	: TableDialog (parent, _("Channel gain"), 3, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-
-	add_label_to_sizer (table, this, wxString::Format (_("Gain for content channel %d in DCP channel %d"), c + 1, d + 1), false);
-	_gain = new wxSpinCtrlDouble (this);
-	table->Add (_gain);
-
-	add_label_to_sizer (table, this, _("dB"), false);
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	add (wxString::Format (_("Gain for content channel %d in DCP channel %d"), c + 1, d + 1), false);
+	_gain = add (new wxSpinCtrlDouble (this));
+	add (_("dB"), false);
 
 	_gain->SetRange (-144, 0);
 	_gain->SetDigits (1);
 	_gain->SetIncrement (0.1);
 
 	_gain->SetValue (20 * log10 (v));
+
+	layout ();
 }
 
 float
diff --git a/src/wx/audio_gain_dialog.h b/src/wx/audio_gain_dialog.h
index 370e9f1bc..673919c24 100644
--- a/src/wx/audio_gain_dialog.h
+++ b/src/wx/audio_gain_dialog.h
@@ -17,11 +17,11 @@
 
 */
 
-#include <wx/wx.h>
+#include "table_dialog.h"
 
 class wxSpinCtrlDouble;
 
-class AudioGainDialog : public wxDialog
+class AudioGainDialog : public TableDialog
 {
 public:
 	AudioGainDialog (wxWindow *, int, int, float);
diff --git a/src/wx/cinema_dialog.cc b/src/wx/cinema_dialog.cc
index e663fc3b8..782481d54 100644
--- a/src/wx/cinema_dialog.cc
+++ b/src/wx/cinema_dialog.cc
@@ -23,30 +23,15 @@
 using std::string;
 
 CinemaDialog::CinemaDialog (wxWindow* parent, string title, string name, string email)
-	: wxDialog (parent, wxID_ANY, std_to_wx (title))
+	: TableDialog (parent, std_to_wx (title), 2, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-
-	add_label_to_sizer (table, this, _("Name"), true);
-	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1));
-	table->Add (_name, 1, wxEXPAND);
-
-	add_label_to_sizer (table, this, _("Email address for KDM delivery"), true);
-	_email = new wxTextCtrl (this, wxID_ANY, std_to_wx (email), wxDefaultPosition, wxSize (256, -1));
-	table->Add (_email, 1, wxEXPAND);
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	add (_("Name"), true);
+	_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (256, -1)));
+
+	add (_("Email address for KDM delivery"), true);
+	_email = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (email), wxDefaultPosition, wxSize (256, -1)));
+
+	layout ();
 }
 
 string
diff --git a/src/wx/cinema_dialog.h b/src/wx/cinema_dialog.h
index 02520eea9..26520a412 100644
--- a/src/wx/cinema_dialog.h
+++ b/src/wx/cinema_dialog.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
@@ -18,8 +18,9 @@
 */
 
 #include <wx/wx.h>
+#include "table_dialog.h"
 
-class CinemaDialog : public wxDialog
+class CinemaDialog : public TableDialog
 {
 public:
 	CinemaDialog (wxWindow *, std::string, std::string name = "", std::string email = "");
diff --git a/src/wx/colour_conversion_editor.cc b/src/wx/colour_conversion_editor.cc
index a4ec23411..6617b66d6 100644
--- a/src/wx/colour_conversion_editor.cc
+++ b/src/wx/colour_conversion_editor.cc
@@ -93,20 +93,20 @@ ColourConversionEditor::ColourConversionEditor (wxWindow* parent)
 	_output_gamma->SetDigits (2);
 	_output_gamma->SetIncrement (0.1);
 
-	_input_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
+	_input_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this, _input_gamma));
 	_input_gamma_linearised->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&ColourConversionEditor::changed, this));
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < 3; ++j) {
 			_matrix[i][j]->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
 		}
 	}
-	_output_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this));
+	_output_gamma->Bind (wxEVT_COMMAND_SPINCTRLDOUBLE_UPDATED, boost::bind (&ColourConversionEditor::changed, this, _output_gamma));
 }
 
 void
 ColourConversionEditor::set (ColourConversion conversion)
 {
-	_input_gamma->SetValue (conversion.input_gamma);
+	set_spin_ctrl (_input_gamma, conversion.input_gamma);
 	_input_gamma_linearised->SetValue (conversion.input_gamma_linearised);
 	for (int i = 0; i < 3; ++i) {
 		for (int j = 0; j < 3; ++j) {
@@ -117,7 +117,7 @@ ColourConversionEditor::set (ColourConversion conversion)
 			_matrix[i][j]->SetValue (std_to_wx (s.str ()));
 		}
 	}
-	_output_gamma->SetValue (conversion.output_gamma);
+	set_spin_ctrl (_output_gamma, conversion.output_gamma);
 }
 
 ColourConversion
@@ -150,3 +150,24 @@ ColourConversionEditor::changed ()
 	Changed ();
 }
 
+void
+ColourConversionEditor::changed (wxSpinCtrlDouble* sc)
+{
+	/* On OS X, it seems that in some cases when a wxSpinCtrlDouble loses focus
+	   it emits an erroneous changed signal, which messes things up.
+	   Check for that here.
+	*/
+	if (fabs (_last_spin_ctrl_value[sc] - sc->GetValue()) < 1e-3) {
+		return;
+	}
+	
+	Changed ();
+}
+
+void
+ColourConversionEditor::set_spin_ctrl (wxSpinCtrlDouble* control, double value)
+{
+	_last_spin_ctrl_value[control] = value;
+	control->SetValue (value);
+}
+
diff --git a/src/wx/colour_conversion_editor.h b/src/wx/colour_conversion_editor.h
index 8567cac22..ed22104e2 100644
--- a/src/wx/colour_conversion_editor.h
+++ b/src/wx/colour_conversion_editor.h
@@ -38,6 +38,11 @@ public:
 
 private:
 	void changed ();
+	void changed (wxSpinCtrlDouble *);
+
+	void set_spin_ctrl (wxSpinCtrlDouble *, double);
+
+	std::map<wxSpinCtrlDouble*, double> _last_spin_ctrl_value;
 	
 	wxSpinCtrlDouble* _input_gamma;
 	wxCheckBox* _input_gamma_linearised;
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index a0aedaf47..799067920 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -86,12 +86,13 @@ public:
 		_set_language = new wxCheckBox (panel, wxID_ANY, _("Set language"));
 		table->Add (_set_language, 1);
 		_language = new wxChoice (panel, wxID_ANY);
+		_language->Append (wxT ("Deutsch"));
 		_language->Append (wxT ("English"));
+		_language->Append (wxT ("Español"));
 		_language->Append (wxT ("Français"));
 		_language->Append (wxT ("Italiano"));
-		_language->Append (wxT ("Español"));
+		_language->Append (wxT ("Nederlands"));
 		_language->Append (wxT ("Svenska"));
-		_language->Append (wxT ("Deutsch"));
 		table->Add (_language);
 		
 		wxStaticText* restart = add_label_to_sizer (table, panel, _("(restart DCP-o-matic to see language changes)"), false);
@@ -104,6 +105,10 @@ public:
 		add_label_to_sizer (table, panel, _("Threads to use for encoding on this host"), true);
 		_num_local_encoding_threads = new wxSpinCtrl (panel);
 		table->Add (_num_local_encoding_threads, 1);
+
+		add_label_to_sizer (table, panel, _("Maximum JPEG2000 bandwidth"), true);
+		_maximum_j2k_bandwidth = new wxSpinCtrl (panel);
+		table->Add (_maximum_j2k_bandwidth, 1);
 		
 		add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
 		_mail_server = new wxTextCtrl (panel, wxID_ANY);
@@ -138,17 +143,19 @@ public:
 		_set_language->SetValue (config->language ());
 		
 		if (config->language().get_value_or ("") == "fr") {
-			_language->SetSelection (1);
+			_language->SetSelection (3);
 		} else if (config->language().get_value_or ("") == "it") {
-		_language->SetSelection (2);
+			_language->SetSelection (4);
 		} else if (config->language().get_value_or ("") == "es") {
-			_language->SetSelection (3);
+			_language->SetSelection (2);
 		} else if (config->language().get_value_or ("") == "sv") {
-			_language->SetSelection (4);
+			_language->SetSelection (6);
 		} else if (config->language().get_value_or ("") == "de") {
+			_language->SetSelection (0);
+		} else if (config->language().get_value_or ("") == "nl") {
 			_language->SetSelection (5);
 		} else {
-			_language->SetSelection (0);
+			_language->SetSelection (1);
 		}
 		
 		setup_language_sensitivity ();
@@ -159,6 +166,10 @@ public:
 		_num_local_encoding_threads->SetRange (1, 128);
 		_num_local_encoding_threads->SetValue (config->num_local_encoding_threads ());
 		_num_local_encoding_threads->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::num_local_encoding_threads_changed, this));
+
+		_maximum_j2k_bandwidth->SetRange (1, 500);
+		_maximum_j2k_bandwidth->SetValue (config->maximum_j2k_bandwidth() / 1000000);
+		_maximum_j2k_bandwidth->Bind (wxEVT_COMMAND_SPINCTRL_UPDATED, boost::bind (&GeneralPage::maximum_j2k_bandwidth_changed, this));
 		
 		_mail_server->SetValue (std_to_wx (config->mail_server ()));
 		_mail_server->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&GeneralPage::mail_server_changed, this));
@@ -196,22 +207,25 @@ private:
 	{
 		switch (_language->GetSelection ()) {
 		case 0:
-			Config::instance()->set_language ("en");
+			Config::instance()->set_language ("de");
 			break;
 		case 1:
-			Config::instance()->set_language ("fr");
+			Config::instance()->set_language ("en");
 			break;
 		case 2:
-			Config::instance()->set_language ("it");
+			Config::instance()->set_language ("es");
 			break;
 		case 3:
-			Config::instance()->set_language ("es");
+			Config::instance()->set_language ("fr");
 			break;
 		case 4:
-			Config::instance()->set_language ("sv");
+			Config::instance()->set_language ("it");
 			break;
 		case 5:
-			Config::instance()->set_language ("de");
+			Config::instance()->set_language ("nl");
+			break;
+		case 6:
+			Config::instance()->set_language ("sv");
 			break;
 		}
 	}
@@ -250,10 +264,16 @@ private:
 	{
 		Config::instance()->set_num_local_encoding_threads (_num_local_encoding_threads->GetValue ());
 	}
+
+	void maximum_j2k_bandwidth_changed ()
+	{
+		Config::instance()->set_maximum_j2k_bandwidth (_maximum_j2k_bandwidth->GetValue() * 1000000);
+	}
 	
 	wxCheckBox* _set_language;
 	wxChoice* _language;
 	wxSpinCtrl* _num_local_encoding_threads;
+	wxSpinCtrl* _maximum_j2k_bandwidth;
 	wxTextCtrl* _mail_server;
 	wxTextCtrl* _mail_user;
 	wxTextCtrl* _mail_password;
@@ -723,7 +743,10 @@ create_config_dialog ()
 	wxSize ps = wxSize (480, -1);
 	int const border = 16;
 #else
-	wxSize ps = wxDefaultSize;
+	/* We seem to need to specify height here, otherwise the general panel
+	   is too short (at least on Linux).
+	 */
+	wxSize ps = wxSize (-1, 400);
 	int const border = 8;
 #endif
 	
diff --git a/src/wx/content_colour_conversion_dialog.cc b/src/wx/content_colour_conversion_dialog.cc
index d8e768bcd..3fa8e120a 100644
--- a/src/wx/content_colour_conversion_dialog.cc
+++ b/src/wx/content_colour_conversion_dialog.cc
@@ -20,6 +20,7 @@
 #include <wx/statline.h>
 #include "lib/colour_conversion.h"
 #include "lib/config.h"
+#include "lib/util.h"
 #include "wx_util.h"
 #include "content_colour_conversion_dialog.h"
 #include "colour_conversion_editor.h"
@@ -78,7 +79,7 @@ ContentColourConversionDialog::set (ColourConversion c)
 	_setting = true;
 	_editor->set (c);
 	_setting = false;
-	
+
 	check_for_preset ();
 }
 
@@ -93,7 +94,11 @@ ContentColourConversionDialog::check_for_preset ()
 
 	_preset_check->SetValue (preset);
 	_preset_choice->Enable (preset);
-	_preset_choice->SetSelection (preset.get_value_or (-1));
+	if (preset) {
+		_preset_choice->SetSelection (preset.get ());
+	} else {
+		_preset_choice->SetSelection (-1);
+	}
 }
 
 void
@@ -112,7 +117,7 @@ void
 ContentColourConversionDialog::preset_choice_changed ()
 {
 	vector<PresetColourConversion> presets = Config::instance()->colour_conversions ();
-	int const s = _preset_choice->GetSelection();
+	int const s = _preset_choice->GetCurrentSelection();
 	if (s != -1) {
 		set (presets[s].conversion);
 	}
diff --git a/src/wx/dci_metadata_dialog.cc b/src/wx/dci_metadata_dialog.cc
index e28ddd855..700e1b154 100644
--- a/src/wx/dci_metadata_dialog.cc
+++ b/src/wx/dci_metadata_dialog.cc
@@ -27,42 +27,31 @@
 using boost::shared_ptr;
 
 DCIMetadataDialog::DCIMetadataDialog (wxWindow* parent, DCIMetadata dm)
-	: wxDialog (parent, wxID_ANY, _("DCI name"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER)
+	: TableDialog (parent, _("DCI name"), 2, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
+	add (_("Content version"), true);
+	_content_version = add (new wxSpinCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Content version"), true);
-	_content_version = new wxSpinCtrl (this, wxID_ANY);
-	table->Add (_content_version, 1, wxEXPAND);
+	add (_("Audio Language (e.g. EN)"), true);
+	_audio_language = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Audio Language (e.g. EN)"), true);
-	_audio_language = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_audio_language, 1, wxEXPAND);
-
-	add_label_to_sizer (table, this, _("Subtitle Language (e.g. FR)"), true);
-	_subtitle_language = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_subtitle_language, 1, wxEXPAND);
+	add (_("Subtitle Language (e.g. FR)"), true);
+	_subtitle_language = add (new wxTextCtrl (this, wxID_ANY));
 	
-	add_label_to_sizer (table, this, _("Territory (e.g. UK)"), true);
-	_territory = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_territory, 1, wxEXPAND);
+	add (_("Territory (e.g. UK)"), true);
+	_territory = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Rating (e.g. 15)"), true);
-	_rating = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_rating, 1, wxEXPAND);
+	add (_("Rating (e.g. 15)"), true);
+	_rating = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Studio (e.g. TCF)"), true);
-	_studio = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_studio, 1, wxEXPAND);
+	add (_("Studio (e.g. TCF)"), true);
+	_studio = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Facility (e.g. DLA)"), true);
-	_facility = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_facility, 1, wxEXPAND);
+	add (_("Facility (e.g. DLA)"), true);
+	_facility = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Package Type (e.g. OV)"), true);
-	_package_type = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_package_type, 1, wxEXPAND);
+	add (_("Package Type (e.g. OV)"), true);
+	_package_type = add (new wxTextCtrl (this, wxID_ANY));
 
 	_content_version->SetRange (1, 1024);
 
@@ -75,17 +64,7 @@ DCIMetadataDialog::DCIMetadataDialog (wxWindow* parent, DCIMetadata dm)
 	_facility->SetValue (std_to_wx (dm.facility));
 	_package_type->SetValue (std_to_wx (dm.package_type));
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-	
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 DCIMetadata
diff --git a/src/wx/dci_metadata_dialog.h b/src/wx/dci_metadata_dialog.h
index 240d5535e..7b93a3ab6 100644
--- a/src/wx/dci_metadata_dialog.h
+++ b/src/wx/dci_metadata_dialog.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
@@ -17,15 +17,15 @@
 
 */
 
-#include <wx/dialog.h>
 #include <wx/textctrl.h>
 #include <boost/shared_ptr.hpp>
 #include "lib/dci_metadata.h"
+#include "table_dialog.h"
 
 class wxSpinCtrl;
 class Film;
 
-class DCIMetadataDialog : public wxDialog
+class DCIMetadataDialog : public TableDialog
 {
 public:
 	DCIMetadataDialog (wxWindow *, DCIMetadata);
diff --git a/src/wx/dolby_certificate_dialog.cc b/src/wx/dolby_certificate_dialog.cc
new file mode 100644
index 000000000..e5bb18962
--- /dev/null
+++ b/src/wx/dolby_certificate_dialog.cc
@@ -0,0 +1,159 @@
+/*
+    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/algorithm/string.hpp>
+#include <curl/curl.h>
+#include "lib/compose.hpp"
+#include "lib/internet.h"
+#include "dolby_certificate_dialog.h"
+#include "wx_util.h"
+
+using std::list;
+using std::string;
+using std::vector;
+using std::stringstream;
+using std::cout;
+using boost::optional;
+using boost::algorithm::split;
+using boost::algorithm::is_any_of;
+
+DolbyCertificateDialog::DolbyCertificateDialog (wxWindow* parent, boost::function<void (boost::filesystem::path)> load)
+	: DownloadCertificateDialog (parent, load)
+{
+	add (_("Country"), true);
+	_country = add (new wxChoice (this, wxID_ANY));
+	_country->Append (N_("Hashemite Kingdom of Jordan"));
+	
+	add (_("Cinema"), true);
+	_cinema = add (new wxChoice (this, wxID_ANY));
+	_cinema->Append (N_("Motion Picture Solutions London Mobile & QC"));
+
+	add (_("Serial number"), true);
+	_serial = add (new wxChoice (this, wxID_ANY));
+
+	add_common_widgets ();
+
+	_country->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DolbyCertificateDialog::country_selected, this));
+	_cinema->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DolbyCertificateDialog::cinema_selected, this));
+	_serial->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DolbyCertificateDialog::serial_selected, this));
+	Bind (wxEVT_IDLE, boost::bind (&DolbyCertificateDialog::setup_countries, this));
+
+	_country->Clear ();
+	_cinema->Clear ();
+}
+
+list<string>
+DolbyCertificateDialog::get_dir (string dir) const
+{
+	string url = String::compose ("ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1", dir);
+	return ftp_ls (url);
+}
+
+void
+DolbyCertificateDialog::setup_countries ()
+{
+	if (_country->GetCount() > 0) {
+		/* Already set up */
+		return;
+	}
+	
+	_country->Append (_("Fetching..."));
+	_country->SetSelection (0);
+	run_gui_loop ();
+	
+	list<string> const countries = get_dir ("");
+	_country->Clear ();
+	for (list<string>::const_iterator i = countries.begin(); i != countries.end(); ++i) {
+		_country->Append (std_to_wx (*i));
+	}
+}
+
+void
+DolbyCertificateDialog::country_selected ()
+{
+	_cinema->Clear ();
+	_cinema->Append (_("Fetching..."));
+	_cinema->SetSelection (0);
+	run_gui_loop ();
+	
+	list<string> const cinemas = get_dir (wx_to_std (_country->GetStringSelection()));
+	_cinema->Clear ();
+	for (list<string>::const_iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
+		_cinema->Append (std_to_wx (*i));
+	}
+}
+
+void
+DolbyCertificateDialog::cinema_selected ()
+{
+	_serial->Clear ();
+	_serial->Append (_("Fetching..."));
+	_serial->SetSelection (0);
+	run_gui_loop ();
+
+	string const dir = String::compose ("%1/%2", wx_to_std (_country->GetStringSelection()), wx_to_std (_cinema->GetStringSelection()));
+	list<string> const zips = get_dir (dir);
+
+	_serial->Clear ();
+	for (list<string>::const_iterator i = zips.begin(); i != zips.end(); ++i) {
+		vector<string> a;
+		split (a, *i, is_any_of ("-_"));
+		if (a.size() >= 4) {
+			_serial->Append (std_to_wx (a[3]), new wxStringClientData (std_to_wx (*i)));
+		}
+	}
+}
+
+void
+DolbyCertificateDialog::serial_selected ()
+{
+	_download->Enable (true);
+}
+
+void
+DolbyCertificateDialog::download ()
+{
+	_message->SetLabel (_("Downloading certificate"));
+	run_gui_loop ();
+
+	string const zip = string_client_data (_serial->GetClientObject (_serial->GetSelection ()));
+
+	string const file = String::compose (
+		"ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1/%2/%3",
+		wx_to_std (_country->GetStringSelection()),
+		wx_to_std (_cinema->GetStringSelection()),
+		zip
+		);
+
+	/* Work out the certificate file name inside the zip */
+	vector<string> b;
+	split (b, zip, is_any_of ("_"));
+	if (b.size() < 2) {
+		_message->SetLabel (_("Unexpected certificate filename form"));
+		return;
+	}
+	string const cert = b[0] + "_" + b[1] + ".pem.crt";
+
+	optional<string> error = get_from_zip_url (file, cert, _load);
+	if (error) {
+		_message->SetLabel (std_to_wx (error.get ()));
+	} else {
+		_message->SetLabel (_("Certificate downloaded"));
+	}
+}
diff --git a/src/wx/dolby_certificate_dialog.h b/src/wx/dolby_certificate_dialog.h
new file mode 100644
index 000000000..194150363
--- /dev/null
+++ b/src/wx/dolby_certificate_dialog.h
@@ -0,0 +1,39 @@
+/*
+    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 <curl/curl.h>
+#include "download_certificate_dialog.h"
+
+class DolbyCertificateDialog : public DownloadCertificateDialog
+{
+public:
+	DolbyCertificateDialog (wxWindow *, boost::function<void (boost::filesystem::path)>);
+
+private:
+	void download ();
+	void setup_countries ();
+	void country_selected ();
+	void cinema_selected ();
+	void serial_selected ();
+	std::list<std::string> get_dir (std::string) const;
+
+	wxChoice* _country;
+	wxChoice* _cinema;
+	wxChoice* _serial;
+};
diff --git a/src/wx/doremi_certificate_dialog.cc b/src/wx/doremi_certificate_dialog.cc
new file mode 100644
index 000000000..b0840a83f
--- /dev/null
+++ b/src/wx/doremi_certificate_dialog.cc
@@ -0,0 +1,76 @@
+/*
+    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 <curl/curl.h>
+#include <zip.h>
+#include "lib/compose.hpp"
+#include "lib/util.h"
+#include "lib/internet.h"
+#include "doremi_certificate_dialog.h"
+#include "wx_util.h"
+
+using std::string;
+using boost::function;
+using boost::optional;
+
+DoremiCertificateDialog::DoremiCertificateDialog (wxWindow* parent, function<void (boost::filesystem::path)> load)
+	: DownloadCertificateDialog (parent, load)
+{
+	add (_("Server serial number"), true);
+	_serial = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1)));
+
+	_serial->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DoremiCertificateDialog::set_sensitivity, this));
+
+	add_common_widgets ();
+}
+
+void
+DoremiCertificateDialog::download ()
+{
+	string const serial = wx_to_std (_serial->GetValue ());
+	if (serial.length() != 6) {
+		error_dialog (this, _("Doremi serial numbers must have 6 digits"));
+		return;
+	}
+
+	_message->SetLabel (_("Downloading certificate"));
+	run_gui_loop ();
+
+	optional<string> error = get_from_zip_url (
+		String::compose (
+			"ftp://service:t3chn1c1an@ftp.doremilabs.com/Certificates/%1xxx/dcp2000-%2.dcicerts.zip",
+			serial.substr(0, 3), serial
+			),
+		String::compose ("dcp2000-%1.cert.sha256.pem", serial),
+		_load
+		);
+
+	if (error) {
+		error_dialog (this, std_to_wx (error.get ()));
+	} else {
+		_message->SetLabel (_("Certificate downloaded"));
+	}
+}
+
+void
+DoremiCertificateDialog::set_sensitivity ()
+{
+	_download->Enable (!_serial->IsEmpty ());
+}
+
diff --git a/src/wx/doremi_certificate_dialog.h b/src/wx/doremi_certificate_dialog.h
new file mode 100644
index 000000000..281184726
--- /dev/null
+++ b/src/wx/doremi_certificate_dialog.h
@@ -0,0 +1,32 @@
+/*
+    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 "download_certificate_dialog.h"
+
+class DoremiCertificateDialog : public DownloadCertificateDialog
+{
+public:
+	DoremiCertificateDialog (wxWindow *, boost::function<void (boost::filesystem::path)>);
+
+private:
+	void download ();
+        void set_sensitivity ();
+
+	wxTextCtrl* _serial;
+};
diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc
new file mode 100644
index 000000000..abb1e6126
--- /dev/null
+++ b/src/wx/download_certificate_dialog.cc
@@ -0,0 +1,51 @@
+/*
+    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/bind.hpp>
+#include "download_certificate_dialog.h"
+#include "wx_util.h"
+
+using boost::function;
+
+DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent, function<void (boost::filesystem::path)> load)
+	: TableDialog (parent, _("Download certificate"), 2, true)
+	, _load (load)
+{
+
+}
+
+void
+DownloadCertificateDialog::add_common_widgets ()
+{
+	add_spacer ();
+	_download = add (new wxButton (this, wxID_ANY, _("Download")));
+
+	add_spacer ();
+	_message = add (new wxStaticText (this, wxID_ANY, wxT ("")));
+
+	wxFont font = _message->GetFont();
+	font.SetStyle (wxFONTSTYLE_ITALIC);
+	font.SetPointSize (font.GetPointSize() - 1);
+	_message->SetFont (font);
+	
+	_download->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DownloadCertificateDialog::download, this));
+	_download->Enable (false);
+
+	layout ();
+}
diff --git a/src/wx/download_certificate_dialog.h b/src/wx/download_certificate_dialog.h
new file mode 100644
index 000000000..9fac23d58
--- /dev/null
+++ b/src/wx/download_certificate_dialog.h
@@ -0,0 +1,45 @@
+/*
+    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.
+
+*/
+
+#ifndef DCPOMATIC_DOWNLOAD_CERTIFICATE_DIALOG_H
+#define DCPOMATIC_DOWNLOAD_CERTIFICATE_DIALOG_H
+
+#include <wx/wx.h>
+#include <boost/function.hpp>
+#include <boost/filesystem.hpp>
+#include "table_dialog.h"
+
+class DownloadCertificateDialog : public TableDialog
+{
+public:
+	DownloadCertificateDialog (wxWindow *, boost::function<void (boost::filesystem::path)>);
+
+protected:
+	void add_common_widgets ();
+	
+	boost::function<void (boost::filesystem::path)> _load;
+	wxSizer* _overall_sizer;
+	wxStaticText* _message;
+	wxButton* _download;
+
+private:
+	virtual void download () = 0;
+};
+
+#endif
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 78a5c440c..7fa34c516 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.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
@@ -92,6 +92,8 @@ FilmEditor::FilmEditor (shared_ptr<Film> f, wxWindow* parent)
 	JobManager::instance()->ActiveJobsChanged.connect (
 		bind (&FilmEditor::active_jobs_changed, this, _1)
 		);
+
+	Config::instance()->Changed.connect (boost::bind (&FilmEditor::config_changed, this));
 	
 	SetSizerAndFit (s);
 }
@@ -213,7 +215,7 @@ FilmEditor::make_dcp_panel ()
 	}
 
 	_audio_channels->SetRange (0, MAX_AUDIO_CHANNELS);
-	_j2k_bandwidth->SetRange (1, 250);
+	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
 
 	_resolution->Append (_("2K"));
 	_resolution->Append (_("4K"));
@@ -268,19 +270,25 @@ FilmEditor::make_content_panel ()
 		_content->InsertColumn (0, wxT(""));
 		_content->SetColumnWidth (0, 512);
 
+#ifdef DCPOMATIC_OSX
+		int const pad = 2;
+#else
+		int const pad = 0;
+#endif		
+
 		wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
 		_content_add_file = new wxButton (_content_panel, wxID_ANY, _("Add file(s)..."));
-		b->Add (_content_add_file, 1, wxEXPAND | wxLEFT | wxRIGHT);
+		b->Add (_content_add_file, 1, wxEXPAND | wxALL, pad);
 		_content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add folder..."));
-		b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT);
+		b->Add (_content_add_folder, 1, wxEXPAND | wxALL, pad);
 		_content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
-		b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
+		b->Add (_content_remove, 1, wxEXPAND | wxALL, pad);
 		_content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up"));
-		b->Add (_content_earlier, 1, wxEXPAND);
+		b->Add (_content_earlier, 1, wxEXPAND | wxALL, pad);
 		_content_later = new wxButton (_content_panel, wxID_ANY, _("Down"));
-		b->Add (_content_later, 1, wxEXPAND);
+		b->Add (_content_later, 1, wxEXPAND | wxALL, pad);
 		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
-		b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
+		b->Add (_content_timeline, 1, wxEXPAND | wxALL, pad);
 
 		s->Add (b, 0, wxALL, 4);
 
@@ -998,3 +1006,9 @@ FilmEditor::content_later_clicked ()
 		content_selection_changed ();
 	}
 }
+
+void
+FilmEditor::config_changed ()
+{
+	_j2k_bandwidth->SetRange (1, Config::instance()->maximum_j2k_bandwidth() / 1000000);
+}
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index 23c87e678..a1336ec90 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -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
@@ -110,6 +110,7 @@ private:
 	void setup_content_sensitivity ();
 	
 	void active_jobs_changed (bool);
+	void config_changed ();
 
 	FilmEditorPanel* _video_panel;
 	FilmEditorPanel* _audio_panel;
diff --git a/src/wx/gain_calculator_dialog.cc b/src/wx/gain_calculator_dialog.cc
index f9880c044..d49dfae70 100644
--- a/src/wx/gain_calculator_dialog.cc
+++ b/src/wx/gain_calculator_dialog.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
@@ -24,29 +24,15 @@
 using namespace boost;
 
 GainCalculatorDialog::GainCalculatorDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("Gain Calculator"))
+	: TableDialog (parent, _("Gain Calculator"), 2, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
+	add (_("I want to play this back at fader"), true);
+	_wanted = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
 
-	add_label_to_sizer (table, this, _("I want to play this back at fader"), true);
-	_wanted = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC));
-	table->Add (_wanted, 1, wxEXPAND);
+	add (_("But I have to use fader"), true);
+	_actual = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC)));
 
-	add_label_to_sizer (table, this, _("But I have to use fader"), true);
-	_actual = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, 0, wxTextValidator (wxFILTER_NUMERIC));
-	table->Add (_actual, 1, wxEXPAND);
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-	
-	SetSizer (overall_sizer);
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 float
diff --git a/src/wx/gain_calculator_dialog.h b/src/wx/gain_calculator_dialog.h
index 363a91a2b..2228ab73e 100644
--- a/src/wx/gain_calculator_dialog.h
+++ b/src/wx/gain_calculator_dialog.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
@@ -18,8 +18,9 @@
 */
 
 #include <wx/wx.h>
+#include "table_dialog.h"
 
-class GainCalculatorDialog : public wxDialog
+class GainCalculatorDialog : public TableDialog
 {
 public:
 	GainCalculatorDialog (wxWindow* parent);
diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 1f4d62bde..5fb031324 100644
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.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
@@ -222,7 +222,7 @@ KDMDialog::setup_sensitivity ()
 	_remove_screen->Enable (ss);
 
 	wxButton* ok = dynamic_cast<wxButton *> (FindWindowById (wxID_OK));
-	ok->Enable ((sc || ss) && sd);
+	ok->Enable ((selected_cinemas().size() > 0 || selected_screens().size() > 0) && sd);
 
 	_folder->Enable (_write_to->GetValue ());
 }
@@ -263,8 +263,6 @@ KDMDialog::add_cinema_clicked ()
 	Config::instance()->add_cinema (c);
 	add_cinema (c);
 
-	Config::instance()->write ();
-	
 	d->Destroy ();
 }
 
@@ -284,7 +282,7 @@ KDMDialog::edit_cinema_clicked ()
 	c.second->email = d->email ();
 	_targets->SetItemText (c.first, std_to_wx (d->name()));
 
-	Config::instance()->write ();
+	Config::instance()->changed ();
 
 	d->Destroy ();	
 }
@@ -300,8 +298,6 @@ KDMDialog::remove_cinema_clicked ()
 
 	Config::instance()->remove_cinema (c.second);
 	_targets->Delete (c.first);
-
-	Config::instance()->write ();	
 }
 
 void
@@ -322,7 +318,7 @@ KDMDialog::add_screen_clicked ()
 	c->add_screen (s);
 	add_screen (c, s);
 
-	Config::instance()->write ();
+	Config::instance()->changed ();
 
 	d->Destroy ();
 }
@@ -343,7 +339,7 @@ KDMDialog::edit_screen_clicked ()
 	s.second->certificate = d->certificate ();
 	_targets->SetItemText (s.first, std_to_wx (d->name()));
 
-	Config::instance()->write ();
+	Config::instance()->changed ();
 
 	d->Destroy ();
 }
@@ -358,9 +354,11 @@ KDMDialog::remove_screen_clicked ()
 	pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
 
 	map<wxTreeItemId, shared_ptr<Cinema> >::iterator i = _cinemas.begin ();
-	list<shared_ptr<Screen> > sc = i->second->screens ();
-	while (i != _cinemas.end() && find (sc.begin(), sc.end(), s.second) == sc.end()) {
-		++i;
+	while (i != _cinemas.end ()) {
+		list<shared_ptr<Screen> > sc = i->second->screens ();
+		if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
+			break;
+		}
 	}
 
 	if (i == _cinemas.end()) {
@@ -370,7 +368,7 @@ KDMDialog::remove_screen_clicked ()
 	i->second->remove_screen (s.second);
 	_targets->Delete (s.first);
 
-	Config::instance()->write ();
+	Config::instance()->changed ();
 }
 
 list<shared_ptr<Screen> >
diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index f6d910282..8f317f42f 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.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
@@ -32,20 +32,12 @@ using namespace boost;
 boost::optional<boost::filesystem::path> NewFilmDialog::_directory;
 
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("New Film"))
+	: TableDialog (parent, _("New Film"), 2, true)
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	SetSizer (overall_sizer);
-	
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-	add_label_to_sizer (table, this, _("Film name"), true);
-	_name = new wxTextCtrl (this, wxID_ANY);
-	table->Add (_name, 0, wxEXPAND);
+	add (_("Film name"), true);
+	_name = add (new wxTextCtrl (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, _("Create in folder"), true);
+	add (_("Create in folder"), true);
 
 #ifdef DCPOMATIC_USE_OWN_DIR_PICKER
 	_folder = new DirPickerCtrl (this); 
@@ -58,17 +50,11 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 	}
 	
 	_folder->SetPath (std_to_wx (_directory.get().string()));
-	table->Add (_folder, 1, wxEXPAND);
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	add (_folder);
 
 	_name->SetFocus ();
+
+	layout ();
 }
 
 NewFilmDialog::~NewFilmDialog ()
diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index a835c7ceb..5ec5863c6 100644
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.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
@@ -20,10 +20,11 @@
 #include <wx/wx.h>
 #include <wx/filepicker.h>
 #include "wx_util.h"
+#include "table_dialog.h"
 
 class DirPickerCtrl;
 
-class NewFilmDialog : public wxDialog
+class NewFilmDialog : public TableDialog
 {
 public:
 	NewFilmDialog (wxWindow *);
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 773ebba71..83aad26e0 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-01-14 20:00+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,11 +29,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:131
+#: src/wx/config_dialog.cc:125
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(Passwort wird in Klartext gespeichert)"
 
-#: src/wx/config_dialog.cc:108
+#: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(DCP-o-matic zum ändern der Sprache neu starten)"
 
@@ -49,27 +49,31 @@ msgstr "1/"
 msgid "1 channel"
 msgstr "1 Kanal"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:196
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:220
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:166
+#: src/wx/film_editor.cc:168
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:199
+msgid "3D alternate"
+msgstr ""
+
+#: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D Links/Rechts"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D Oben/Unten"
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:221
 msgid "4K"
 msgstr "4K"
 
@@ -89,18 +93,22 @@ msgstr "Kino hinzufügen..."
 msgid "Add Screen..."
 msgstr "Saal hinzufügen..."
 
-#: src/wx/film_editor.cc:272
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Datei(en) hinzufügen..."
 
-#: src/wx/film_editor.cc:274
+#: src/wx/film_editor.cc:282
 msgid "Add folder..."
 msgstr "Ordner hinzufügen..."
 
-#: src/wx/editable_list.h:61
+#: src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Hinzufügen..."
 
+#: src/wx/about_dialog.cc:107
+msgid "Artwork by"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Ton"
@@ -113,7 +121,7 @@ msgstr "Ton Delay"
 msgid "Audio Gain"
 msgstr "Lautstärke"
 
-#: src/wx/dci_metadata_dialog.cc:39
+#: src/wx/dci_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Ton Sprache (z.B. DE)"
 
@@ -121,18 +129,18 @@ msgstr "Ton Sprache (z.B. DE)"
 msgid "Audio Stream"
 msgstr "Tonspur"
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "Audio channels"
 msgstr "Ton Kanäle"
 
-#: src/wx/audio_mapping_view.cc:325
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 "Der Ton von Kanal %d wird ohne Veränderung an das DCP Kanal %d weitergegeben."
 
-#: src/wx/audio_mapping_view.cc:328
+#: src/wx/audio_mapping_view.cc:356
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -146,7 +154,7 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Falsche Einstellung für %s (%s)"
 
-#: src/wx/video_panel.cc:123
+#: src/wx/video_panel.cc:120
 msgid "Bottom crop"
 msgstr "Unterkante beschneiden"
 
@@ -154,11 +162,19 @@ msgstr "Unterkante beschneiden"
 msgid "Browse..."
 msgstr "Durchsuchen..."
 
-#: src/wx/gain_calculator_dialog.cc:36
+#: src/wx/audio_mapping_view.cc:320
+msgid "BsL"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+msgid "BsR"
+msgstr ""
+
+#: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
 msgstr "Aber ich muss diese Lautstärke benutzen"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/audio_mapping_view.cc:288
 msgid "C"
 msgstr "C"
 
@@ -170,6 +186,17 @@ msgstr "Berechne..."
 msgid "Cancel"
 msgstr "Abbrechen"
 
+#: src/wx/screen_dialog.cc:44
+#, fuzzy
+msgid "Certificate"
+msgstr "Zertifikat Datei auswählen"
+
+#: src/wx/dolby_certificate_dialog.cc:157
+#: src/wx/doremi_certificate_dialog.cc:67
+#, fuzzy
+msgid "Certificate downloaded"
+msgstr "Zertifikat Datei auswählen"
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Kanal Pegel"
@@ -178,11 +205,11 @@ msgstr "Kanal Pegel"
 msgid "Channels"
 msgstr "Kanäle"
 
-#: src/wx/config_dialog.cc:143
+#: src/wx/config_dialog.cc:137
 msgid "Check for testing updates as well as stable ones"
 msgstr "Überprüfung auf Updates auch für Test-Versionen."
 
-#: src/wx/config_dialog.cc:139
+#: src/wx/config_dialog.cc:133
 msgid "Check for updates on startup"
 msgstr "Beim Starten auf Updates überprüfen."
 
@@ -190,49 +217,51 @@ msgstr "Beim Starten auf Updates überprüfen."
 msgid "Choose a file"
 msgstr "Datei auswählen"
 
-#: src/wx/film_editor.cc:767
+#: src/wx/film_editor.cc:775
 msgid "Choose a file or files"
 msgstr "Eine oder mehrere Dateien auswählen"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
 msgid "Choose a folder"
 msgstr "Ordner wählen"
 
-#: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
-msgid "Colour conversion"
-msgstr "Farbumwandlung"
+#: src/wx/dolby_certificate_dialog.cc:43
+#, fuzzy
+msgid "Cinema"
+msgstr "Kino hinzufügen..."
 
-#: src/wx/config_dialog.cc:65
-msgid "Colour conversions"
+#: src/wx/config_dialog.cc:561
+#, fuzzy
+msgid "Colour Conversions"
 msgstr "Farbumwandlungen"
 
-#: src/wx/film_editor.cc:132
+#: src/wx/content_colour_conversion_dialog.cc:34
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+msgid "Colour conversion"
+msgstr "Farbumwandlung"
+
+#: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Container"
 
-#: src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Inhalt"
 
-#: src/wx/film_editor.cc:137
+#: src/wx/film_editor.cc:139
 msgid "Content Type"
 msgstr "Inhalt Typ"
 
-#: src/wx/audio_mapping_view.cc:273
-msgid "Content channel"
-msgstr "Inhalt Kanal"
-
-#: src/wx/video_panel.cc:335
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Inhalt Bildrate %4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/dci_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Inhalt Version"
 
-#: src/wx/video_panel.cc:293
+#: src/wx/video_panel.cc:289
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Inhalt Video ist %dx%d (%.2f:1)\n"
@@ -241,7 +270,7 @@ msgstr "Inhalt Video ist %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr "Ton konnte nicht analysiert werden"
 
-#: src/wx/film_viewer.cc:332
+#: src/wx/film_viewer.cc:345
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
@@ -251,20 +280,20 @@ msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
 msgid "Could not make DCP: %s"
 msgstr "DCP konnte nicht erstellt werden: %s"
 
-#: src/wx/new_film_dialog.cc:48
+#: src/wx/dolby_certificate_dialog.cc:39
+msgid "Country"
+msgstr ""
+
+#: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "In Ordner erstellen"
 
-#: src/wx/config_dialog.cc:344
-msgid "Creator"
-msgstr "Ersteller"
-
-#: src/wx/video_panel.cc:305
+#: src/wx/video_panel.cc:301
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beschnitten zu %dx%d(%.2f:1)\n"
 
-#: src/wx/video_panel.cc:244
+#: src/wx/video_panel.cc:241
 msgid "Custom"
 msgstr "Eigen"
 
@@ -272,11 +301,11 @@ msgstr "Eigen"
 msgid "DCI name"
 msgstr "DCI Name"
 
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:116
+#: src/wx/film_editor.cc:118
 msgid "DCP Name"
 msgstr "DCP Name"
 
@@ -284,59 +313,93 @@ msgstr "DCP Name"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:52
-msgid "DCP-o-matic Preferences"
-msgstr "DCP-o-matic Einstellungen"
-
 #: src/wx/audio_dialog.cc:98
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic Ton - %s"
 
-#: src/wx/config_dialog.cc:216
+#: src/wx/config_dialog.cc:331
 msgid "Default DCI name details"
 msgstr "Standard DCI Name Details"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:344
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standard JPEG2000 Bandbreite"
 
-#: src/wx/config_dialog.cc:238
+#: src/wx/config_dialog.cc:353
 msgid "Default audio delay"
 msgstr "Standard Ton Delay"
 
-#: src/wx/config_dialog.cc:220
+#: src/wx/config_dialog.cc:335
 msgid "Default container"
 msgstr "Standard Container"
 
-#: src/wx/config_dialog.cc:224
+#: src/wx/config_dialog.cc:339
 msgid "Default content type"
 msgstr "Standard Inhalt Typ"
 
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:365
+#, fuzzy
+msgid "Default creator"
+msgstr "Standard Container"
+
+#: src/wx/config_dialog.cc:323
 msgid "Default directory for new films"
 msgstr "Standard Ordner für neue Filme"
 
-#: src/wx/config_dialog.cc:200
+#: src/wx/config_dialog.cc:315
 msgid "Default duration of still images"
 msgstr "Satndard Länge der Standbilder"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:361
+#, fuzzy
+msgid "Default issuer"
+msgstr "Standards"
+
+#: src/wx/config_dialog.cc:294
 msgid "Defaults"
 msgstr "Standards"
 
-#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
+#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Details..."
 
-#: src/wx/properties_dialog.cc:45
+#: src/wx/properties_dialog.cc:42
 msgid "Disk space required"
 msgstr "Festplattenplatz benötigt"
 
-#: src/wx/film_editor.cc:280
+#: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
+#: src/wx/screen_dialog.cc:135
+msgid "Dolby"
+msgstr ""
+
+#: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
+#: src/wx/screen_dialog.cc:134
+msgid "Doremi"
+msgstr ""
+
+#: src/wx/doremi_certificate_dialog.cc:48
+msgid "Doremi serial numbers must have 6 digits"
+msgstr ""
+
+#: src/wx/film_editor.cc:288
 msgid "Down"
 msgstr "Nach unten"
 
+#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#, fuzzy
+msgid "Download"
+msgstr "Nach unten"
+
+#: src/wx/download_certificate_dialog.cc:27
+msgid "Download certificate"
+msgstr ""
+
+#: src/wx/dolby_certificate_dialog.cc:132
+#: src/wx/doremi_certificate_dialog.cc:52
+msgid "Downloading certificate"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
 msgstr "Kino bearbeiten..."
@@ -345,13 +408,13 @@ msgstr "Kino bearbeiten..."
 msgid "Edit Screen..."
 msgstr "Saal bearbeiten..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:217
-#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
-#: src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
+#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
-#: src/wx/cinema_dialog.cc:35
+#: src/wx/cinema_dialog.cc:31
 msgid "Email address for KDM delivery"
 msgstr "Email Adresse für KDM Zustellung"
 
@@ -359,27 +422,29 @@ msgstr "Email Adresse für KDM Zustellung"
 msgid "Encoding Servers"
 msgstr "Encodier Server"
 
-#: src/wx/config_dialog.cc:63
-msgid "Encoding servers"
-msgstr "Encodier Server"
-
-#: src/wx/film_editor.cc:157
+#: src/wx/film_editor.cc:159
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: src/wx/dci_metadata_dialog.cc:59
+#: src/wx/dci_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Einrichtung (z.B. DXL)"
 
+#: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:106
+#, fuzzy
+msgid "Fetching..."
+msgstr "zähle..."
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Film Eigenschaften"
 
-#: src/wx/new_film_dialog.cc:44
+#: src/wx/new_film_dialog.cc:37
 msgid "Film name"
 msgstr "Film Name"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
 msgid "Filters"
 msgstr "Filter"
 
@@ -387,15 +452,15 @@ msgstr "Filter"
 msgid "Find missing..."
 msgstr "Suche fehlende..."
 
-#: src/wx/film_editor.cc:143
+#: src/wx/film_editor.cc:145
 msgid "Frame Rate"
 msgstr "Bild Rate"
 
-#: src/wx/properties_dialog.cc:41
+#: src/wx/properties_dialog.cc:39
 msgid "Frames"
 msgstr "Bilder"
 
-#: src/wx/properties_dialog.cc:49
+#: src/wx/properties_dialog.cc:45
 msgid "Frames already encoded"
 msgstr "Bilder bereits bearbeitet"
 
@@ -407,7 +472,7 @@ msgstr "Kostenlose open-source DCP Erstellung von fast allem."
 msgid "From"
 msgstr "Von"
 
-#: src/wx/config_dialog.cc:135
+#: src/wx/config_dialog.cc:129
 msgid "From address for KDM emails"
 msgstr "Von Adresse für KDM Emails"
 
@@ -415,7 +480,7 @@ msgstr "Von Adresse für KDM Emails"
 msgid "Full"
 msgstr "Ein"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr "Ganze Länge"
 
@@ -423,15 +488,19 @@ msgstr "Ganze Länge"
 msgid "Gain Calculator"
 msgstr "Lautstärken Rechner"
 
-#: src/wx/audio_gain_dialog.cc:31
+#: src/wx/audio_gain_dialog.cc:28
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Pegel des Kanals %d im DCP Kanal %d"
 
-#: src/wx/properties_dialog.cc:57
+#: src/wx/properties_dialog.cc:52
 msgid "Gb"
 msgstr "Gb"
 
+#: src/wx/audio_mapping_view.cc:304
+msgid "HI"
+msgstr ""
+
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
 msgstr "Tipps"
@@ -440,7 +509,7 @@ msgstr "Tipps"
 msgid "Host"
 msgstr "Host"
 
-#: src/wx/server_dialog.cc:41
+#: src/wx/server_dialog.cc:38
 msgid "Host name or IP address"
 msgstr "Host Name oder IP-Adresse"
 
@@ -448,15 +517,15 @@ msgstr "Host Name oder IP-Adresse"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/wx/gain_calculator_dialog.cc:32
+#: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Ich möchte bei dieser Lautstärke spielen"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:627
 msgid "IP address"
 msgstr "IP Adresse"
 
-#: src/wx/config_dialog.cc:373
+#: src/wx/config_dialog.cc:519
 msgid "IP address / host name"
 msgstr "IP Adresse / Host Name"
 
@@ -464,15 +533,11 @@ msgstr "IP Adresse / Host Name"
 msgid "Input gamma"
 msgstr "Eingangs Gamma"
 
-#: src/wx/film_editor.cc:222
+#: src/wx/film_editor.cc:224
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/config_dialog.cc:340
-msgid "Issuer"
-msgstr "Herausgeber"
-
-#: src/wx/film_editor.cc:176
+#: src/wx/film_editor.cc:178
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 Bandbreite"
 
@@ -480,23 +545,29 @@ msgstr "JPEG2000 Bandbreite"
 msgid "Join"
 msgstr "Mitmachen"
 
-#: src/wx/config_dialog.cc:71
-msgid "KDM email"
+#: src/wx/config_dialog.cc:694
+#, fuzzy
+msgid "KDM Email"
 msgstr "KDM Email"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:298
 msgid "Keep video in sequence"
 msgstr "Bildreihenfolge behalten"
 
-#: src/wx/audio_mapping_view.cc:276
+#: src/wx/audio_mapping_view.cc:280
 msgid "L"
 msgstr "L"
 
-#: src/wx/video_panel.cc:90
+#: src/wx/audio_mapping_view.cc:312
+#, fuzzy
+msgid "Lc"
+msgstr "L"
+
+#: src/wx/video_panel.cc:87
 msgid "Left crop"
 msgstr "Links beschneiden"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:292
 msgid "Lfe"
 msgstr "LFE"
 
@@ -504,19 +575,23 @@ msgstr "LFE"
 msgid "Linearise input gamma curve for low values"
 msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/screen_dialog.cc:46
+msgid "Load from file..."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:296
 msgid "Ls"
 msgstr "SL"
 
-#: src/wx/film_editor.cc:741
+#: src/wx/film_editor.cc:749
 msgid "MISSING: "
 msgstr "FEHLT:"
 
-#: src/wx/config_dialog.cc:127
+#: src/wx/config_dialog.cc:121
 msgid "Mail password"
 msgstr "Mail Passwort"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:117
 msgid "Mail user name"
 msgstr "Mail Benutzername"
 
@@ -528,19 +603,16 @@ msgstr "KDMs erstellen"
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Maximum JPEG2000 bandwidth"
+msgstr "JPEG2000 Bandbreite"
+
+#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/config_dialog.cc:67
-msgid "Metadata"
-msgstr "Metadata"
-
-#: src/wx/config_dialog.cc:59
-msgid "Miscellaneous"
-msgstr "Verschiedenes"
-
-#: src/wx/video_panel.cc:281
+#: src/wx/video_panel.cc:277
 msgid "Multiple content selected"
 msgstr "Mehrere Inhalte ausgewählt"
 
@@ -548,8 +620,8 @@ msgstr "Mehrere Inhalte ausgewählt"
 msgid "My Documents"
 msgstr "Meine Dokumente"
 
-#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
-#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Name"
 
@@ -561,16 +633,12 @@ msgstr "Neuer Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Eine neue Version von DCP-o-matic ist verfügbar."
 
-#: src/wx/audio_mapping_view.cc:323
+#: src/wx/audio_mapping_view.cc:351
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Der Ton von Kanal %d wird nicht an das DCP Kanal %d weitergegeben."
 
-#: src/wx/video_panel.cc:198
-msgid "No stretch"
-msgstr "Ohne Zerrung"
-
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
 msgid "None"
 msgstr "Kein"
 
@@ -578,7 +646,11 @@ msgstr "Kein"
 msgid "Off"
 msgstr "Aus"
 
-#: src/wx/config_dialog.cc:119
+#: src/wx/screen_dialog.cc:65
+msgid "Other"
+msgstr ""
+
+#: src/wx/config_dialog.cc:113
 msgid "Outgoing mail server"
 msgstr "Ausgehender Mail Server"
 
@@ -586,16 +658,16 @@ msgstr "Ausgehender Mail Server"
 msgid "Output gamma"
 msgstr "Ausgangs Gamma"
 
-#: src/wx/dci_metadata_dialog.cc:63
+#: src/wx/dci_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Paket Typ (e.g. OV)"
 
-#: src/wx/video_panel.cc:328
+#: src/wx/video_panel.cc:322
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Mit Schwarz gefüllt auf %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:639
 msgid "Password"
 msgstr "Passwort"
 
@@ -607,11 +679,11 @@ msgstr "Pause"
 msgid "Peak"
 msgstr "Spitze"
 
-#: src/wx/film_viewer.cc:62
+#: src/wx/film_viewer.cc:63
 msgid "Play"
 msgstr "Abspielen"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Abspiellänge"
 
@@ -619,11 +691,11 @@ msgstr "Abspiellänge"
 msgid "Please wait; audio is being analysed..."
 msgstr "Bitte warten; Ton wird analysiert..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Position"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:284
 msgid "R"
 msgstr "R"
 
@@ -631,12 +703,17 @@ msgstr "R"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:51
+#: src/wx/dci_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "FSK (z.B. 12)"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
-#: src/wx/editable_list.h:65
+#: src/wx/audio_mapping_view.cc:316
+#, fuzzy
+msgid "Rc"
+msgstr "R"
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -648,7 +725,7 @@ msgstr "Kino entfernen"
 msgid "Remove Screen"
 msgstr "Saal entfernen"
 
-#: src/wx/repeat_dialog.cc:33
+#: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Wiederholen"
 
@@ -660,7 +737,7 @@ msgstr "Inhalt wiederholen"
 msgid "Repeat..."
 msgstr "Wiederhole..."
 
-#: src/wx/film_editor.cc:170
+#: src/wx/film_editor.cc:172
 msgid "Resolution"
 msgstr "Auflösung"
 
@@ -668,52 +745,65 @@ msgstr "Auflösung"
 msgid "Resume"
 msgstr "Neustart"
 
-#: src/wx/audio_mapping_view.cc:331
+#: src/wx/audio_mapping_view.cc:359
 msgid "Right click to change gain."
 msgstr "Rechtsklick für Pegeländerung"
 
-#: src/wx/video_panel.cc:101
+#: src/wx/video_panel.cc:98
 msgid "Right crop"
 msgstr "Rechts beschneiden"
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/audio_mapping_view.cc:300
 msgid "Rs"
 msgstr "SR"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:223
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:131
 msgid "Scale to"
 msgstr "Skaliere zu"
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:313
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skaliert auf %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:190
+#: src/wx/film_editor.cc:192
 msgid "Scaler"
 msgstr "Skalierer"
 
-#: src/wx/screen_dialog.cc:88
+#: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Zertifikat Datei auswählen"
 
-#: src/wx/kdm_dialog.cc:136
+#: src/wx/kdm_dialog.cc:140
 msgid "Send by email"
 msgstr "Per Email senden"
 
+#: src/wx/dolby_certificate_dialog.cc:47
+msgid "Serial number"
+msgstr ""
+
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/doremi_certificate_dialog.cc:35
+msgid "Server serial number"
+msgstr ""
+
+#: src/wx/config_dialog.cc:499
+#, fuzzy
+msgid "Servers"
+msgstr "Server"
+
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Setzen"
 
-#: src/wx/config_dialog.cc:97
+#: src/wx/config_dialog.cc:86
 msgid "Set language"
 msgstr "Sprache setzen"
 
@@ -721,7 +811,7 @@ msgstr "Sprache setzen"
 msgid "Show Audio..."
 msgstr "Ton anzeigen..."
 
-#: src/wx/film_editor.cc:153
+#: src/wx/film_editor.cc:155
 msgid "Signed"
 msgstr "Signiert"
 
@@ -737,15 +827,15 @@ msgstr "Einschnappen"
 msgid "Stable version "
 msgstr "Stabile Version"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/dci_metadata_dialog.cc:55
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (z.B. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:43
+#: src/wx/dci_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Untertitel Sprache (z.B. EN)"
 
@@ -771,19 +861,19 @@ msgstr "Untertitel Offset"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:132
+#: src/wx/about_dialog.cc:146
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/config_dialog.cc:607
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:631
 msgid "Target path"
 msgstr "Zielpfad"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/dci_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Gebiet (z.B. UK)"
 
@@ -791,6 +881,11 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
+#: src/wx/about_dialog.cc:188
+#, fuzzy
+msgid "Tested by"
+msgstr "Übersetzt von"
+
 #: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
@@ -805,15 +900,19 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Keine Tipps: Alles sieht gut aus !"
 
+#: src/wx/film_viewer.cc:133
+msgid "There is not enough free memory to do that."
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Kerne"
 
-#: src/wx/config_dialog.cc:115
+#: src/wx/config_dialog.cc:105
 msgid "Threads to use for encoding on this host"
 msgstr "Auf diesem Host zu benutzende Kerne"
 
-#: src/wx/audio_plot.cc:148
+#: src/wx/audio_plot.cc:168
 msgid "Time"
 msgstr "Zeit"
 
@@ -821,39 +920,48 @@ msgstr "Zeit"
 msgid "Timeline"
 msgstr "Zeitlinie"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:290
 msgid "Timeline..."
 msgstr "Zeitlinie..."
 
-#: src/wx/timing_panel.cc:34
+#: src/wx/timing_panel.cc:35
 msgid "Timing"
 msgstr "Timing"
 
-#: src/wx/video_panel.cc:112
+#: src/wx/video_panel.cc:109
 msgid "Top crop"
 msgstr "Oben beschneiden"
 
-#: src/wx/about_dialog.cc:101
+#: src/wx/about_dialog.cc:103
 msgid "Translated by"
 msgstr "Übersetzt von"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Schnitt vom Ende"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Schnitt vom Anfang"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/kdm_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:148
+#, fuzzy
+msgid "Unexpected certificate filename form"
+msgstr "Zertifikat Datei auswählen"
+
+#: src/wx/screen_dialog.cc:62
+msgid "Unknown"
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:93
 msgid "Until"
 msgstr "Bis"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:286
 msgid "Up"
 msgstr "Nach oben"
 
@@ -861,31 +969,35 @@ msgstr "Nach oben"
 msgid "Update"
 msgstr "Update"
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:128
 msgid "Use DCI name"
 msgstr "DCI Name benutzen"
 
-#: src/wx/config_dialog.cc:369
+#: src/wx/config_dialog.cc:515
 msgid "Use all servers"
 msgstr "Alle Server benutzen"
 
-#: src/wx/film_editor.cc:147
+#: src/wx/film_editor.cc:149
 msgid "Use best"
 msgstr "Beste benutzen"
 
-#: src/wx/content_colour_conversion_dialog.cc:41
+#: src/wx/content_colour_conversion_dialog.cc:42
 msgid "Use preset"
 msgstr "Preset benutzen"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:635
 msgid "User name"
 msgstr "Benutzer Name"
 
-#: src/wx/video_panel.cc:70
+#: src/wx/audio_mapping_view.cc:308
+msgid "VI"
+msgstr ""
+
+#: src/wx/video_panel.cc:67
 msgid "Video"
 msgstr "Bild"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "Bildwiederholrate"
 
@@ -893,7 +1005,7 @@ msgstr "Bildwiederholrate"
 msgid "With Subtitles"
 msgstr "Mit Untertitel"
 
-#: src/wx/kdm_dialog.cc:122
+#: src/wx/kdm_dialog.cc:127
 msgid "Write to"
 msgstr "Schreiben"
 
@@ -944,20 +1056,20 @@ msgstr "Ton"
 msgid "channels"
 msgstr "Kanäle"
 
-#: src/wx/properties_dialog.cc:50
+#: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "zähle..."
 
-#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:319
 msgid "s"
 msgstr "s"
 
@@ -965,7 +1077,7 @@ msgstr "s"
 msgid "still"
 msgstr "Standbild"
 
-#: src/wx/repeat_dialog.cc:37
+#: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "Zeiten"
 
@@ -973,5 +1085,29 @@ msgstr "Zeiten"
 msgid "video"
 msgstr "Bild"
 
+#~ msgid "Content channel"
+#~ msgstr "Inhalt Kanal"
+
+#~ msgid "Creator"
+#~ msgstr "Ersteller"
+
+#~ msgid "DCP-o-matic Preferences"
+#~ msgstr "DCP-o-matic Einstellungen"
+
+#~ msgid "Encoding servers"
+#~ msgstr "Encodier Server"
+
+#~ msgid "Issuer"
+#~ msgstr "Herausgeber"
+
+#~ msgid "Metadata"
+#~ msgstr "Metadata"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Verschiedenes"
+
+#~ msgid "No stretch"
+#~ msgstr "Ohne Zerrung"
+
 #~ msgid "MBps"
 #~ msgstr "MBps"
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index f26468f97..3b8632ed4 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\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:00-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -29,11 +29,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:131
+#: src/wx/config_dialog.cc:125
 msgid "(password will be stored on disk in plaintext)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:108
+#: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 
@@ -49,27 +49,31 @@ msgstr ""
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:196
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:220
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:166
+#: src/wx/film_editor.cc:168
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:199
+msgid "3D alternate"
+msgstr ""
+
+#: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D izquierda/derecha"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr ""
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:221
 msgid "4K"
 msgstr ""
 
@@ -90,18 +94,22 @@ msgstr "Añadir cine..."
 msgid "Add Screen..."
 msgstr "Añadir pantalla..."
 
-#: src/wx/film_editor.cc:272
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/film_editor.cc:274
+#: src/wx/film_editor.cc:282
 msgid "Add folder..."
 msgstr "Añadir carpeta..."
 
-#: src/wx/editable_list.h:61
+#: src/wx/editable_list.h:62
 msgid "Add..."
 msgstr ""
 
+#: src/wx/about_dialog.cc:107
+msgid "Artwork by"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -114,7 +122,7 @@ msgstr "Retardo del audio"
 msgid "Audio Gain"
 msgstr "Ganancia del audio"
 
-#: src/wx/dci_metadata_dialog.cc:39
+#: src/wx/dci_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
@@ -123,18 +131,18 @@ msgstr "Idioma del audio (ej. ES)"
 msgid "Audio Stream"
 msgstr "Retardo del audio"
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 #, fuzzy
 msgid "Audio channels"
 msgstr "canales"
 
-#: src/wx/audio_mapping_view.cc:325
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:328
+#: src/wx/audio_mapping_view.cc:356
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -146,7 +154,7 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Configuración erronea para %s (%s)"
 
-#: src/wx/video_panel.cc:123
+#: src/wx/video_panel.cc:120
 msgid "Bottom crop"
 msgstr "Recortar abajo"
 
@@ -154,11 +162,19 @@ msgstr "Recortar abajo"
 msgid "Browse..."
 msgstr "Explorar..."
 
-#: src/wx/gain_calculator_dialog.cc:36
+#: src/wx/audio_mapping_view.cc:320
+msgid "BsL"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+msgid "BsR"
+msgstr ""
+
+#: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
 msgstr "pero tengo que usar el fader a"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/audio_mapping_view.cc:288
 msgid "C"
 msgstr ""
 
@@ -170,6 +186,17 @@ msgstr "Calcular..."
 msgid "Cancel"
 msgstr "Cancelar"
 
+#: src/wx/screen_dialog.cc:44
+#, fuzzy
+msgid "Certificate"
+msgstr "Seleccionar fichero de contenido"
+
+#: src/wx/dolby_certificate_dialog.cc:157
+#: src/wx/doremi_certificate_dialog.cc:67
+#, fuzzy
+msgid "Certificate downloaded"
+msgstr "Seleccionar fichero de contenido"
+
 #: src/wx/audio_gain_dialog.cc:26
 #, fuzzy
 msgid "Channel gain"
@@ -179,11 +206,11 @@ msgstr "Canales"
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/config_dialog.cc:143
+#: src/wx/config_dialog.cc:137
 msgid "Check for testing updates as well as stable ones"
 msgstr ""
 
-#: src/wx/config_dialog.cc:139
+#: src/wx/config_dialog.cc:133
 msgid "Check for updates on startup"
 msgstr ""
 
@@ -192,53 +219,54 @@ msgstr ""
 msgid "Choose a file"
 msgstr "Crear en carpeta"
 
-#: src/wx/film_editor.cc:767
+#: src/wx/film_editor.cc:775
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
 #, fuzzy
 msgid "Choose a folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
-msgid "Colour conversion"
-msgstr "Conversión de color"
+#: src/wx/dolby_certificate_dialog.cc:43
+#, fuzzy
+msgid "Cinema"
+msgstr "Añadir cine..."
 
-#: src/wx/config_dialog.cc:65
-msgid "Colour conversions"
+#: src/wx/config_dialog.cc:561
+#, fuzzy
+msgid "Colour Conversions"
 msgstr "Conversiones de color"
 
-#: src/wx/film_editor.cc:132
+#: src/wx/content_colour_conversion_dialog.cc:34
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+msgid "Colour conversion"
+msgstr "Conversión de color"
+
+#: src/wx/film_editor.cc:134
 #, fuzzy
 msgid "Container"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:137
+#: src/wx/film_editor.cc:139
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: src/wx/audio_mapping_view.cc:273
-#, fuzzy
-msgid "Content channel"
-msgstr "1 canal"
-
-#: src/wx/video_panel.cc:335
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Velocidad del contenido %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/dci_metadata_dialog.cc:32
 #, fuzzy
 msgid "Content version"
 msgstr "Tipo de contenido"
 
-#: src/wx/video_panel.cc:293
+#: src/wx/video_panel.cc:289
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "El video es %dx%d (%.2f:1)\n"
@@ -247,7 +275,7 @@ msgstr "El video es %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
-#: src/wx/film_viewer.cc:332
+#: src/wx/film_viewer.cc:345
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -257,21 +285,20 @@ msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "No se pudo crear el DCP: %s"
 
-#: src/wx/new_film_dialog.cc:48
-msgid "Create in folder"
-msgstr "Crear en carpeta"
+#: src/wx/dolby_certificate_dialog.cc:39
+msgid "Country"
+msgstr ""
 
-#: src/wx/config_dialog.cc:344
-#, fuzzy
-msgid "Creator"
+#: src/wx/new_film_dialog.cc:40
+msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/video_panel.cc:305
+#: src/wx/video_panel.cc:301
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Recortado a %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:244
+#: src/wx/video_panel.cc:241
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -279,11 +306,11 @@ msgstr "Personalizado"
 msgid "DCI name"
 msgstr "Nombre DCI"
 
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:116
+#: src/wx/film_editor.cc:118
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
@@ -291,64 +318,97 @@ msgstr "Nombre DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:52
-msgid "DCP-o-matic Preferences"
-msgstr "Preferencias DCP-o-matic"
-
 #: src/wx/audio_dialog.cc:98
 #, fuzzy, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %1"
 
-#: src/wx/config_dialog.cc:216
+#: src/wx/config_dialog.cc:331
 msgid "Default DCI name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:344
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/config_dialog.cc:238
+#: src/wx/config_dialog.cc:353
 #, fuzzy
 msgid "Default audio delay"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:220
+#: src/wx/config_dialog.cc:335
 #, fuzzy
 msgid "Default container"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:224
+#: src/wx/config_dialog.cc:339
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:365
+#, fuzzy
+msgid "Default creator"
+msgstr "Tipo de contenido"
+
+#: src/wx/config_dialog.cc:323
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:200
+#: src/wx/config_dialog.cc:315
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:361
+#, fuzzy
+msgid "Default issuer"
+msgstr "Tipo de contenido"
+
+#: src/wx/config_dialog.cc:294
 msgid "Defaults"
 msgstr ""
 
-#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
+#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detalles..."
 
-#: src/wx/properties_dialog.cc:45
+#: src/wx/properties_dialog.cc:42
 msgid "Disk space required"
 msgstr "Espacio requerido en disco"
 
-#: src/wx/film_editor.cc:280
+#: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
+#: src/wx/screen_dialog.cc:135
+msgid "Dolby"
+msgstr ""
+
+#: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
+#: src/wx/screen_dialog.cc:134
+msgid "Doremi"
+msgstr ""
+
+#: src/wx/doremi_certificate_dialog.cc:48
+msgid "Doremi serial numbers must have 6 digits"
+msgstr ""
+
+#: src/wx/film_editor.cc:288
 msgid "Down"
 msgstr ""
 
+#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+msgid "Download"
+msgstr ""
+
+#: src/wx/download_certificate_dialog.cc:27
+msgid "Download certificate"
+msgstr ""
+
+#: src/wx/dolby_certificate_dialog.cc:132
+#: src/wx/doremi_certificate_dialog.cc:52
+msgid "Downloading certificate"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 #, fuzzy
 msgid "Edit Cinema..."
@@ -359,13 +419,13 @@ msgstr "Editar..."
 msgid "Edit Screen..."
 msgstr "Editar..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:217
-#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
-#: src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
+#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Editar..."
 
-#: src/wx/cinema_dialog.cc:35
+#: src/wx/cinema_dialog.cc:31
 #, fuzzy
 msgid "Email address for KDM delivery"
 msgstr "Remitente para los emails de KDM"
@@ -375,28 +435,29 @@ msgstr "Remitente para los emails de KDM"
 msgid "Encoding Servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/config_dialog.cc:63
-#, fuzzy
-msgid "Encoding servers"
-msgstr "Servidores de codificación"
-
-#: src/wx/film_editor.cc:157
+#: src/wx/film_editor.cc:159
 msgid "Encrypted"
 msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:59
+#: src/wx/dci_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
 
+#: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:106
+#, fuzzy
+msgid "Fetching..."
+msgstr "contando..."
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Propiedades de la película"
 
-#: src/wx/new_film_dialog.cc:44
+#: src/wx/new_film_dialog.cc:37
 msgid "Film name"
 msgstr "Nombre de la película"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
 msgid "Filters"
 msgstr "Filtros"
 
@@ -404,16 +465,16 @@ msgstr "Filtros"
 msgid "Find missing..."
 msgstr ""
 
-#: src/wx/film_editor.cc:143
+#: src/wx/film_editor.cc:145
 #, fuzzy
 msgid "Frame Rate"
 msgstr "Velocidad DCP"
 
-#: src/wx/properties_dialog.cc:41
+#: src/wx/properties_dialog.cc:39
 msgid "Frames"
 msgstr "Fotogramas"
 
-#: src/wx/properties_dialog.cc:49
+#: src/wx/properties_dialog.cc:45
 msgid "Frames already encoded"
 msgstr "Fotogramas ya codificados"
 
@@ -426,7 +487,7 @@ msgstr ""
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:135
+#: src/wx/config_dialog.cc:129
 msgid "From address for KDM emails"
 msgstr "Remitente para los emails de KDM"
 
@@ -434,7 +495,7 @@ msgstr "Remitente para los emails de KDM"
 msgid "Full"
 msgstr ""
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr ""
 
@@ -442,15 +503,19 @@ msgstr ""
 msgid "Gain Calculator"
 msgstr "Calculadora de ganancia"
 
-#: src/wx/audio_gain_dialog.cc:31
+#: src/wx/audio_gain_dialog.cc:28
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr ""
 
-#: src/wx/properties_dialog.cc:57
+#: src/wx/properties_dialog.cc:52
 msgid "Gb"
 msgstr "Gb"
 
+#: src/wx/audio_mapping_view.cc:304
+msgid "HI"
+msgstr ""
+
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
 msgstr ""
@@ -459,7 +524,7 @@ msgstr ""
 msgid "Host"
 msgstr ""
 
-#: src/wx/server_dialog.cc:41
+#: src/wx/server_dialog.cc:38
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
@@ -467,15 +532,15 @@ msgstr "Nombre o dirección IP"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/wx/gain_calculator_dialog.cc:32
+#: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:627
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/config_dialog.cc:373
+#: src/wx/config_dialog.cc:519
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Dirección IP"
@@ -484,15 +549,11 @@ msgstr "Dirección IP"
 msgid "Input gamma"
 msgstr "Gamma de entrada"
 
-#: src/wx/film_editor.cc:222
+#: src/wx/film_editor.cc:224
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:340
-msgid "Issuer"
-msgstr "Emisor"
-
-#: src/wx/film_editor.cc:176
+#: src/wx/film_editor.cc:178
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
@@ -500,23 +561,28 @@ msgstr "Ancho de banda JPEG2000"
 msgid "Join"
 msgstr ""
 
-#: src/wx/config_dialog.cc:71
-msgid "KDM email"
+#: src/wx/config_dialog.cc:694
+#, fuzzy
+msgid "KDM Email"
 msgstr "Email KDM"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:298
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
 
-#: src/wx/audio_mapping_view.cc:276
+#: src/wx/audio_mapping_view.cc:280
 msgid "L"
 msgstr ""
 
-#: src/wx/video_panel.cc:90
+#: src/wx/audio_mapping_view.cc:312
+msgid "Lc"
+msgstr ""
+
+#: src/wx/video_panel.cc:87
 msgid "Left crop"
 msgstr "Recorte izquierda"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:292
 msgid "Lfe"
 msgstr ""
 
@@ -524,21 +590,25 @@ msgstr ""
 msgid "Linearise input gamma curve for low values"
 msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/screen_dialog.cc:46
+msgid "Load from file..."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:296
 #, fuzzy
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/film_editor.cc:741
+#: src/wx/film_editor.cc:749
 msgid "MISSING: "
 msgstr ""
 
-#: src/wx/config_dialog.cc:127
+#: src/wx/config_dialog.cc:121
 #, fuzzy
 msgid "Mail password"
 msgstr "Clave del TMS"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:117
 #, fuzzy
 msgid "Mail user name"
 msgstr "Usuario del TMS"
@@ -551,19 +621,16 @@ msgstr "Crear KDMs"
 msgid "Matrix"
 msgstr ""
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "Mbit/s"
-msgstr ""
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Maximum JPEG2000 bandwidth"
+msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/config_dialog.cc:67
-msgid "Metadata"
+#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/config_dialog.cc:59
-msgid "Miscellaneous"
-msgstr "Varios"
-
-#: src/wx/video_panel.cc:281
+#: src/wx/video_panel.cc:277
 #, fuzzy
 msgid "Multiple content selected"
 msgstr "Tipo de contenido"
@@ -572,8 +639,8 @@ msgstr "Tipo de contenido"
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
-#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nombre"
 
@@ -585,16 +652,12 @@ msgstr "Nueva película"
 msgid "New versions of DCP-o-matic are available."
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:323
+#: src/wx/audio_mapping_view.cc:351
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr ""
 
-#: src/wx/video_panel.cc:198
-msgid "No stretch"
-msgstr "Sin deformar"
-
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
 msgid "None"
 msgstr "Ninguno"
 
@@ -602,7 +665,11 @@ msgstr "Ninguno"
 msgid "Off"
 msgstr ""
 
-#: src/wx/config_dialog.cc:119
+#: src/wx/screen_dialog.cc:65
+msgid "Other"
+msgstr ""
+
+#: src/wx/config_dialog.cc:113
 #, fuzzy
 msgid "Outgoing mail server"
 msgstr "Servidores de codificación"
@@ -611,16 +678,16 @@ msgstr "Servidores de codificación"
 msgid "Output gamma"
 msgstr "Gamma de salida"
 
-#: src/wx/dci_metadata_dialog.cc:63
+#: src/wx/dci_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/video_panel.cc:328
+#: src/wx/video_panel.cc:322
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Completado con negro hasta %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:639
 #, fuzzy
 msgid "Password"
 msgstr "Clave del TMS"
@@ -633,11 +700,11 @@ msgstr "Pausa"
 msgid "Peak"
 msgstr "Pico"
 
-#: src/wx/film_viewer.cc:62
+#: src/wx/film_viewer.cc:63
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr ""
 
@@ -645,11 +712,11 @@ msgstr ""
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Posición"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:284
 msgid "R"
 msgstr ""
 
@@ -657,12 +724,16 @@ msgstr ""
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:51
+#: src/wx/dci_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
-#: src/wx/editable_list.h:65
+#: src/wx/audio_mapping_view.cc:316
+msgid "Rc"
+msgstr ""
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Quitar"
 
@@ -676,7 +747,7 @@ msgstr "Quitar"
 msgid "Remove Screen"
 msgstr "Quitar"
 
-#: src/wx/repeat_dialog.cc:33
+#: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Repetir"
 
@@ -689,7 +760,7 @@ msgstr "Seleccionar fichero de contenido"
 msgid "Repeat..."
 msgstr "Repetir..."
 
-#: src/wx/film_editor.cc:170
+#: src/wx/film_editor.cc:172
 msgid "Resolution"
 msgstr "Resolución"
 
@@ -697,55 +768,68 @@ msgstr "Resolución"
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/wx/audio_mapping_view.cc:331
+#: src/wx/audio_mapping_view.cc:359
 msgid "Right click to change gain."
 msgstr ""
 
-#: src/wx/video_panel.cc:101
+#: src/wx/video_panel.cc:98
 msgid "Right crop"
 msgstr "Recorte derecha"
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/audio_mapping_view.cc:300
 #, fuzzy
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:223
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:131
 #, fuzzy
 msgid "Scale to"
 msgstr "Escalador"
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:313
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Redimensionado a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:190
+#: src/wx/film_editor.cc:192
 msgid "Scaler"
 msgstr "Escalador"
 
-#: src/wx/screen_dialog.cc:88
+#: src/wx/screen_dialog.cc:102
 #, fuzzy
 msgid "Select Certificate File"
 msgstr "Seleccionar fichero de contenido"
 
-#: src/wx/kdm_dialog.cc:136
+#: src/wx/kdm_dialog.cc:140
 msgid "Send by email"
 msgstr "Enviar por email"
 
+#: src/wx/dolby_certificate_dialog.cc:47
+msgid "Serial number"
+msgstr ""
+
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Servidor"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/doremi_certificate_dialog.cc:35
+msgid "Server serial number"
+msgstr ""
+
+#: src/wx/config_dialog.cc:499
+#, fuzzy
+msgid "Servers"
+msgstr "Servidor"
+
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Seleccionar"
 
-#: src/wx/config_dialog.cc:97
+#: src/wx/config_dialog.cc:86
 msgid "Set language"
 msgstr "Seleccionar idioma"
 
@@ -753,7 +837,7 @@ msgstr "Seleccionar idioma"
 msgid "Show Audio..."
 msgstr "Mostrar audio..."
 
-#: src/wx/film_editor.cc:153
+#: src/wx/film_editor.cc:155
 msgid "Signed"
 msgstr ""
 
@@ -770,15 +854,15 @@ msgstr ""
 msgid "Stable version "
 msgstr "Tipo de contenido"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Standard"
 msgstr "Estandard"
 
-#: src/wx/dci_metadata_dialog.cc:55
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Estudio (ej. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:43
+#: src/wx/dci_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Idioma del subtítulo (ej. EN)"
 
@@ -805,21 +889,21 @@ msgstr "Desplazamiento del subtítulo"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:132
+#: src/wx/about_dialog.cc:146
 msgid "Supported by"
 msgstr "Soportado por"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/config_dialog.cc:607
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:631
 #, fuzzy
 msgid "Target path"
 msgstr "Ruta en el TMS"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/dci_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
@@ -828,6 +912,11 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Tipo de contenido"
 
+#: src/wx/about_dialog.cc:188
+#, fuzzy
+msgid "Tested by"
+msgstr "Traducido por"
+
 #: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
@@ -839,15 +928,19 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr ""
 
+#: src/wx/film_viewer.cc:133
+msgid "There is not enough free memory to do that."
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/wx/config_dialog.cc:115
+#: src/wx/config_dialog.cc:105
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
-#: src/wx/audio_plot.cc:148
+#: src/wx/audio_plot.cc:168
 msgid "Time"
 msgstr "Tiempo"
 
@@ -856,41 +949,51 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:290
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
-#: src/wx/timing_panel.cc:34
+#: src/wx/timing_panel.cc:35
 msgid "Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:112
+#: src/wx/video_panel.cc:109
 msgid "Top crop"
 msgstr "Recortar arriba"
 
-#: src/wx/about_dialog.cc:101
+#: src/wx/about_dialog.cc:103
 msgid "Translated by"
 msgstr "Traducido por"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 #, fuzzy
 msgid "Trim from end"
 msgstr "Recortar fotogramas"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 #, fuzzy
 msgid "Trim from start"
 msgstr "Recortar fotogramas"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/kdm_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:148
+#, fuzzy
+msgid "Unexpected certificate filename form"
+msgstr "Seleccionar fichero de contenido"
+
+#: src/wx/screen_dialog.cc:62
+#, fuzzy
+msgid "Unknown"
+msgstr "desconocido"
+
+#: src/wx/kdm_dialog.cc:93
 msgid "Until"
 msgstr "Hasta"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:286
 msgid "Up"
 msgstr ""
 
@@ -898,33 +1001,37 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:128
 msgid "Use DCI name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/config_dialog.cc:369
+#: src/wx/config_dialog.cc:515
 msgid "Use all servers"
 msgstr ""
 
-#: src/wx/film_editor.cc:147
+#: src/wx/film_editor.cc:149
 msgid "Use best"
 msgstr "Usar la mejor"
 
-#: src/wx/content_colour_conversion_dialog.cc:41
+#: src/wx/content_colour_conversion_dialog.cc:42
 #, fuzzy
 msgid "Use preset"
 msgstr "Usar la mejor"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:635
 #, fuzzy
 msgid "User name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/video_panel.cc:70
+#: src/wx/audio_mapping_view.cc:308
+msgid "VI"
+msgstr ""
+
+#: src/wx/video_panel.cc:67
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 #, fuzzy
 msgid "Video frame rate"
 msgstr "Velocidad DCP"
@@ -933,7 +1040,7 @@ msgstr "Velocidad DCP"
 msgid "With Subtitles"
 msgstr "Con subtítulos"
 
-#: src/wx/kdm_dialog.cc:122
+#: src/wx/kdm_dialog.cc:127
 msgid "Write to"
 msgstr "Escribe a"
 
@@ -976,20 +1083,20 @@ msgstr "Audio"
 msgid "channels"
 msgstr "canales"
 
-#: src/wx/properties_dialog.cc:50
+#: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "contando..."
 
-#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:319
 msgid "s"
 msgstr "s"
 
@@ -997,7 +1104,7 @@ msgstr "s"
 msgid "still"
 msgstr "fijo"
 
-#: src/wx/repeat_dialog.cc:37
+#: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr ""
 
@@ -1006,6 +1113,30 @@ msgstr ""
 msgid "video"
 msgstr "Vídeo"
 
+#, fuzzy
+#~ msgid "Content channel"
+#~ msgstr "1 canal"
+
+#, fuzzy
+#~ msgid "Creator"
+#~ msgstr "Crear en carpeta"
+
+#~ msgid "DCP-o-matic Preferences"
+#~ msgstr "Preferencias DCP-o-matic"
+
+#, fuzzy
+#~ msgid "Encoding servers"
+#~ msgstr "Servidores de codificación"
+
+#~ msgid "Issuer"
+#~ msgstr "Emisor"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Varios"
+
+#~ msgid "No stretch"
+#~ msgstr "Sin deformar"
+
 #~ msgid "MBps"
 #~ msgstr "MBps"
 
@@ -1086,9 +1217,6 @@ msgstr "Vídeo"
 #~ msgid "frames"
 #~ msgstr "fotogramas"
 
-#~ msgid "unknown"
-#~ msgstr "desconocido"
-
 #~ msgid "TMS IP address"
 #~ msgstr "Dirección IP del TMS"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index a7f5f8c7f..98df06cb3 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-01-25 16:56+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -29,11 +29,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:131
+#: src/wx/config_dialog.cc:125
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(le mot de passe sera enregistré sur le disque au format texte)"
 
-#: src/wx/config_dialog.cc:108
+#: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 "(redémarrez DCP-o-matic pour que les changements de langue prennent effet)"
@@ -50,27 +50,31 @@ msgstr "1/"
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:196
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:220
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:166
+#: src/wx/film_editor.cc:168
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:199
+msgid "3D alternate"
+msgstr ""
+
+#: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D gauche/droite"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D dessus/dessous"
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:221
 msgid "4K"
 msgstr "4K"
 
@@ -90,18 +94,22 @@ msgstr "Ajout cinéma"
 msgid "Add Screen..."
 msgstr "Ajout une salle"
 
-#: src/wx/film_editor.cc:272
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/film_editor.cc:274
+#: src/wx/film_editor.cc:282
 msgid "Add folder..."
 msgstr "Ajout dossier..."
 
-#: src/wx/editable_list.h:61
+#: src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Ajouter..."
 
+#: src/wx/about_dialog.cc:107
+msgid "Artwork by"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -114,7 +122,7 @@ msgstr "Délai audio"
 msgid "Audio Gain"
 msgstr "Gain audio"
 
-#: src/wx/dci_metadata_dialog.cc:39
+#: src/wx/dci_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
@@ -122,11 +130,11 @@ msgstr "Langue audio (ex. FR)"
 msgid "Audio Stream"
 msgstr "Flux audio"
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "Audio channels"
 msgstr "Canaux audios"
 
-#: src/wx/audio_mapping_view.cc:325
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
@@ -134,7 +142,7 @@ msgstr ""
 "Le son du canal audio %d sera transféré au canal audio du DCP %d sans "
 "modification."
 
-#: src/wx/audio_mapping_view.cc:328
+#: src/wx/audio_mapping_view.cc:356
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -148,7 +156,7 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Mauvais paramètre pour %s (%s)"
 
-#: src/wx/video_panel.cc:123
+#: src/wx/video_panel.cc:120
 msgid "Bottom crop"
 msgstr "Découpe bas"
 
@@ -156,11 +164,19 @@ msgstr "Découpe bas"
 msgid "Browse..."
 msgstr "Parcourir..."
 
-#: src/wx/gain_calculator_dialog.cc:36
+#: src/wx/audio_mapping_view.cc:320
+msgid "BsL"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+msgid "BsR"
+msgstr ""
+
+#: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
 msgstr "Je souhaite utiliser ce volume"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/audio_mapping_view.cc:288
 msgid "C"
 msgstr "C"
 
@@ -172,6 +188,17 @@ msgstr "Calcul..."
 msgid "Cancel"
 msgstr "Annuler"
 
+#: src/wx/screen_dialog.cc:44
+#, fuzzy
+msgid "Certificate"
+msgstr "Sélectionner le certificat"
+
+#: src/wx/dolby_certificate_dialog.cc:157
+#: src/wx/doremi_certificate_dialog.cc:67
+#, fuzzy
+msgid "Certificate downloaded"
+msgstr "Sélectionner le certificat"
+
 #: src/wx/audio_gain_dialog.cc:26
 #, fuzzy
 msgid "Channel gain"
@@ -181,11 +208,11 @@ msgstr "Canaux"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/config_dialog.cc:143
+#: src/wx/config_dialog.cc:137
 msgid "Check for testing updates as well as stable ones"
 msgstr "Recherche de mises à jour en test aussi bien que stables."
 
-#: src/wx/config_dialog.cc:139
+#: src/wx/config_dialog.cc:133
 msgid "Check for updates on startup"
 msgstr "Recherche de mises à jour au démarrage."
 
@@ -194,49 +221,51 @@ msgstr "Recherche de mises à jour au démarrage."
 msgid "Choose a file"
 msgstr "Choisissez un dossier"
 
-#: src/wx/film_editor.cc:767
+#: src/wx/film_editor.cc:775
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
-#: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
-msgid "Colour conversion"
-msgstr "Conversion colorimétrique"
+#: src/wx/dolby_certificate_dialog.cc:43
+#, fuzzy
+msgid "Cinema"
+msgstr "Ajout cinéma"
 
-#: src/wx/config_dialog.cc:65
-msgid "Colour conversions"
+#: src/wx/config_dialog.cc:561
+#, fuzzy
+msgid "Colour Conversions"
 msgstr "Conversions colorimétriques"
 
-#: src/wx/film_editor.cc:132
+#: src/wx/content_colour_conversion_dialog.cc:34
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+msgid "Colour conversion"
+msgstr "Conversion colorimétrique"
+
+#: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:137
+#: src/wx/film_editor.cc:139
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: src/wx/audio_mapping_view.cc:273
-msgid "Content channel"
-msgstr "Contenu audio"
-
-#: src/wx/video_panel.cc:335
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Cadence du contenu %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/dci_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Version du contenu"
 
-#: src/wx/video_panel.cc:293
+#: src/wx/video_panel.cc:289
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n"
@@ -245,7 +274,7 @@ msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr "Analyse du son impossible"
 
-#: src/wx/film_viewer.cc:332
+#: src/wx/film_viewer.cc:345
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -255,20 +284,20 @@ msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
-#: src/wx/new_film_dialog.cc:48
+#: src/wx/dolby_certificate_dialog.cc:39
+msgid "Country"
+msgstr ""
+
+#: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/config_dialog.cc:344
-msgid "Creator"
-msgstr "Créateur"
-
-#: src/wx/video_panel.cc:305
+#: src/wx/video_panel.cc:301
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Découpe de %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:244
+#: src/wx/video_panel.cc:241
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -276,11 +305,11 @@ msgstr "Personnalisé"
 msgid "DCI name"
 msgstr "Nom DCI"
 
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:116
+#: src/wx/film_editor.cc:118
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
@@ -288,61 +317,95 @@ msgstr "Nom du DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:52
-msgid "DCP-o-matic Preferences"
-msgstr "Préférences DCP-o-matic"
-
 #: src/wx/audio_dialog.cc:98
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:216
+#: src/wx/config_dialog.cc:331
 msgid "Default DCI name details"
 msgstr "Détails du nom DCI par défaut"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:344
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:238
+#: src/wx/config_dialog.cc:353
 #, fuzzy
 msgid "Default audio delay"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:220
+#: src/wx/config_dialog.cc:335
 msgid "Default container"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:224
+#: src/wx/config_dialog.cc:339
 msgid "Default content type"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:365
+#, fuzzy
+msgid "Default creator"
+msgstr "Type de contenu par défaut"
+
+#: src/wx/config_dialog.cc:323
 msgid "Default directory for new films"
 msgstr "Dossier par défaut des nouveaux films"
 
-#: src/wx/config_dialog.cc:200
+#: src/wx/config_dialog.cc:315
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:361
+#, fuzzy
+msgid "Default issuer"
+msgstr "Format par défaut"
+
+#: src/wx/config_dialog.cc:294
 #, fuzzy
 msgid "Defaults"
 msgstr "Format par défaut"
 
-#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
+#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Détails..."
 
-#: src/wx/properties_dialog.cc:45
+#: src/wx/properties_dialog.cc:42
 msgid "Disk space required"
 msgstr "Espace disque requis"
 
-#: src/wx/film_editor.cc:280
+#: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
+#: src/wx/screen_dialog.cc:135
+msgid "Dolby"
+msgstr ""
+
+#: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
+#: src/wx/screen_dialog.cc:134
+msgid "Doremi"
+msgstr ""
+
+#: src/wx/doremi_certificate_dialog.cc:48
+msgid "Doremi serial numbers must have 6 digits"
+msgstr ""
+
+#: src/wx/film_editor.cc:288
 msgid "Down"
 msgstr "Descendre"
 
+#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#, fuzzy
+msgid "Download"
+msgstr "Descendre"
+
+#: src/wx/download_certificate_dialog.cc:27
+msgid "Download certificate"
+msgstr ""
+
+#: src/wx/dolby_certificate_dialog.cc:132
+#: src/wx/doremi_certificate_dialog.cc:52
+msgid "Downloading certificate"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
 msgstr "Éditer le cinéma"
@@ -351,13 +414,13 @@ msgstr "Éditer le cinéma"
 msgid "Edit Screen..."
 msgstr "Éditer la salle"
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:217
-#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
-#: src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
+#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Éditer..."
 
-#: src/wx/cinema_dialog.cc:35
+#: src/wx/cinema_dialog.cc:31
 msgid "Email address for KDM delivery"
 msgstr "Adresse email pour l'envoi de KDM"
 
@@ -366,27 +429,29 @@ msgstr "Adresse email pour l'envoi de KDM"
 msgid "Encoding Servers"
 msgstr "Serveurs d'encodage"
 
-#: src/wx/config_dialog.cc:63
-msgid "Encoding servers"
-msgstr "Serveurs d'encodage"
-
-#: src/wx/film_editor.cc:157
+#: src/wx/film_editor.cc:159
 msgid "Encrypted"
 msgstr "Crypté"
 
-#: src/wx/dci_metadata_dialog.cc:59
+#: src/wx/dci_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
 
+#: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:106
+#, fuzzy
+msgid "Fetching..."
+msgstr "calcul..."
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Propriétés du film"
 
-#: src/wx/new_film_dialog.cc:44
+#: src/wx/new_film_dialog.cc:37
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
 msgid "Filters"
 msgstr "Filtres"
 
@@ -394,15 +459,15 @@ msgstr "Filtres"
 msgid "Find missing..."
 msgstr "Recherche de l'élément manquant..."
 
-#: src/wx/film_editor.cc:143
+#: src/wx/film_editor.cc:145
 msgid "Frame Rate"
 msgstr "Cadence image"
 
-#: src/wx/properties_dialog.cc:41
+#: src/wx/properties_dialog.cc:39
 msgid "Frames"
 msgstr "Images"
 
-#: src/wx/properties_dialog.cc:49
+#: src/wx/properties_dialog.cc:45
 msgid "Frames already encoded"
 msgstr "Images déjà encodées"
 
@@ -414,7 +479,7 @@ msgstr "Création de DCP libre et gratuit depuis presque tout."
 msgid "From"
 msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:135
+#: src/wx/config_dialog.cc:129
 msgid "From address for KDM emails"
 msgstr "Email expéditeur pour les envoi de KDM"
 
@@ -422,7 +487,7 @@ msgstr "Email expéditeur pour les envoi de KDM"
 msgid "Full"
 msgstr "Plein"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr "Durée totale"
 
@@ -430,15 +495,19 @@ msgstr "Durée totale"
 msgid "Gain Calculator"
 msgstr "Calculateur de gain"
 
-#: src/wx/audio_gain_dialog.cc:31
+#: src/wx/audio_gain_dialog.cc:28
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 
-#: src/wx/properties_dialog.cc:57
+#: src/wx/properties_dialog.cc:52
 msgid "Gb"
 msgstr "Gb"
 
+#: src/wx/audio_mapping_view.cc:304
+msgid "HI"
+msgstr ""
+
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
 msgstr "Avertissements"
@@ -447,7 +516,7 @@ msgstr "Avertissements"
 msgid "Host"
 msgstr "Hôtes"
 
-#: src/wx/server_dialog.cc:41
+#: src/wx/server_dialog.cc:38
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
@@ -455,15 +524,15 @@ msgstr "Nom de l'hôte ou adresse IP"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/wx/gain_calculator_dialog.cc:32
+#: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:627
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/config_dialog.cc:373
+#: src/wx/config_dialog.cc:519
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Adresse IP"
@@ -472,15 +541,11 @@ msgstr "Adresse IP"
 msgid "Input gamma"
 msgstr "Gamma d'entrée"
 
-#: src/wx/film_editor.cc:222
+#: src/wx/film_editor.cc:224
 msgid "Interop"
 msgstr "MXF-Interop"
 
-#: src/wx/config_dialog.cc:340
-msgid "Issuer"
-msgstr "Emetteur"
-
-#: src/wx/film_editor.cc:176
+#: src/wx/film_editor.cc:178
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
@@ -488,23 +553,29 @@ msgstr "Qualité JPEG2000"
 msgid "Join"
 msgstr "Ajouter"
 
-#: src/wx/config_dialog.cc:71
-msgid "KDM email"
+#: src/wx/config_dialog.cc:694
+#, fuzzy
+msgid "KDM Email"
 msgstr "e-mail des KDM"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:298
 msgid "Keep video in sequence"
 msgstr "Garder la vidéo en séquence"
 
-#: src/wx/audio_mapping_view.cc:276
+#: src/wx/audio_mapping_view.cc:280
 msgid "L"
 msgstr "L"
 
-#: src/wx/video_panel.cc:90
+#: src/wx/audio_mapping_view.cc:312
+#, fuzzy
+msgid "Lc"
+msgstr "L"
+
+#: src/wx/video_panel.cc:87
 msgid "Left crop"
 msgstr "Découpe gauche"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:292
 msgid "Lfe"
 msgstr "Lfe"
 
@@ -512,20 +583,24 @@ msgstr "Lfe"
 msgid "Linearise input gamma curve for low values"
 msgstr "Linéariser la courbe gamma d'entrée pour les bas niveaux"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/screen_dialog.cc:46
+msgid "Load from file..."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:296
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:741
+#: src/wx/film_editor.cc:749
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
-#: src/wx/config_dialog.cc:127
+#: src/wx/config_dialog.cc:121
 #, fuzzy
 msgid "Mail password"
 msgstr "Mot de passe"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:117
 #, fuzzy
 msgid "Mail user name"
 msgstr "Nom d'utilisateur du TMS"
@@ -538,19 +613,16 @@ msgstr "Générer les KDMs"
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Maximum JPEG2000 bandwidth"
+msgstr "Qualité JPEG2000"
+
+#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/config_dialog.cc:67
-msgid "Metadata"
-msgstr "Métadonnées"
-
-#: src/wx/config_dialog.cc:59
-msgid "Miscellaneous"
-msgstr "Divers"
-
-#: src/wx/video_panel.cc:281
+#: src/wx/video_panel.cc:277
 #, fuzzy
 msgid "Multiple content selected"
 msgstr "Type de contenu par défaut"
@@ -559,8 +631,8 @@ msgstr "Type de contenu par défaut"
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
-#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nom"
 
@@ -572,16 +644,12 @@ msgstr "Nouveau Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "De nouvelles versions de DCP-o-matic sont disponibles."
 
-#: src/wx/audio_mapping_view.cc:323
+#: src/wx/audio_mapping_view.cc:351
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Aucun son ne passera du canal audio %d au canal du DCP %d."
 
-#: src/wx/video_panel.cc:198
-msgid "No stretch"
-msgstr "Pas d'étirement"
-
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
 msgid "None"
 msgstr "Aucun"
 
@@ -589,7 +657,11 @@ msgstr "Aucun"
 msgid "Off"
 msgstr "Eteint"
 
-#: src/wx/config_dialog.cc:119
+#: src/wx/screen_dialog.cc:65
+msgid "Other"
+msgstr ""
+
+#: src/wx/config_dialog.cc:113
 msgid "Outgoing mail server"
 msgstr "Serveurs de messagerie sortante"
 
@@ -597,16 +669,16 @@ msgstr "Serveurs de messagerie sortante"
 msgid "Output gamma"
 msgstr "Gamma de sortie"
 
-#: src/wx/dci_metadata_dialog.cc:63
+#: src/wx/dci_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/video_panel.cc:328
+#: src/wx/video_panel.cc:322
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:639
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -618,11 +690,11 @@ msgstr "Pause"
 msgid "Peak"
 msgstr "Crête"
 
-#: src/wx/film_viewer.cc:62
+#: src/wx/film_viewer.cc:63
 msgid "Play"
 msgstr "Lecture"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Durée de lecture"
 
@@ -630,11 +702,11 @@ msgstr "Durée de lecture"
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Position"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:284
 msgid "R"
 msgstr "R"
 
@@ -642,12 +714,17 @@ msgstr "R"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:51
+#: src/wx/dci_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Rating (ex. 15)"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
-#: src/wx/editable_list.h:65
+#: src/wx/audio_mapping_view.cc:316
+#, fuzzy
+msgid "Rc"
+msgstr "R"
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -659,7 +736,7 @@ msgstr "Supprimer le cinéma"
 msgid "Remove Screen"
 msgstr "Supprimer la salle"
 
-#: src/wx/repeat_dialog.cc:33
+#: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Répéter"
 
@@ -671,7 +748,7 @@ msgstr "Répéter le contenu"
 msgid "Repeat..."
 msgstr "Répéter..."
 
-#: src/wx/film_editor.cc:170
+#: src/wx/film_editor.cc:172
 msgid "Resolution"
 msgstr "Résolution"
 
@@ -679,52 +756,65 @@ msgstr "Résolution"
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/wx/audio_mapping_view.cc:331
+#: src/wx/audio_mapping_view.cc:359
 msgid "Right click to change gain."
 msgstr "Cliquez droit pour modifier le gain."
 
-#: src/wx/video_panel.cc:101
+#: src/wx/video_panel.cc:98
 msgid "Right crop"
 msgstr "Découpe droite"
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/audio_mapping_view.cc:300
 msgid "Rs"
 msgstr "Rs"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:223
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:131
 msgid "Scale to"
 msgstr "Mise à l'échelle"
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:313
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Mis à l'échelle de %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:190
+#: src/wx/film_editor.cc:192
 msgid "Scaler"
 msgstr "Mise à l'échelle"
 
-#: src/wx/screen_dialog.cc:88
+#: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Sélectionner le certificat"
 
-#: src/wx/kdm_dialog.cc:136
+#: src/wx/kdm_dialog.cc:140
 msgid "Send by email"
 msgstr "Envoyé par e-mail"
 
+#: src/wx/dolby_certificate_dialog.cc:47
+msgid "Serial number"
+msgstr ""
+
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Serveur"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/doremi_certificate_dialog.cc:35
+msgid "Server serial number"
+msgstr ""
+
+#: src/wx/config_dialog.cc:499
+#, fuzzy
+msgid "Servers"
+msgstr "Serveur"
+
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Sélection"
 
-#: src/wx/config_dialog.cc:97
+#: src/wx/config_dialog.cc:86
 msgid "Set language"
 msgstr "Selectionnez la langue"
 
@@ -732,7 +822,7 @@ msgstr "Selectionnez la langue"
 msgid "Show Audio..."
 msgstr "Analyser le son..."
 
-#: src/wx/film_editor.cc:153
+#: src/wx/film_editor.cc:155
 msgid "Signed"
 msgstr "Signé"
 
@@ -749,15 +839,15 @@ msgstr "Echnager"
 msgid "Stable version "
 msgstr "Version du contenu"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/dci_metadata_dialog.cc:55
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:43
+#: src/wx/dci_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
@@ -783,19 +873,19 @@ msgstr "Décalage du sous-titre"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:132
+#: src/wx/about_dialog.cc:146
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/config_dialog.cc:607
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:631
 msgid "Target path"
 msgstr "Chemin d'accès"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/dci_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Territoire (ex. FR)"
 
@@ -804,6 +894,11 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version du contenu"
 
+#: src/wx/about_dialog.cc:188
+#, fuzzy
+msgid "Tested by"
+msgstr "Traduit par"
+
 #: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
@@ -818,15 +913,19 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Il n'y a aucun avertissement: tout semble correct!"
 
+#: src/wx/film_viewer.cc:133
+msgid "There is not enough free memory to do that."
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Processus"
 
-#: src/wx/config_dialog.cc:115
+#: src/wx/config_dialog.cc:105
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/audio_plot.cc:148
+#: src/wx/audio_plot.cc:168
 msgid "Time"
 msgstr "Durée"
 
@@ -834,39 +933,49 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:290
 msgid "Timeline..."
 msgstr "Timeline..."
 
-#: src/wx/timing_panel.cc:34
+#: src/wx/timing_panel.cc:35
 msgid "Timing"
 msgstr "Durée"
 
-#: src/wx/video_panel.cc:112
+#: src/wx/video_panel.cc:109
 msgid "Top crop"
 msgstr "Découpe haut"
 
-#: src/wx/about_dialog.cc:101
+#: src/wx/about_dialog.cc:103
 msgid "Translated by"
 msgstr "Traduit par"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Images coupées depuis la fin"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Images coupées depuis le début"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/kdm_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:148
+#, fuzzy
+msgid "Unexpected certificate filename form"
+msgstr "Sélectionner le certificat"
+
+#: src/wx/screen_dialog.cc:62
+#, fuzzy
+msgid "Unknown"
+msgstr "inconnu"
+
+#: src/wx/kdm_dialog.cc:93
 msgid "Until"
 msgstr "Jusqu'au"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:286
 msgid "Up"
 msgstr "Monter"
 
@@ -874,31 +983,35 @@ msgstr "Monter"
 msgid "Update"
 msgstr "Mise à jour."
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:128
 msgid "Use DCI name"
 msgstr "Utiliser le nom DCI"
 
-#: src/wx/config_dialog.cc:369
+#: src/wx/config_dialog.cc:515
 msgid "Use all servers"
 msgstr "Utiliser tous les serveurs."
 
-#: src/wx/film_editor.cc:147
+#: src/wx/film_editor.cc:149
 msgid "Use best"
 msgstr "Automatique"
 
-#: src/wx/content_colour_conversion_dialog.cc:41
+#: src/wx/content_colour_conversion_dialog.cc:42
 msgid "Use preset"
 msgstr "Utiliser le préréglage"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:635
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: src/wx/video_panel.cc:70
+#: src/wx/audio_mapping_view.cc:308
+msgid "VI"
+msgstr ""
+
+#: src/wx/video_panel.cc:67
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 #, fuzzy
 msgid "Video frame rate"
 msgstr "Cadence image"
@@ -907,7 +1020,7 @@ msgstr "Cadence image"
 msgid "With Subtitles"
 msgstr "Avec sous-titres"
 
-#: src/wx/kdm_dialog.cc:122
+#: src/wx/kdm_dialog.cc:127
 msgid "Write to"
 msgstr "Ecrire à"
 
@@ -958,20 +1071,20 @@ msgstr "audio"
 msgid "channels"
 msgstr "canaux"
 
-#: src/wx/properties_dialog.cc:50
+#: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "calcul..."
 
-#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:319
 msgid "s"
 msgstr "s"
 
@@ -979,7 +1092,7 @@ msgstr "s"
 msgid "still"
 msgstr "fixe"
 
-#: src/wx/repeat_dialog.cc:37
+#: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "fois"
 
@@ -987,6 +1100,30 @@ msgstr "fois"
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Content channel"
+#~ msgstr "Contenu audio"
+
+#~ msgid "Creator"
+#~ msgstr "Créateur"
+
+#~ msgid "DCP-o-matic Preferences"
+#~ msgstr "Préférences DCP-o-matic"
+
+#~ msgid "Encoding servers"
+#~ msgstr "Serveurs d'encodage"
+
+#~ msgid "Issuer"
+#~ msgstr "Emetteur"
+
+#~ msgid "Metadata"
+#~ msgstr "Métadonnées"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Divers"
+
+#~ msgid "No stretch"
+#~ msgstr "Pas d'étirement"
+
 #~ msgid "MBps"
 #~ msgstr "MBps"
 
@@ -1084,9 +1221,6 @@ msgstr "vidéo"
 #~ msgid "pixels"
 #~ msgstr "pixels"
 
-#~ msgid "unknown"
-#~ msgstr "inconnu"
-
 #~ msgid "TMS IP address"
 #~ msgstr "Adresse IP du TMS"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 00d1ac09a..9fe883360 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -27,11 +27,11 @@ msgid ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:131
+#: src/wx/config_dialog.cc:125
 msgid "(password will be stored on disk in plaintext)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:108
+#: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
@@ -47,27 +47,31 @@ msgstr ""
 msgid "1 channel"
 msgstr "1 canale"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:196
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:220
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:166
+#: src/wx/film_editor.cc:168
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:199
+msgid "3D alternate"
+msgstr ""
+
+#: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr ""
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr ""
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:221
 msgid "4K"
 msgstr ""
 
@@ -87,18 +91,22 @@ msgstr "Aggiungi Cinema"
 msgid "Add Screen..."
 msgstr "Aggiungi Schermo"
 
-#: src/wx/film_editor.cc:272
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Aggiungi File"
 
-#: src/wx/film_editor.cc:274
+#: src/wx/film_editor.cc:282
 msgid "Add folder..."
 msgstr "Aggiungi cartella"
 
-#: src/wx/editable_list.h:61
+#: src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Aggiungi..."
 
+#: src/wx/about_dialog.cc:107
+msgid "Artwork by"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -111,7 +119,7 @@ msgstr "Ritardo dell'audio"
 msgid "Audio Gain"
 msgstr "Guadagno dell'audio"
 
-#: src/wx/dci_metadata_dialog.cc:39
+#: src/wx/dci_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
@@ -119,18 +127,18 @@ msgstr "Lingua dell'audio (es. EN)"
 msgid "Audio Stream"
 msgstr "Traccia Audio"
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "Audio channels"
 msgstr "Canali audio"
 
-#: src/wx/audio_mapping_view.cc:325
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr ""
 "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP inalterato."
 
-#: src/wx/audio_mapping_view.cc:328
+#: src/wx/audio_mapping_view.cc:356
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -144,7 +152,7 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Valore sbagliato per %s (%s)"
 
-#: src/wx/video_panel.cc:123
+#: src/wx/video_panel.cc:120
 msgid "Bottom crop"
 msgstr "Taglio in basso"
 
@@ -152,11 +160,19 @@ msgstr "Taglio in basso"
 msgid "Browse..."
 msgstr "Sfoglia..."
 
-#: src/wx/gain_calculator_dialog.cc:36
+#: src/wx/audio_mapping_view.cc:320
+msgid "BsL"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+msgid "BsR"
+msgstr ""
+
+#: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
 msgstr "Ma dovrò riprodurre con il fader a"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/audio_mapping_view.cc:288
 msgid "C"
 msgstr ""
 
@@ -168,6 +184,17 @@ msgstr "Calcola..."
 msgid "Cancel"
 msgstr "Annulla"
 
+#: src/wx/screen_dialog.cc:44
+#, fuzzy
+msgid "Certificate"
+msgstr "Seleziona il file del Certificato"
+
+#: src/wx/dolby_certificate_dialog.cc:157
+#: src/wx/doremi_certificate_dialog.cc:67
+#, fuzzy
+msgid "Certificate downloaded"
+msgstr "Seleziona il file del Certificato"
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Guadagno audio"
@@ -176,11 +203,11 @@ msgstr "Guadagno audio"
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/config_dialog.cc:143
+#: src/wx/config_dialog.cc:137
 msgid "Check for testing updates as well as stable ones"
 msgstr "Controlla per aggiornamenti test o stabili"
 
-#: src/wx/config_dialog.cc:139
+#: src/wx/config_dialog.cc:133
 msgid "Check for updates on startup"
 msgstr "Controlla gli aggiornamentio alla partenza"
 
@@ -188,49 +215,51 @@ msgstr "Controlla gli aggiornamentio alla partenza"
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: src/wx/film_editor.cc:767
+#: src/wx/film_editor.cc:775
 msgid "Choose a file or files"
 msgstr "Scegli uno o più file"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
 msgid "Choose a folder"
 msgstr "Scegli una cartella"
 
-#: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
-msgid "Colour conversion"
-msgstr "Conversione colore"
+#: src/wx/dolby_certificate_dialog.cc:43
+#, fuzzy
+msgid "Cinema"
+msgstr "Aggiungi Cinema"
 
-#: src/wx/config_dialog.cc:65
-msgid "Colour conversions"
+#: src/wx/config_dialog.cc:561
+#, fuzzy
+msgid "Colour Conversions"
 msgstr "Conversioni colore"
 
-#: src/wx/film_editor.cc:132
+#: src/wx/content_colour_conversion_dialog.cc:34
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+msgid "Colour conversion"
+msgstr "Conversione colore"
+
+#: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Contenitore"
 
-#: src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Sorgente"
 
-#: src/wx/film_editor.cc:137
+#: src/wx/film_editor.cc:139
 msgid "Content Type"
 msgstr "Tipo di sorgente"
 
-#: src/wx/audio_mapping_view.cc:273
-msgid "Content channel"
-msgstr "Canale Sorgente"
-
-#: src/wx/video_panel.cc:335
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Freq. fotogrammi sorgente %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/dci_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Tipo di sorgente"
 
-#: src/wx/video_panel.cc:293
+#: src/wx/video_panel.cc:289
 #, fuzzy, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Il video originale è %dx%d (%.2f:1)\n"
@@ -239,7 +268,7 @@ msgstr "Il video originale è %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr "Non posso analizzare l'audio."
 
-#: src/wx/film_viewer.cc:332
+#: src/wx/film_viewer.cc:345
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -249,21 +278,20 @@ msgstr "Non posso decodificare il video per guardarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Non posso creare il DCP: %s"
 
-#: src/wx/new_film_dialog.cc:48
-msgid "Create in folder"
-msgstr "Crea nella cartella"
+#: src/wx/dolby_certificate_dialog.cc:39
+msgid "Country"
+msgstr ""
 
-#: src/wx/config_dialog.cc:344
-#, fuzzy
-msgid "Creator"
+#: src/wx/new_film_dialog.cc:40
+msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/video_panel.cc:305
+#: src/wx/video_panel.cc:301
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Tagliato da %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:244
+#: src/wx/video_panel.cc:241
 msgid "Custom"
 msgstr ""
 
@@ -271,11 +299,11 @@ msgstr ""
 msgid "DCI name"
 msgstr "Nome DCI"
 
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:116
+#: src/wx/film_editor.cc:118
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
@@ -283,60 +311,93 @@ msgstr "Nome del DCP"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:52
-msgid "DCP-o-matic Preferences"
-msgstr "Preferenze DCP-o-matic"
-
 #: src/wx/audio_dialog.cc:98
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:216
+#: src/wx/config_dialog.cc:331
 msgid "Default DCI name details"
 msgstr "Dettagli del nome DCI predefinito"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:344
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:238
+#: src/wx/config_dialog.cc:353
 msgid "Default audio delay"
 msgstr "Ritardo audio predefinito"
 
-#: src/wx/config_dialog.cc:220
+#: src/wx/config_dialog.cc:335
 msgid "Default container"
 msgstr "Contenitore predefinito"
 
-#: src/wx/config_dialog.cc:224
+#: src/wx/config_dialog.cc:339
 msgid "Default content type"
 msgstr "Tipo sorgente predefinito"
 
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:365
+#, fuzzy
+msgid "Default creator"
+msgstr "Contenitore predefinito"
+
+#: src/wx/config_dialog.cc:323
 msgid "Default directory for new films"
 msgstr "Cartella predefinita per i nuovi films"
 
-#: src/wx/config_dialog.cc:200
+#: src/wx/config_dialog.cc:315
 msgid "Default duration of still images"
 msgstr "Durata predefinita immagini statiche"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:361
+#, fuzzy
+msgid "Default issuer"
+msgstr "Predefiniti"
+
+#: src/wx/config_dialog.cc:294
 msgid "Defaults"
 msgstr "Predefiniti"
 
-#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
+#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Dettagli"
 
-#: src/wx/properties_dialog.cc:45
+#: src/wx/properties_dialog.cc:42
 msgid "Disk space required"
 msgstr "Spazio su disco rischiesto"
 
-#: src/wx/film_editor.cc:280
+#: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
+#: src/wx/screen_dialog.cc:135
+msgid "Dolby"
+msgstr ""
+
+#: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
+#: src/wx/screen_dialog.cc:134
+msgid "Doremi"
+msgstr ""
+
+#: src/wx/doremi_certificate_dialog.cc:48
+msgid "Doremi serial numbers must have 6 digits"
+msgstr ""
+
+#: src/wx/film_editor.cc:288
 msgid "Down"
 msgstr ""
 
+#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+msgid "Download"
+msgstr ""
+
+#: src/wx/download_certificate_dialog.cc:27
+msgid "Download certificate"
+msgstr ""
+
+#: src/wx/dolby_certificate_dialog.cc:132
+#: src/wx/doremi_certificate_dialog.cc:52
+msgid "Downloading certificate"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
 msgstr "Modifica Cinema..."
@@ -345,13 +406,13 @@ msgstr "Modifica Cinema..."
 msgid "Edit Screen..."
 msgstr "Modifica Schermo..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:217
-#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
-#: src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
+#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: src/wx/cinema_dialog.cc:35
+#: src/wx/cinema_dialog.cc:31
 msgid "Email address for KDM delivery"
 msgstr "Indirizzo email per consegna KDM"
 
@@ -360,28 +421,29 @@ msgstr "Indirizzo email per consegna KDM"
 msgid "Encoding Servers"
 msgstr "Servers di codifica"
 
-#: src/wx/config_dialog.cc:63
-#, fuzzy
-msgid "Encoding servers"
-msgstr "Servers di codifica"
-
-#: src/wx/film_editor.cc:157
+#: src/wx/film_editor.cc:159
 msgid "Encrypted"
 msgstr "Criptato"
 
-#: src/wx/dci_metadata_dialog.cc:59
+#: src/wx/dci_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
 
+#: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:106
+#, fuzzy
+msgid "Fetching..."
+msgstr "conteggio..."
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Proprietà del film"
 
-#: src/wx/new_film_dialog.cc:44
+#: src/wx/new_film_dialog.cc:37
 msgid "Film name"
 msgstr "Nome del film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
 msgid "Filters"
 msgstr "Filtri"
 
@@ -389,15 +451,15 @@ msgstr "Filtri"
 msgid "Find missing..."
 msgstr "Trova mancante..."
 
-#: src/wx/film_editor.cc:143
+#: src/wx/film_editor.cc:145
 msgid "Frame Rate"
 msgstr "Frequenza fotogrammi"
 
-#: src/wx/properties_dialog.cc:41
+#: src/wx/properties_dialog.cc:39
 msgid "Frames"
 msgstr "Fotogrammi"
 
-#: src/wx/properties_dialog.cc:49
+#: src/wx/properties_dialog.cc:45
 msgid "Frames already encoded"
 msgstr "Fotogrammi già codificati"
 
@@ -409,7 +471,7 @@ msgstr ""
 msgid "From"
 msgstr "Da"
 
-#: src/wx/config_dialog.cc:135
+#: src/wx/config_dialog.cc:129
 msgid "From address for KDM emails"
 msgstr ""
 
@@ -417,7 +479,7 @@ msgstr ""
 msgid "Full"
 msgstr ""
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr ""
 
@@ -425,15 +487,19 @@ msgstr ""
 msgid "Gain Calculator"
 msgstr "Calcolatore del guadagno audio"
 
-#: src/wx/audio_gain_dialog.cc:31
+#: src/wx/audio_gain_dialog.cc:28
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Guadagno per il canale sorgente %d nel canale DCP %d"
 
-#: src/wx/properties_dialog.cc:57
+#: src/wx/properties_dialog.cc:52
 msgid "Gb"
 msgstr "Gb"
 
+#: src/wx/audio_mapping_view.cc:304
+msgid "HI"
+msgstr ""
+
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
 msgstr "Suggerimenti"
@@ -442,7 +508,7 @@ msgstr "Suggerimenti"
 msgid "Host"
 msgstr ""
 
-#: src/wx/server_dialog.cc:41
+#: src/wx/server_dialog.cc:38
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
@@ -450,15 +516,15 @@ msgstr "Nome dell'Host o indirizzo IP"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/wx/gain_calculator_dialog.cc:32
+#: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:627
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/config_dialog.cc:373
+#: src/wx/config_dialog.cc:519
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Indirizzo IP"
@@ -467,15 +533,11 @@ msgstr "Indirizzo IP"
 msgid "Input gamma"
 msgstr ""
 
-#: src/wx/film_editor.cc:222
+#: src/wx/film_editor.cc:224
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:340
-msgid "Issuer"
-msgstr ""
-
-#: src/wx/film_editor.cc:176
+#: src/wx/film_editor.cc:178
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
@@ -483,23 +545,27 @@ msgstr "Banda passante JPEG2000"
 msgid "Join"
 msgstr ""
 
-#: src/wx/config_dialog.cc:71
-msgid "KDM email"
+#: src/wx/config_dialog.cc:694
+msgid "KDM Email"
 msgstr ""
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:298
 msgid "Keep video in sequence"
 msgstr "Tieni i video in sequenza"
 
-#: src/wx/audio_mapping_view.cc:276
+#: src/wx/audio_mapping_view.cc:280
 msgid "L"
 msgstr ""
 
-#: src/wx/video_panel.cc:90
+#: src/wx/audio_mapping_view.cc:312
+msgid "Lc"
+msgstr ""
+
+#: src/wx/video_panel.cc:87
 msgid "Left crop"
 msgstr "Taglio a sinistra"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:292
 msgid "Lfe"
 msgstr ""
 
@@ -507,21 +573,25 @@ msgstr ""
 msgid "Linearise input gamma curve for low values"
 msgstr "Linearizza la curva del gamma in ingresso per piccoli valori"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/screen_dialog.cc:46
+msgid "Load from file..."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:296
 #, fuzzy
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/film_editor.cc:741
+#: src/wx/film_editor.cc:749
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
-#: src/wx/config_dialog.cc:127
+#: src/wx/config_dialog.cc:121
 #, fuzzy
 msgid "Mail password"
 msgstr "Password del TMS"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:117
 #, fuzzy
 msgid "Mail user name"
 msgstr "Nome utente del TMS"
@@ -534,19 +604,16 @@ msgstr "Crea KDM"
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
-msgid "Mbit/s"
-msgstr ""
-
-#: src/wx/config_dialog.cc:67
-msgid "Metadata"
-msgstr ""
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Maximum JPEG2000 bandwidth"
+msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:59
-msgid "Miscellaneous"
+#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/video_panel.cc:281
+#: src/wx/video_panel.cc:277
 msgid "Multiple content selected"
 msgstr "Molteplici sorgenti selezionate"
 
@@ -554,8 +621,8 @@ msgstr "Molteplici sorgenti selezionate"
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
-#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nome"
 
@@ -567,16 +634,12 @@ msgstr "Nuovo Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Una nuova versione di DCP-o-matic è disponibile."
 
-#: src/wx/audio_mapping_view.cc:323
+#: src/wx/audio_mapping_view.cc:351
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Nessun audio sarà passato dal canale %d sorgente al canale %d del DCP"
 
-#: src/wx/video_panel.cc:198
-msgid "No stretch"
-msgstr "Nessuna distorsione"
-
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
 msgid "None"
 msgstr "Nessuno"
 
@@ -584,7 +647,11 @@ msgstr "Nessuno"
 msgid "Off"
 msgstr ""
 
-#: src/wx/config_dialog.cc:119
+#: src/wx/screen_dialog.cc:65
+msgid "Other"
+msgstr ""
+
+#: src/wx/config_dialog.cc:113
 msgid "Outgoing mail server"
 msgstr "Mail server posta in uscita"
 
@@ -592,16 +659,16 @@ msgstr "Mail server posta in uscita"
 msgid "Output gamma"
 msgstr "Gamma in uscita"
 
-#: src/wx/dci_metadata_dialog.cc:63
+#: src/wx/dci_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/video_panel.cc:328
+#: src/wx/video_panel.cc:322
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:639
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
@@ -614,11 +681,11 @@ msgstr "Pausa"
 msgid "Peak"
 msgstr "Picco"
 
-#: src/wx/film_viewer.cc:62
+#: src/wx/film_viewer.cc:63
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr ""
 
@@ -626,11 +693,11 @@ msgstr ""
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Posizione"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:284
 msgid "R"
 msgstr ""
 
@@ -638,12 +705,16 @@ msgstr ""
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:51
+#: src/wx/dci_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Classificazione (es. 15)"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
-#: src/wx/editable_list.h:65
+#: src/wx/audio_mapping_view.cc:316
+msgid "Rc"
+msgstr ""
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -655,7 +726,7 @@ msgstr "Rimuovi Cinema"
 msgid "Remove Screen"
 msgstr "Rimuovi Schermo"
 
-#: src/wx/repeat_dialog.cc:33
+#: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr ""
 
@@ -667,7 +738,7 @@ msgstr "Ripeti il contenuto"
 msgid "Repeat..."
 msgstr ""
 
-#: src/wx/film_editor.cc:170
+#: src/wx/film_editor.cc:172
 msgid "Resolution"
 msgstr "Risoluzione"
 
@@ -675,53 +746,66 @@ msgstr "Risoluzione"
 msgid "Resume"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:331
+#: src/wx/audio_mapping_view.cc:359
 msgid "Right click to change gain."
 msgstr "Clicca il tasto destro per cambiare guadagno."
 
-#: src/wx/video_panel.cc:101
+#: src/wx/video_panel.cc:98
 msgid "Right crop"
 msgstr "Taglio a destra"
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/audio_mapping_view.cc:300
 #, fuzzy
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:223
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:131
 msgid "Scale to"
 msgstr "Scala a"
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:313
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Scalato a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:190
+#: src/wx/film_editor.cc:192
 msgid "Scaler"
 msgstr "Scaler"
 
-#: src/wx/screen_dialog.cc:88
+#: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/kdm_dialog.cc:136
+#: src/wx/kdm_dialog.cc:140
 msgid "Send by email"
 msgstr "Manda per email"
 
+#: src/wx/dolby_certificate_dialog.cc:47
+msgid "Serial number"
+msgstr ""
+
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/doremi_certificate_dialog.cc:35
+msgid "Server serial number"
+msgstr ""
+
+#: src/wx/config_dialog.cc:499
+#, fuzzy
+msgid "Servers"
+msgstr "Server"
+
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr ""
 
-#: src/wx/config_dialog.cc:97
+#: src/wx/config_dialog.cc:86
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
@@ -729,7 +813,7 @@ msgstr "Seleziona la lingua"
 msgid "Show Audio..."
 msgstr "Mostra Audio..."
 
-#: src/wx/film_editor.cc:153
+#: src/wx/film_editor.cc:155
 msgid "Signed"
 msgstr ""
 
@@ -745,15 +829,15 @@ msgstr ""
 msgid "Stable version "
 msgstr "Versione stabile"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Standard"
 msgstr ""
 
-#: src/wx/dci_metadata_dialog.cc:55
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (es. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:43
+#: src/wx/dci_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
@@ -777,20 +861,20 @@ msgstr "Spostamento Y dei Sottotitoli"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:132
+#: src/wx/about_dialog.cc:146
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/config_dialog.cc:607
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:631
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/dci_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Nazione (es. UK)"
 
@@ -798,6 +882,10 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
+#: src/wx/about_dialog.cc:188
+msgid "Tested by"
+msgstr ""
+
 #: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
@@ -811,15 +899,19 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Non ci sono suggerimenti: sembra tutto a posto!"
 
+#: src/wx/film_viewer.cc:133
+msgid "There is not enough free memory to do that."
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/config_dialog.cc:115
+#: src/wx/config_dialog.cc:105
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/audio_plot.cc:148
+#: src/wx/audio_plot.cc:168
 msgid "Time"
 msgstr "Tempo"
 
@@ -827,39 +919,49 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:290
 msgid "Timeline..."
 msgstr ""
 
-#: src/wx/timing_panel.cc:34
+#: src/wx/timing_panel.cc:35
 msgid "Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:112
+#: src/wx/video_panel.cc:109
 msgid "Top crop"
 msgstr "Taglio in alto"
 
-#: src/wx/about_dialog.cc:101
+#: src/wx/about_dialog.cc:103
 msgid "Translated by"
 msgstr ""
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Taglia dalla fine"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Taglia dall'inizio"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/kdm_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:148
+#, fuzzy
+msgid "Unexpected certificate filename form"
+msgstr "Seleziona il file del Certificato"
+
+#: src/wx/screen_dialog.cc:62
+#, fuzzy
+msgid "Unknown"
+msgstr "sconosciuto"
+
+#: src/wx/kdm_dialog.cc:93
 msgid "Until"
 msgstr "Fino a"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:286
 msgid "Up"
 msgstr "Su"
 
@@ -867,31 +969,35 @@ msgstr "Su"
 msgid "Update"
 msgstr "Aggiorna"
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:128
 msgid "Use DCI name"
 msgstr "Usa nome DCI"
 
-#: src/wx/config_dialog.cc:369
+#: src/wx/config_dialog.cc:515
 msgid "Use all servers"
 msgstr "Usa tutti i server"
 
-#: src/wx/film_editor.cc:147
+#: src/wx/film_editor.cc:149
 msgid "Use best"
 msgstr "Usa la migliore"
 
-#: src/wx/content_colour_conversion_dialog.cc:41
+#: src/wx/content_colour_conversion_dialog.cc:42
 msgid "Use preset"
 msgstr "Usa predefinito"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:635
 msgid "User name"
 msgstr "Nome utente"
 
-#: src/wx/video_panel.cc:70
+#: src/wx/audio_mapping_view.cc:308
+msgid "VI"
+msgstr ""
+
+#: src/wx/video_panel.cc:67
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "Frequenza fotogrammi video"
 
@@ -899,7 +1005,7 @@ msgstr "Frequenza fotogrammi video"
 msgid "With Subtitles"
 msgstr "Con sottotitoli"
 
-#: src/wx/kdm_dialog.cc:122
+#: src/wx/kdm_dialog.cc:127
 msgid "Write to"
 msgstr ""
 
@@ -951,20 +1057,20 @@ msgstr "Audio"
 msgid "channels"
 msgstr "canali"
 
-#: src/wx/properties_dialog.cc:50
+#: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "conteggio..."
 
-#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:319
 msgid "s"
 msgstr "s"
 
@@ -972,7 +1078,7 @@ msgstr "s"
 msgid "still"
 msgstr ""
 
-#: src/wx/repeat_dialog.cc:37
+#: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr ""
 
@@ -981,6 +1087,23 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Content channel"
+#~ msgstr "Canale Sorgente"
+
+#, fuzzy
+#~ msgid "Creator"
+#~ msgstr "Crea nella cartella"
+
+#~ msgid "DCP-o-matic Preferences"
+#~ msgstr "Preferenze DCP-o-matic"
+
+#, fuzzy
+#~ msgid "Encoding servers"
+#~ msgstr "Servers di codifica"
+
+#~ msgid "No stretch"
+#~ msgstr "Nessuna distorsione"
+
 #~ msgid "MBps"
 #~ msgstr "MBps"
 
@@ -1072,9 +1195,6 @@ msgstr "Video"
 #~ msgid "pixels"
 #~ msgstr "pizels"
 
-#~ msgid "unknown"
-#~ msgstr "sconosciuto"
-
 #~ msgid "TMS IP address"
 #~ msgstr "Indirizzo IP del TMS"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
new file mode 100644
index 000000000..ba1ac0524
--- /dev/null
+++ b/src/wx/po/nl_NL.po
@@ -0,0 +1,1072 @@
+# 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:40+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/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
+#: src/wx/subtitle_panel.cc:66
+msgid "%"
+msgstr "%"
+
+#: src/wx/about_dialog.cc:78
+msgid ""
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+
+#: src/wx/config_dialog.cc:125
+msgid "(password will be stored on disk in plaintext)"
+msgstr "(wachtwoord wordt opgeslagen op disk in leesbare tekst)"
+
+#: src/wx/config_dialog.cc:98
+msgid "(restart DCP-o-matic to see language changes)"
+msgstr "(herstart DCP-o-matic voor taal wijziging)"
+
+#: src/wx/audio_mapping_view.cc:135
+msgid "-3dB"
+msgstr "-3dB"
+
+#: src/wx/colour_conversion_editor.cc:83
+msgid "1 / "
+msgstr "1 / "
+
+#: src/wx/audio_panel.cc:236
+msgid "1 channel"
+msgstr "1 channel"
+
+#: src/wx/video_panel.cc:196
+msgid "2D"
+msgstr "2D"
+
+#: src/wx/film_editor.cc:220
+msgid "2K"
+msgstr "2K"
+
+#: src/wx/film_editor.cc:168
+msgid "3D"
+msgstr "3D"
+
+#: src/wx/video_panel.cc:199
+msgid "3D alternate"
+msgstr "3D alternate"
+
+#: src/wx/video_panel.cc:197
+msgid "3D left/right"
+msgstr "3D links/rechts"
+
+#: src/wx/video_panel.cc:198
+msgid "3D top/bottom"
+msgstr "3D boven/beneden"
+
+#: src/wx/film_editor.cc:221
+msgid "4K"
+msgstr "4K"
+
+#: src/wx/update_dialog.cc:34
+msgid "A new version of DCP-o-matic is available."
+msgstr "Een nieuwe versie van DCP-o-matic is beschikbaar."
+
+#: src/wx/about_dialog.cc:30
+msgid "About DCP-o-matic"
+msgstr "Over DCP-o-matic"
+
+#: src/wx/kdm_dialog.cc:66
+msgid "Add Cinema..."
+msgstr "Voeg Bioscoop toe..."
+
+#: src/wx/kdm_dialog.cc:73
+msgid "Add Screen..."
+msgstr "Voeg Scherm toe..."
+
+#: src/wx/film_editor.cc:280
+msgid "Add file(s)..."
+msgstr "Voeg bestande(n) toe..."
+
+#: src/wx/film_editor.cc:282
+msgid "Add folder..."
+msgstr "Voeg map toe..."
+
+#: src/wx/editable_list.h:62
+msgid "Add..."
+msgstr "Toevoegen.."
+
+#: src/wx/about_dialog.cc:107
+msgid "Artwork by"
+msgstr "Artwork door"
+
+#: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
+msgid "Audio"
+msgstr "Audio"
+
+#: src/wx/audio_panel.cc:67
+msgid "Audio Delay"
+msgstr "Audio Delay"
+
+#: src/wx/audio_panel.cc:52
+msgid "Audio Gain"
+msgstr "Audio Gain"
+
+#: src/wx/dci_metadata_dialog.cc:35
+msgid "Audio Language (e.g. EN)"
+msgstr "AudioTaal (e.g. NL)"
+
+#: src/wx/audio_panel.cc:81
+msgid "Audio Stream"
+msgstr "Audio Stream"
+
+#: src/wx/film_editor.cc:163
+msgid "Audio channels"
+msgstr "Audio kanalen"
+
+#: src/wx/audio_mapping_view.cc:353
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d unaltered."
+msgstr ""
+"Audio van content kanaal  %d wordt onveranderd doorgestuurd naar DCP kanaal "
+"%d"
+
+#: src/wx/audio_mapping_view.cc:356
+#, c-format
+msgid ""
+"Audio will be passed from content channel %d to DCP channel %d with gain "
+"%.1fdB."
+msgstr ""
+"Audio wordt doorgestuurd van content kanaal %d naar DCP kanaal %d met gain "
+"%1fdB."
+
+#: src/wx/job_wrapper.cc:38
+#, c-format
+msgid "Bad setting for %s (%s)"
+msgstr "Verkeede instellingen voor %s (%s)"
+
+#: src/wx/video_panel.cc:120
+msgid "Bottom crop"
+msgstr "Bottom crop"
+
+#: src/wx/dir_picker_ctrl.cc:37
+msgid "Browse..."
+msgstr "Verkennen..."
+
+#: src/wx/audio_mapping_view.cc:320
+msgid "BsL"
+msgstr "BsL"
+
+#: src/wx/audio_mapping_view.cc:324
+msgid "BsR"
+msgstr "BsR"
+
+#: src/wx/gain_calculator_dialog.cc:32
+msgid "But I have to use fader"
+msgstr "Maak ik gebruik een fader"
+
+#: src/wx/audio_mapping_view.cc:288
+msgid "C"
+msgstr "C"
+
+#: src/wx/audio_panel.cc:63
+msgid "Calculate..."
+msgstr "Bereken..."
+
+#: src/wx/job_manager_view.cc:66
+msgid "Cancel"
+msgstr "Afbreken"
+
+#: src/wx/screen_dialog.cc:44
+msgid "Certificate"
+msgstr "certificaat"
+
+#: src/wx/dolby_certificate_dialog.cc:157
+#: src/wx/doremi_certificate_dialog.cc:67
+#, fuzzy
+msgid "Certificate downloaded"
+msgstr "certificaat"
+
+#: src/wx/audio_gain_dialog.cc:26
+msgid "Channel gain"
+msgstr "Kanaal versterking"
+
+#: src/wx/audio_dialog.cc:44
+msgid "Channels"
+msgstr "Kanalen"
+
+#: src/wx/config_dialog.cc:137
+msgid "Check for testing updates as well as stable ones"
+msgstr "Selecteer voor Test updates en Stabiele versies "
+
+#: src/wx/config_dialog.cc:133
+msgid "Check for updates on startup"
+msgstr "Selecteer voor updates controle bij startup"
+
+#: src/wx/content_menu.cc:182
+msgid "Choose a file"
+msgstr "Kies een bestand"
+
+#: src/wx/film_editor.cc:775
+msgid "Choose a file or files"
+msgstr "Kies bestand(en)"
+
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
+msgid "Choose a folder"
+msgstr "Kies map"
+
+#: src/wx/dolby_certificate_dialog.cc:43
+msgid "Cinema"
+msgstr "Bioscoop"
+
+#: src/wx/config_dialog.cc:561
+msgid "Colour Conversions"
+msgstr "Colour Conversions"
+
+#: src/wx/content_colour_conversion_dialog.cc:34
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+msgid "Colour conversion"
+msgstr "Colour conversion"
+
+#: src/wx/film_editor.cc:134
+msgid "Container"
+msgstr "Container"
+
+#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
+msgid "Content"
+msgstr "Content"
+
+#: src/wx/film_editor.cc:139
+msgid "Content Type"
+msgstr "Content Type"
+
+#: src/wx/video_panel.cc:329
+#, c-format
+msgid "Content frame rate %.4f\n"
+msgstr "Content frame rate %.4f\n"
+
+#: src/wx/dci_metadata_dialog.cc:32
+msgid "Content version"
+msgstr "Content versie"
+
+#: src/wx/video_panel.cc:289
+#, c-format
+msgid "Content video is %dx%d (%.2f:1)\n"
+msgstr "Content video is %dx%d (%.2f:1)\n"
+
+#: src/wx/audio_dialog.cc:136
+msgid "Could not analyse audio."
+msgstr "Kan audio niet analyseren"
+
+#: src/wx/film_viewer.cc:345
+#, c-format
+msgid "Could not decode video for view (%s)"
+msgstr "Kan video niet decoderen voor preview (%s)"
+
+#: src/wx/job_wrapper.cc:40
+#, c-format
+msgid "Could not make DCP: %s"
+msgstr "Kan geen DCP maken: %s"
+
+#: src/wx/dolby_certificate_dialog.cc:39
+msgid "Country"
+msgstr "Land"
+
+#: src/wx/new_film_dialog.cc:40
+msgid "Create in folder"
+msgstr "Maak in map"
+
+#: src/wx/video_panel.cc:301
+#, c-format
+msgid "Cropped to %dx%d (%.2f:1)\n"
+msgstr "Cropped naar %dx%d (%.2f:1)\n"
+
+#: src/wx/video_panel.cc:241
+msgid "Custom"
+msgstr "aangepast"
+
+#: src/wx/dci_metadata_dialog.cc:30
+msgid "DCI name"
+msgstr "DCI naam"
+
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
+msgid "DCP"
+msgstr "DCP"
+
+#: src/wx/film_editor.cc:118
+msgid "DCP Name"
+msgstr "DCP naam"
+
+#: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
+msgid "DCP-o-matic"
+msgstr "DCP-o-matic"
+
+#: src/wx/audio_dialog.cc:98
+#, c-format
+msgid "DCP-o-matic audio - %s"
+msgstr "DCP-o-matic audio - %s"
+
+#: src/wx/config_dialog.cc:331
+msgid "Default DCI name details"
+msgstr "Standaard DCI naam details"
+
+#: src/wx/config_dialog.cc:344
+msgid "Default JPEG2000 bandwidth"
+msgstr "Standaard JPEG2000 bandbreedte"
+
+#: src/wx/config_dialog.cc:353
+msgid "Default audio delay"
+msgstr "Standaard audio delay"
+
+#: src/wx/config_dialog.cc:335
+msgid "Default container"
+msgstr "Standaard container"
+
+#: src/wx/config_dialog.cc:339
+msgid "Default content type"
+msgstr "Standaard content type"
+
+#: src/wx/config_dialog.cc:365
+msgid "Default creator"
+msgstr "Standaard maker"
+
+#: src/wx/config_dialog.cc:323
+msgid "Default directory for new films"
+msgstr "Standaard map voor nieuwe films"
+
+#: src/wx/config_dialog.cc:315
+msgid "Default duration of still images"
+msgstr "Standaard lengte van stills"
+
+#: src/wx/config_dialog.cc:361
+msgid "Default issuer"
+msgstr "Standaard uitgever"
+
+#: src/wx/config_dialog.cc:294
+msgid "Defaults"
+msgstr "Standaard instellingen"
+
+#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
+msgid "Details..."
+msgstr "Details..."
+
+#: src/wx/properties_dialog.cc:42
+msgid "Disk space required"
+msgstr "Benodigde Diskruimte"
+
+#: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
+#: src/wx/screen_dialog.cc:135
+msgid "Dolby"
+msgstr "Dolby"
+
+#: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
+#: src/wx/screen_dialog.cc:134
+msgid "Doremi"
+msgstr "Doremi"
+
+#: src/wx/doremi_certificate_dialog.cc:48
+msgid "Doremi serial numbers must have 6 digits"
+msgstr "Doremi serial numbers moeten bestaan uit 6 digits"
+
+#: src/wx/film_editor.cc:288
+msgid "Down"
+msgstr "Naar beneden"
+
+#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+msgid "Download"
+msgstr "Download"
+
+#: src/wx/download_certificate_dialog.cc:27
+msgid "Download certificate"
+msgstr "Download certificaat"
+
+#: src/wx/dolby_certificate_dialog.cc:132
+#: src/wx/doremi_certificate_dialog.cc:52
+msgid "Downloading certificate"
+msgstr "Downloading certificaat"
+
+#: src/wx/kdm_dialog.cc:68
+msgid "Edit Cinema..."
+msgstr "Edit Bioscoop"
+
+#: src/wx/kdm_dialog.cc:75
+msgid "Edit Screen..."
+msgstr "Edit scherm"
+
+#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
+#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/editable_list.h:64
+msgid "Edit..."
+msgstr "Edit..."
+
+#: src/wx/cinema_dialog.cc:31
+msgid "Email address for KDM delivery"
+msgstr "Email adres voor KDM aflevering"
+
+#: src/wx/servers_list_dialog.cc:30
+msgid "Encoding Servers"
+msgstr "Encoding Servers"
+
+#: src/wx/film_editor.cc:159
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: src/wx/dci_metadata_dialog.cc:50
+msgid "Facility (e.g. DLA)"
+msgstr "faciliteit (e.g. DLA)"
+
+#: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:106
+msgid "Fetching..."
+msgstr "Ophalen..."
+
+#: src/wx/properties_dialog.cc:36
+msgid "Film Properties"
+msgstr "Film Instellingen"
+
+#: src/wx/new_film_dialog.cc:37
+msgid "Film name"
+msgstr "Film naam"
+
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
+msgid "Filters"
+msgstr "Filters"
+
+#: src/wx/content_menu.cc:52
+msgid "Find missing..."
+msgstr "Zoek ontbrekende..."
+
+#: src/wx/film_editor.cc:145
+msgid "Frame Rate"
+msgstr "Frame Rate"
+
+#: src/wx/properties_dialog.cc:39
+msgid "Frames"
+msgstr "Frame"
+
+#: src/wx/properties_dialog.cc:45
+msgid "Frames already encoded"
+msgstr "Frames zijn al omgezet"
+
+#: src/wx/about_dialog.cc:61
+msgid "Free, open-source DCP generation from almost anything."
+msgstr "Gratis, open-source DCP samensteller voor bijna alles."
+
+#: src/wx/kdm_dialog.cc:85
+msgid "From"
+msgstr "Van"
+
+#: src/wx/config_dialog.cc:129
+msgid "From address for KDM emails"
+msgstr "Van adres voor KDM emails"
+
+#: src/wx/audio_mapping_view.cc:134
+msgid "Full"
+msgstr "Volledig"
+
+#: src/wx/timing_panel.cc:43
+msgid "Full length"
+msgstr "Volledige lengte"
+
+#: src/wx/gain_calculator_dialog.cc:27
+msgid "Gain Calculator"
+msgstr "Gain Calculator"
+
+#: src/wx/audio_gain_dialog.cc:28
+#, c-format
+msgid "Gain for content channel %d in DCP channel %d"
+msgstr "Gain voor content kanaal %d in DCP kanaal %d"
+
+#: src/wx/properties_dialog.cc:52
+msgid "Gb"
+msgstr "Gb"
+
+#: src/wx/audio_mapping_view.cc:304
+msgid "HI"
+msgstr "HI"
+
+#: src/wx/hints_dialog.cc:26
+msgid "Hints"
+msgstr "Tips"
+
+#: src/wx/servers_list_dialog.cc:40
+msgid "Host"
+msgstr "Host"
+
+#: src/wx/server_dialog.cc:38
+msgid "Host name or IP address"
+msgstr "Host naam of IP address"
+
+#: src/wx/audio_panel.cc:240
+msgid "Hz"
+msgstr "Hz"
+
+#: src/wx/gain_calculator_dialog.cc:29
+msgid "I want to play this back at fader"
+msgstr "Ik wil dit afspelen met fader"
+
+#: src/wx/config_dialog.cc:627
+msgid "IP address"
+msgstr "IP adres"
+
+#: src/wx/config_dialog.cc:519
+msgid "IP address / host name"
+msgstr "IP adres / host naam"
+
+#: src/wx/colour_conversion_editor.cc:44
+msgid "Input gamma"
+msgstr "Input gamma"
+
+#: src/wx/film_editor.cc:224
+msgid "Interop"
+msgstr "Interop"
+
+#: src/wx/film_editor.cc:178
+msgid "JPEG2000 bandwidth"
+msgstr "JPEG2000 bandbreedte"
+
+#: src/wx/content_menu.cc:51
+msgid "Join"
+msgstr "Samenvoegen"
+
+#: src/wx/config_dialog.cc:694
+msgid "KDM Email"
+msgstr "KDM Email"
+
+#: src/wx/film_editor.cc:298
+msgid "Keep video in sequence"
+msgstr "Behoud video in tijdlijn"
+
+#: src/wx/audio_mapping_view.cc:280
+msgid "L"
+msgstr "L"
+
+#: src/wx/audio_mapping_view.cc:312
+msgid "Lc"
+msgstr "Lc"
+
+#: src/wx/video_panel.cc:87
+msgid "Left crop"
+msgstr "Left crop"
+
+#: src/wx/audio_mapping_view.cc:292
+msgid "Lfe"
+msgstr "Lfe"
+
+#: src/wx/colour_conversion_editor.cc:49
+msgid "Linearise input gamma curve for low values"
+msgstr "Linearise input gamma curve for low values"
+
+#: src/wx/screen_dialog.cc:46
+msgid "Load from file..."
+msgstr "Laad van bestand..."
+
+#: src/wx/audio_mapping_view.cc:296
+msgid "Ls"
+msgstr "Ls"
+
+#: src/wx/film_editor.cc:749
+msgid "MISSING: "
+msgstr "ONTBREEKT:"
+
+#: src/wx/config_dialog.cc:121
+msgid "Mail password"
+msgstr "Mail wachtwoord"
+
+#: src/wx/config_dialog.cc:117
+msgid "Mail user name"
+msgstr "Mail gebruikersnaam"
+
+#: src/wx/kdm_dialog.cc:47
+msgid "Make KDMs"
+msgstr "Maak KDM's"
+
+#: src/wx/colour_conversion_editor.cc:67
+msgid "Matrix"
+msgstr "Matrix"
+
+#: src/wx/config_dialog.cc:109
+msgid "Maximum JPEG2000 bandwidth"
+msgstr "Maximum JPEG2000 bandbreedte"
+
+#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
+msgid "Mbit/s"
+msgstr "Mbit/s"
+
+#: src/wx/video_panel.cc:277
+msgid "Multiple content selected"
+msgstr "Meedere content geselecteerd"
+
+#: src/wx/dir_picker_ctrl.cc:51
+msgid "My Documents"
+msgstr "Mijn documenten"
+
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
+msgid "Name"
+msgstr "Naam"
+
+#: src/wx/new_film_dialog.cc:35
+msgid "New Film"
+msgstr "Nieuwe Film"
+
+#: src/wx/update_dialog.cc:36
+msgid "New versions of DCP-o-matic are available."
+msgstr "Er zijn nieuwe versies van DCP -o- matic beschikbaar."
+
+#: src/wx/audio_mapping_view.cc:351
+#, c-format
+msgid "No audio will be passed from content channel %d to DCP channel %d."
+msgstr ""
+"Er wordt geen audio van het content kanaal %d doorgestuurd naar DCP kanaal "
+"%d."
+
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
+msgid "None"
+msgstr "Geen"
+
+#: src/wx/audio_mapping_view.cc:133
+msgid "Off"
+msgstr "Uit"
+
+#: src/wx/screen_dialog.cc:65
+msgid "Other"
+msgstr "Andere"
+
+#: src/wx/config_dialog.cc:113
+msgid "Outgoing mail server"
+msgstr "Uitgaande mail server"
+
+#: src/wx/colour_conversion_editor.cc:78
+msgid "Output gamma"
+msgstr "Output gamma"
+
+#: src/wx/dci_metadata_dialog.cc:53
+msgid "Package Type (e.g. OV)"
+msgstr "Package Type (e.g. OV)"
+
+#: src/wx/video_panel.cc:322
+#, c-format
+msgid "Padded with black to %dx%d (%.2f:1)\n"
+msgstr "Opgevuld met zwart tot %dx%d (%.2f:1)\n"
+
+#: src/wx/config_dialog.cc:639
+msgid "Password"
+msgstr "Wachtwoord"
+
+#: src/wx/job_manager_view.cc:72 src/wx/job_manager_view.cc:164
+msgid "Pause"
+msgstr "Pauze"
+
+#: src/wx/audio_dialog.cc:60
+msgid "Peak"
+msgstr "Piek"
+
+#: src/wx/film_viewer.cc:63
+msgid "Play"
+msgstr "Afspelen"
+
+#: src/wx/timing_panel.cc:52
+msgid "Play length"
+msgstr "Afspeellengte"
+
+#: src/wx/audio_plot.cc:43
+msgid "Please wait; audio is being analysed..."
+msgstr "Een ogenblik geduld, het audio wordt geanalyseerd..."
+
+#: src/wx/timing_panel.cc:40
+msgid "Position"
+msgstr "Positie"
+
+#: src/wx/audio_mapping_view.cc:284
+msgid "R"
+msgstr "R"
+
+#: src/wx/audio_dialog.cc:61
+msgid "RMS"
+msgstr "RMS"
+
+#: src/wx/dci_metadata_dialog.cc:44
+msgid "Rating (e.g. 15)"
+msgstr "Beoordeling (e.g. 15)"
+
+#: src/wx/audio_mapping_view.cc:316
+msgid "Rc"
+msgstr "Rc"
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/editable_list.h:66
+msgid "Remove"
+msgstr "Verwijder"
+
+#: src/wx/kdm_dialog.cc:70
+msgid "Remove Cinema"
+msgstr "Verwijder Bioscoop"
+
+#: src/wx/kdm_dialog.cc:77
+msgid "Remove Screen"
+msgstr "Verwijder Scherm"
+
+#: src/wx/repeat_dialog.cc:26
+msgid "Repeat"
+msgstr "Herhaal"
+
+#: src/wx/repeat_dialog.cc:24
+msgid "Repeat Content"
+msgstr "Herhaal content"
+
+#: src/wx/content_menu.cc:50
+msgid "Repeat..."
+msgstr "Herhaal..."
+
+#: src/wx/film_editor.cc:172
+msgid "Resolution"
+msgstr "Resolutie"
+
+#: src/wx/job_manager_view.cc:167
+msgid "Resume"
+msgstr "Vervolg"
+
+#: src/wx/audio_mapping_view.cc:359
+msgid "Right click to change gain."
+msgstr "Klik Rechtermuis om gain te veranderen"
+
+#: src/wx/video_panel.cc:98
+msgid "Right crop"
+msgstr "Right crop"
+
+#: src/wx/audio_mapping_view.cc:300
+msgid "Rs"
+msgstr "Rs"
+
+#: src/wx/film_editor.cc:223
+msgid "SMPTE"
+msgstr "SMPTE"
+
+#: src/wx/video_panel.cc:131
+msgid "Scale to"
+msgstr "Schaal tot"
+
+#: src/wx/video_panel.cc:313
+#, c-format
+msgid "Scaled to %dx%d (%.2f:1)\n"
+msgstr "Geschaald naar %dx%d (%.2f:1)\n"
+
+#: src/wx/film_editor.cc:192
+msgid "Scaler"
+msgstr "Schaler"
+
+#: src/wx/screen_dialog.cc:102
+msgid "Select Certificate File"
+msgstr "Selecteer Certificaat bestand"
+
+#: src/wx/kdm_dialog.cc:140
+msgid "Send by email"
+msgstr "Stuur per Email"
+
+#: src/wx/dolby_certificate_dialog.cc:47
+msgid "Serial number"
+msgstr "Serie nummer"
+
+#: src/wx/server_dialog.cc:28
+msgid "Server"
+msgstr "Server"
+
+#: src/wx/doremi_certificate_dialog.cc:35
+msgid "Server serial number"
+msgstr "Server serie nummer"
+
+#: src/wx/config_dialog.cc:499
+msgid "Servers"
+msgstr "Servers"
+
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
+msgid "Set"
+msgstr "Instellen"
+
+#: src/wx/config_dialog.cc:86
+msgid "Set language"
+msgstr "Taal Instellen"
+
+#: src/wx/audio_panel.cc:48
+msgid "Show Audio..."
+msgstr "Toon Audio..."
+
+#: src/wx/film_editor.cc:155
+msgid "Signed"
+msgstr "Signed"
+
+#: src/wx/audio_dialog.cc:71
+msgid "Smoothing"
+msgstr "Smoothing"
+
+#: src/wx/timeline_dialog.cc:38
+msgid "Snap"
+msgstr "Snap"
+
+#: src/wx/update_dialog.cc:43
+msgid "Stable version "
+msgstr "Stabiele versie"
+
+#: src/wx/film_editor.cc:187
+msgid "Standard"
+msgstr "Standaard"
+
+#: src/wx/dci_metadata_dialog.cc:47
+msgid "Studio (e.g. TCF)"
+msgstr "Studio (e.g. TCF)"
+
+#: src/wx/dci_metadata_dialog.cc:38
+msgid "Subtitle Language (e.g. FR)"
+msgstr "Ondertitel Taal (vb  NL)"
+
+#: src/wx/subtitle_panel.cc:62
+msgid "Subtitle Scale"
+msgstr "Ondertitel grootte"
+
+#: src/wx/subtitle_panel.cc:70
+msgid "Subtitle Stream"
+msgstr "Ondertitel Stream"
+
+#: src/wx/subtitle_panel.cc:44
+msgid "Subtitle X Offset"
+msgstr "Ondertitel X offset"
+
+#: src/wx/subtitle_panel.cc:53
+msgid "Subtitle Y Offset"
+msgstr "Ondertitel Y offset"
+
+#: src/wx/subtitle_panel.cc:34
+msgid "Subtitles"
+msgstr "Ondertitels"
+
+#: src/wx/about_dialog.cc:146
+msgid "Supported by"
+msgstr "Ondersteund door"
+
+#: src/wx/config_dialog.cc:607
+msgid "TMS"
+msgstr "TMS"
+
+#: src/wx/config_dialog.cc:631
+msgid "Target path"
+msgstr "Doel pad"
+
+#: src/wx/dci_metadata_dialog.cc:41
+msgid "Territory (e.g. UK)"
+msgstr "Grondgebied (vb NL)"
+
+#: src/wx/update_dialog.cc:48
+msgid "Test version "
+msgstr "Test Versie"
+
+#: src/wx/about_dialog.cc:188
+msgid "Tested by"
+msgstr "Getest door"
+
+#: src/wx/content_menu.cc:223
+msgid ""
+"The content file(s) you specified are not the same as those that are "
+"missing.  Either try again with the correct content file or remove the "
+"missing content."
+msgstr ""
+"De door u aangewezen content bestanden zijn niet hetzelfde als de "
+"ontbrekende bestanden.  Probeer opnieuw met de goede content of verwijder de "
+"ontbrekende content. "
+
+#: src/wx/hints_dialog.cc:97
+msgid "There are no hints: everything looks good!"
+msgstr "Er zijn geen tips, alles lijkt goed!"
+
+#: src/wx/film_viewer.cc:133
+msgid "There is not enough free memory to do that."
+msgstr "Er is niet genoeg geheugen om dat te doen."
+
+#: src/wx/servers_list_dialog.cc:48
+msgid "Threads"
+msgstr "CPU belasting"
+
+#: src/wx/config_dialog.cc:105
+msgid "Threads to use for encoding on this host"
+msgstr "CPU cores beschikbaar voor encoding op deze host"
+
+#: src/wx/audio_plot.cc:168
+msgid "Time"
+msgstr "Tijd"
+
+#: src/wx/timeline_dialog.cc:32
+msgid "Timeline"
+msgstr "Tijdlijn"
+
+#: src/wx/film_editor.cc:290
+msgid "Timeline..."
+msgstr "Tijdlijn..."
+
+#: src/wx/timing_panel.cc:35
+msgid "Timing"
+msgstr "Timing"
+
+#: src/wx/video_panel.cc:109
+msgid "Top crop"
+msgstr "Top crop"
+
+#: src/wx/about_dialog.cc:103
+msgid "Translated by"
+msgstr "Vertaald door"
+
+#: src/wx/timing_panel.cc:49
+msgid "Trim from end"
+msgstr "Trim vanaf einde"
+
+#: src/wx/timing_panel.cc:46
+msgid "Trim from start"
+msgstr "Trim vanaf begin"
+
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
+msgid "Type"
+msgstr "Type"
+
+#: src/wx/dolby_certificate_dialog.cc:148
+msgid "Unexpected certificate filename form"
+msgstr "Onverwachte certificaat bestandsnaam vorm"
+
+#: src/wx/screen_dialog.cc:62
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: src/wx/kdm_dialog.cc:93
+msgid "Until"
+msgstr "Totdat"
+
+#: src/wx/film_editor.cc:286
+msgid "Up"
+msgstr "Omhoog"
+
+#: src/wx/update_dialog.cc:27
+msgid "Update"
+msgstr "Update"
+
+#: src/wx/film_editor.cc:128
+msgid "Use DCI name"
+msgstr "Gebruik DCI naam"
+
+#: src/wx/config_dialog.cc:515
+msgid "Use all servers"
+msgstr "Gebruik alle servers"
+
+#: src/wx/film_editor.cc:149
+msgid "Use best"
+msgstr "Gebruik de beste"
+
+#: src/wx/content_colour_conversion_dialog.cc:42
+msgid "Use preset"
+msgstr "Gebruik preset"
+
+#: src/wx/config_dialog.cc:635
+msgid "User name"
+msgstr "Gebruikersnaam"
+
+#: src/wx/audio_mapping_view.cc:308
+msgid "VI"
+msgstr "VI"
+
+#: src/wx/video_panel.cc:67
+msgid "Video"
+msgstr "Video"
+
+#: src/wx/timing_panel.cc:57
+msgid "Video frame rate"
+msgstr "Video frame rate"
+
+#: src/wx/subtitle_panel.cc:39
+msgid "With Subtitles"
+msgstr "Met ondertiteling"
+
+#: src/wx/kdm_dialog.cc:127
+msgid "Write to"
+msgstr "Schrijf naar"
+
+#: src/wx/about_dialog.cc:91
+msgid "Written by"
+msgstr "Geschreven door"
+
+#: src/wx/hints_dialog.cc:90
+#, c-format
+msgid ""
+"You have %d files that look like they are VOB files from DVD. You should "
+"join them to ensure smooth joins between the files."
+msgstr ""
+"U hebt %d bestanden die lijken op VOB bestanden van DVD. U moet deze "
+"samenvoegen om soepele weergave mogelijk te maken."
+
+#: src/wx/hints_dialog.cc:76
+#, c-format
+msgid ""
+"Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
+"projectors.  Use 24 or 48 frames per second to be on the safe side."
+msgstr ""
+"Uw DCP frame rate (%d fps) kan mogelijk problemen veroorzaken met oudere "
+"projectors. Gebruik 24 of 48 frames per seconde voor zekerheid."
+
+#: src/wx/hints_dialog.cc:66
+msgid ""
+"Your DCP has an odd number of audio channels.  This is very likely to cause "
+"problems on playback."
+msgstr ""
+"Uw DCP heeft een oneven aantal audio kanalen. Dit geeft hoogstwaarschijnlijk "
+"problemen met weergave."
+
+#: src/wx/hints_dialog.cc:70
+msgid ""
+"Your DCP has fewer than 6 audio channels.  This may cause problems on some "
+"projectors."
+msgstr ""
+"Uw DCP heeft minder dan 6 audio kanalen. This kan problemen geven op sommige "
+"projectors."
+
+#: src/wx/timeline.cc:213
+msgid "audio"
+msgstr "audio"
+
+#: src/wx/audio_panel.cc:238
+msgid "channels"
+msgstr "kanalen"
+
+#: src/wx/properties_dialog.cc:46
+msgid "counting..."
+msgstr "tellen..."
+
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:62
+msgid "dB"
+msgstr "dB"
+
+#. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
+msgid "ms"
+msgstr "ms"
+
+#: src/wx/config_dialog.cc:319
+msgid "s"
+msgstr "s"
+
+#: src/wx/timeline.cc:236
+msgid "still"
+msgstr "still"
+
+#: src/wx/repeat_dialog.cc:28
+msgid "times"
+msgstr "tijden"
+
+#: src/wx/timeline.cc:234
+msgid "video"
+msgstr "video"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 6d1977d57..69442b427 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-30 21:51+0000\n"
+"POT-Creation-Date: 2014-03-31 16:10+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -28,11 +28,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:131
+#: src/wx/config_dialog.cc:125
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(lösenord sparas på disk i klartext)"
 
-#: src/wx/config_dialog.cc:108
+#: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
@@ -48,27 +48,31 @@ msgstr "1 / "
 msgid "1 channel"
 msgstr "1 kanal"
 
-#: src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:196
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:220
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/film_editor.cc:166
+#: src/wx/film_editor.cc:168
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:201
+#: src/wx/video_panel.cc:199
+msgid "3D alternate"
+msgstr ""
+
+#: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D left/right"
 
-#: src/wx/video_panel.cc:202
+#: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D top/bottom"
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:221
 msgid "4K"
 msgstr "4K"
 
@@ -88,18 +92,22 @@ msgstr "Lägg till Cinema..."
 msgid "Add Screen..."
 msgstr "Lägg till Skärm..."
 
-#: src/wx/film_editor.cc:272
+#: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Lägg till fil(er)..."
 
-#: src/wx/film_editor.cc:274
+#: src/wx/film_editor.cc:282
 msgid "Add folder..."
 msgstr "Lägg till folder..."
 
-#: src/wx/editable_list.h:61
+#: src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Lägg till..."
 
+#: src/wx/about_dialog.cc:107
+msgid "Artwork by"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -112,7 +120,7 @@ msgstr "Audio Fördröjning"
 msgid "Audio Gain"
 msgstr "Audio Förstärkning"
 
-#: src/wx/dci_metadata_dialog.cc:39
+#: src/wx/dci_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Audiospråk (ex. SV)"
 
@@ -120,11 +128,11 @@ msgstr "Audiospråk (ex. SV)"
 msgid "Audio Stream"
 msgstr "Audioström"
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "Audio channels"
 msgstr "Audio-kanaler"
 
-#: src/wx/audio_mapping_view.cc:325
+#: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
@@ -132,7 +140,7 @@ msgstr ""
 "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d "
 "oförändrad."
 
-#: src/wx/audio_mapping_view.cc:328
+#: src/wx/audio_mapping_view.cc:356
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
@@ -146,7 +154,7 @@ msgstr ""
 msgid "Bad setting for %s (%s)"
 msgstr "Felaktig inställning för %s (%s)"
 
-#: src/wx/video_panel.cc:123
+#: src/wx/video_panel.cc:120
 msgid "Bottom crop"
 msgstr "Nedre beskärning"
 
@@ -154,11 +162,19 @@ msgstr "Nedre beskärning"
 msgid "Browse..."
 msgstr "Bläddra..."
 
-#: src/wx/gain_calculator_dialog.cc:36
+#: src/wx/audio_mapping_view.cc:320
+msgid "BsL"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:324
+msgid "BsR"
+msgstr ""
+
+#: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
 msgstr "Men jag måste använda mixervolym"
 
-#: src/wx/audio_mapping_view.cc:284
+#: src/wx/audio_mapping_view.cc:288
 msgid "C"
 msgstr "C"
 
@@ -170,6 +186,17 @@ msgstr "Beräkna..."
 msgid "Cancel"
 msgstr "Avbryt"
 
+#: src/wx/screen_dialog.cc:44
+#, fuzzy
+msgid "Certificate"
+msgstr "Välj certifikatfil"
+
+#: src/wx/dolby_certificate_dialog.cc:157
+#: src/wx/doremi_certificate_dialog.cc:67
+#, fuzzy
+msgid "Certificate downloaded"
+msgstr "Välj certifikatfil"
+
 #: src/wx/audio_gain_dialog.cc:26
 msgid "Channel gain"
 msgstr "Kanalförstärkning"
@@ -178,11 +205,11 @@ msgstr "Kanalförstärkning"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/config_dialog.cc:143
+#: src/wx/config_dialog.cc:137
 msgid "Check for testing updates as well as stable ones"
 msgstr "sök efter både test- och stabila uppdateringar"
 
-#: src/wx/config_dialog.cc:139
+#: src/wx/config_dialog.cc:133
 msgid "Check for updates on startup"
 msgstr "Sök efter uppdateringar vid start"
 
@@ -190,49 +217,51 @@ msgstr "Sök efter uppdateringar vid start"
 msgid "Choose a file"
 msgstr "Välj en fil"
 
-#: src/wx/film_editor.cc:767
+#: src/wx/film_editor.cc:775
 msgid "Choose a file or files"
 msgstr "Välj en fil eller filer"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
 msgid "Choose a folder"
 msgstr "Välj en folder"
 
-#: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
-msgid "Colour conversion"
-msgstr "Färgkonvertering"
+#: src/wx/dolby_certificate_dialog.cc:43
+#, fuzzy
+msgid "Cinema"
+msgstr "Lägg till Cinema..."
 
-#: src/wx/config_dialog.cc:65
-msgid "Colour conversions"
+#: src/wx/config_dialog.cc:561
+#, fuzzy
+msgid "Colour Conversions"
 msgstr "Färgkonverteringar"
 
-#: src/wx/film_editor.cc:132
+#: src/wx/content_colour_conversion_dialog.cc:34
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
+msgid "Colour conversion"
+msgstr "Färgkonvertering"
+
+#: src/wx/film_editor.cc:134
 msgid "Container"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:85
+#: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:137
+#: src/wx/film_editor.cc:139
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: src/wx/audio_mapping_view.cc:273
-msgid "Content channel"
-msgstr "Innehållskanal"
-
-#: src/wx/video_panel.cc:335
+#: src/wx/video_panel.cc:329
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Innehållets bildhastighet %.4f\n"
 
-#: src/wx/dci_metadata_dialog.cc:35
+#: src/wx/dci_metadata_dialog.cc:32
 msgid "Content version"
 msgstr "Innehållsversion"
 
-#: src/wx/video_panel.cc:293
+#: src/wx/video_panel.cc:289
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Original-videon är %dx%d (%.2f:1)\n"
@@ -241,7 +270,7 @@ msgstr "Original-videon är %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr "Kunde inte analysera audio."
 
-#: src/wx/film_viewer.cc:332
+#: src/wx/film_viewer.cc:345
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -251,21 +280,21 @@ msgstr "Kunde inte avkoda video för visning (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kunde inte skapa DCP: %s"
 
-#: src/wx/new_film_dialog.cc:48
+#: src/wx/dolby_certificate_dialog.cc:39
+msgid "Country"
+msgstr ""
+
+#: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
-#: src/wx/config_dialog.cc:344
-msgid "Creator"
-msgstr "Skapare"
-
-#: src/wx/video_panel.cc:305
+#: src/wx/video_panel.cc:301
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beskuren till %dx%d (%.2f:1)\n"
 
 # sammanhang?
-#: src/wx/video_panel.cc:244
+#: src/wx/video_panel.cc:241
 msgid "Custom"
 msgstr "Special"
 
@@ -273,11 +302,11 @@ msgstr "Special"
 msgid "DCI name"
 msgstr "DCI namn"
 
-#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:116
+#: src/wx/film_editor.cc:118
 msgid "DCP Name"
 msgstr "DCP-namn"
 
@@ -285,59 +314,93 @@ msgstr "DCP-namn"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:52
-msgid "DCP-o-matic Preferences"
-msgstr "DCP-o-matic Inställningar"
-
 #: src/wx/audio_dialog.cc:98
 #, c-format
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:216
+#: src/wx/config_dialog.cc:331
 msgid "Default DCI name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:344
 msgid "Default JPEG2000 bandwidth"
 msgstr "Förvald JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:238
+#: src/wx/config_dialog.cc:353
 msgid "Default audio delay"
 msgstr "Förvald audiofördröjning"
 
-#: src/wx/config_dialog.cc:220
+#: src/wx/config_dialog.cc:335
 msgid "Default container"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:224
+#: src/wx/config_dialog.cc:339
 msgid "Default content type"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:208
+#: src/wx/config_dialog.cc:365
+#, fuzzy
+msgid "Default creator"
+msgstr "Förvald innehållstyp"
+
+#: src/wx/config_dialog.cc:323
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:200
+#: src/wx/config_dialog.cc:315
 msgid "Default duration of still images"
 msgstr "Förvald varaktighet på stillbilder"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:361
+#, fuzzy
+msgid "Default issuer"
+msgstr "Standardval"
+
+#: src/wx/config_dialog.cc:294
 msgid "Defaults"
 msgstr "Standardval"
 
-#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
+#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detaljer..."
 
-#: src/wx/properties_dialog.cc:45
+#: src/wx/properties_dialog.cc:42
 msgid "Disk space required"
 msgstr "Diskutrymme som krävs"
 
-#: src/wx/film_editor.cc:280
+#: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
+#: src/wx/screen_dialog.cc:135
+msgid "Dolby"
+msgstr ""
+
+#: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
+#: src/wx/screen_dialog.cc:134
+msgid "Doremi"
+msgstr ""
+
+#: src/wx/doremi_certificate_dialog.cc:48
+msgid "Doremi serial numbers must have 6 digits"
+msgstr ""
+
+#: src/wx/film_editor.cc:288
 msgid "Down"
 msgstr "Ner"
 
+#: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
+#, fuzzy
+msgid "Download"
+msgstr "Ner"
+
+#: src/wx/download_certificate_dialog.cc:27
+msgid "Download certificate"
+msgstr ""
+
+#: src/wx/dolby_certificate_dialog.cc:132
+#: src/wx/doremi_certificate_dialog.cc:52
+msgid "Downloading certificate"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
 msgstr "Redigera Cinema..."
@@ -346,13 +409,13 @@ msgstr "Redigera Cinema..."
 msgid "Edit Screen..."
 msgstr "Redigera Skärm..."
 
-#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:217
-#: src/wx/video_panel.cc:157 src/wx/video_panel.cc:174
-#: src/wx/editable_list.h:63
+#: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
+#: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
+#: src/wx/editable_list.h:64
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: src/wx/cinema_dialog.cc:35
+#: src/wx/cinema_dialog.cc:31
 msgid "Email address for KDM delivery"
 msgstr "Mejladress för KDM-leverans"
 
@@ -360,27 +423,29 @@ msgstr "Mejladress för KDM-leverans"
 msgid "Encoding Servers"
 msgstr "Kodningsservrar"
 
-#: src/wx/config_dialog.cc:63
-msgid "Encoding servers"
-msgstr "Kodningsservrar"
-
-#: src/wx/film_editor.cc:157
+#: src/wx/film_editor.cc:159
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/wx/dci_metadata_dialog.cc:59
+#: src/wx/dci_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Företag (ex. DLA)"
 
+#: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
+#: src/wx/dolby_certificate_dialog.cc:106
+#, fuzzy
+msgid "Fetching..."
+msgstr "räknar..."
+
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
 msgstr "Film Egenskaper"
 
-#: src/wx/new_film_dialog.cc:44
+#: src/wx/new_film_dialog.cc:37
 msgid "Film name"
 msgstr "Filmnamn"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:145
 msgid "Filters"
 msgstr "Filter"
 
@@ -388,15 +453,15 @@ msgstr "Filter"
 msgid "Find missing..."
 msgstr "Hitta saknade..."
 
-#: src/wx/film_editor.cc:143
+#: src/wx/film_editor.cc:145
 msgid "Frame Rate"
 msgstr "Bildhastighet"
 
-#: src/wx/properties_dialog.cc:41
+#: src/wx/properties_dialog.cc:39
 msgid "Frames"
 msgstr "Bildrutor"
 
-#: src/wx/properties_dialog.cc:49
+#: src/wx/properties_dialog.cc:45
 msgid "Frames already encoded"
 msgstr "Bildrutor redan kodade"
 
@@ -409,7 +474,7 @@ msgstr "Fri, öppen-källkods DCP-generering från nästan vad som helst."
 msgid "From"
 msgstr "Avsändare"
 
-#: src/wx/config_dialog.cc:135
+#: src/wx/config_dialog.cc:129
 msgid "From address for KDM emails"
 msgstr "Avsändare för KDM-mejl"
 
@@ -417,7 +482,7 @@ msgstr "Avsändare för KDM-mejl"
 msgid "Full"
 msgstr "Full"
 
-#: src/wx/timing_panel.cc:42
+#: src/wx/timing_panel.cc:43
 msgid "Full length"
 msgstr "Full längd"
 
@@ -425,15 +490,19 @@ msgstr "Full längd"
 msgid "Gain Calculator"
 msgstr "Volym Kalkylator"
 
-#: src/wx/audio_gain_dialog.cc:31
+#: src/wx/audio_gain_dialog.cc:28
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Förstärkning för innehållskanal %d i DCP-kanal %d"
 
-#: src/wx/properties_dialog.cc:57
+#: src/wx/properties_dialog.cc:52
 msgid "Gb"
 msgstr "Gb"
 
+#: src/wx/audio_mapping_view.cc:304
+msgid "HI"
+msgstr ""
+
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
 msgstr "Råd"
@@ -442,7 +511,7 @@ msgstr "Råd"
 msgid "Host"
 msgstr "Dator"
 
-#: src/wx/server_dialog.cc:41
+#: src/wx/server_dialog.cc:38
 msgid "Host name or IP address"
 msgstr "Datornamn eller IP-adress"
 
@@ -450,15 +519,15 @@ msgstr "Datornamn eller IP-adress"
 msgid "Hz"
 msgstr "Hz"
 
-#: src/wx/gain_calculator_dialog.cc:32
+#: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:627
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/config_dialog.cc:373
+#: src/wx/config_dialog.cc:519
 msgid "IP address / host name"
 msgstr "IP-adress / datornamn"
 
@@ -466,15 +535,11 @@ msgstr "IP-adress / datornamn"
 msgid "Input gamma"
 msgstr "Indata gamma"
 
-#: src/wx/film_editor.cc:222
+#: src/wx/film_editor.cc:224
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/config_dialog.cc:340
-msgid "Issuer"
-msgstr "Utgivare"
-
-#: src/wx/film_editor.cc:176
+#: src/wx/film_editor.cc:178
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000-bandbredd"
 
@@ -482,24 +547,30 @@ msgstr "JPEG2000-bandbredd"
 msgid "Join"
 msgstr "Anslut"
 
-#: src/wx/config_dialog.cc:71
-msgid "KDM email"
+#: src/wx/config_dialog.cc:694
+#, fuzzy
+msgid "KDM Email"
 msgstr "KDM mejl"
 
 # "sekvens" eller "ordning"?
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:298
 msgid "Keep video in sequence"
 msgstr "Behåll video i sekvens"
 
-#: src/wx/audio_mapping_view.cc:276
+#: src/wx/audio_mapping_view.cc:280
 msgid "L"
 msgstr "V"
 
-#: src/wx/video_panel.cc:90
+#: src/wx/audio_mapping_view.cc:312
+#, fuzzy
+msgid "Lc"
+msgstr "V"
+
+#: src/wx/video_panel.cc:87
 msgid "Left crop"
 msgstr "Vänster beskärning"
 
-#: src/wx/audio_mapping_view.cc:288
+#: src/wx/audio_mapping_view.cc:292
 msgid "Lfe"
 msgstr "Lfe"
 
@@ -507,19 +578,23 @@ msgstr "Lfe"
 msgid "Linearise input gamma curve for low values"
 msgstr "Linjärisera indatas gammakurva för låga värden"
 
-#: src/wx/audio_mapping_view.cc:292
+#: src/wx/screen_dialog.cc:46
+msgid "Load from file..."
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:296
 msgid "Ls"
 msgstr "Vs"
 
-#: src/wx/film_editor.cc:741
+#: src/wx/film_editor.cc:749
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
-#: src/wx/config_dialog.cc:127
+#: src/wx/config_dialog.cc:121
 msgid "Mail password"
 msgstr "Mejl-lösenord"
 
-#: src/wx/config_dialog.cc:123
+#: src/wx/config_dialog.cc:117
 msgid "Mail user name"
 msgstr "Mejl-användarnamn"
 
@@ -531,20 +606,17 @@ msgstr "Skapa KDM:er"
 msgid "Matrix"
 msgstr "Matris"
 
-#: src/wx/config_dialog.cc:233 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:109
+#, fuzzy
+msgid "Maximum JPEG2000 bandwidth"
+msgstr "JPEG2000-bandbredd"
+
+#: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/config_dialog.cc:67
-msgid "Metadata"
-msgstr "Metadata"
-
-#: src/wx/config_dialog.cc:59
-msgid "Miscellaneous"
-msgstr "Diverse"
-
 # Låter mysko
-#: src/wx/video_panel.cc:281
+#: src/wx/video_panel.cc:277
 msgid "Multiple content selected"
 msgstr "Flera innehåll valda"
 
@@ -552,8 +624,8 @@ msgstr "Flera innehåll valda"
 msgid "My Documents"
 msgstr "Mina Dokument"
 
-#: src/wx/cinema_dialog.cc:31 src/wx/config_dialog.cc:539
-#: src/wx/film_editor.cc:111 src/wx/preset_colour_conversion_dialog.cc:38
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:577
+#: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Namn"
 
@@ -565,18 +637,14 @@ msgstr "Ny Film"
 msgid "New versions of DCP-o-matic are available."
 msgstr "Nya versioner av DCP-o-matic finns tillgängligt."
 
-#: src/wx/audio_mapping_view.cc:323
+#: src/wx/audio_mapping_view.cc:351
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr ""
 "Ingen audio kommer att överföras från innehållskanalen %d till DCP-kanalen "
 "%d."
 
-#: src/wx/video_panel.cc:198
-msgid "No stretch"
-msgstr "Ingen utsträckning"
-
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
 msgid "None"
 msgstr "Inget"
 
@@ -584,7 +652,11 @@ msgstr "Inget"
 msgid "Off"
 msgstr "Av"
 
-#: src/wx/config_dialog.cc:119
+#: src/wx/screen_dialog.cc:65
+msgid "Other"
+msgstr ""
+
+#: src/wx/config_dialog.cc:113
 msgid "Outgoing mail server"
 msgstr "Utgående mejlserver"
 
@@ -592,16 +664,16 @@ msgstr "Utgående mejlserver"
 msgid "Output gamma"
 msgstr "Utdata gamma"
 
-#: src/wx/dci_metadata_dialog.cc:63
+#: src/wx/dci_metadata_dialog.cc:53
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/video_panel.cc:328
+#: src/wx/video_panel.cc:322
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:639
 msgid "Password"
 msgstr "Lösenord"
 
@@ -613,11 +685,11 @@ msgstr "Pausa"
 msgid "Peak"
 msgstr "Topp"
 
-#: src/wx/film_viewer.cc:62
+#: src/wx/film_viewer.cc:63
 msgid "Play"
 msgstr "Spela"
 
-#: src/wx/timing_panel.cc:51
+#: src/wx/timing_panel.cc:52
 msgid "Play length"
 msgstr "Spellängd"
 
@@ -625,11 +697,11 @@ msgstr "Spellängd"
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
-#: src/wx/timing_panel.cc:39
+#: src/wx/timing_panel.cc:40
 msgid "Position"
 msgstr "Position"
 
-#: src/wx/audio_mapping_view.cc:280
+#: src/wx/audio_mapping_view.cc:284
 msgid "R"
 msgstr "H"
 
@@ -637,12 +709,17 @@ msgstr "H"
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/dci_metadata_dialog.cc:51
+#: src/wx/dci_metadata_dialog.cc:44
 msgid "Rating (e.g. 15)"
 msgstr "Klassificering (ex. 15)"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
-#: src/wx/editable_list.h:65
+#: src/wx/audio_mapping_view.cc:316
+#, fuzzy
+msgid "Rc"
+msgstr "H"
+
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/editable_list.h:66
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -655,7 +732,7 @@ msgstr "Ta bort Cinema"
 msgid "Remove Screen"
 msgstr "Ta bort Skärm"
 
-#: src/wx/repeat_dialog.cc:33
+#: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Upprepa"
 
@@ -667,7 +744,7 @@ msgstr "Repetera Innehåll"
 msgid "Repeat..."
 msgstr "Upprepa..."
 
-#: src/wx/film_editor.cc:170
+#: src/wx/film_editor.cc:172
 msgid "Resolution"
 msgstr "Upplösning"
 
@@ -675,52 +752,65 @@ msgstr "Upplösning"
 msgid "Resume"
 msgstr "Fortsätt"
 
-#: src/wx/audio_mapping_view.cc:331
+#: src/wx/audio_mapping_view.cc:359
 msgid "Right click to change gain."
 msgstr "Högerklicka för att ändra förstärkning."
 
-#: src/wx/video_panel.cc:101
+#: src/wx/video_panel.cc:98
 msgid "Right crop"
 msgstr "Höger beskärning"
 
-#: src/wx/audio_mapping_view.cc:296
+#: src/wx/audio_mapping_view.cc:300
 msgid "Rs"
 msgstr "Hs"
 
-#: src/wx/film_editor.cc:221
+#: src/wx/film_editor.cc:223
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:131
 msgid "Scale to"
 msgstr "Skala om till"
 
-#: src/wx/video_panel.cc:320
+#: src/wx/video_panel.cc:313
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skalad till %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:190
+#: src/wx/film_editor.cc:192
 msgid "Scaler"
 msgstr "Omskalare"
 
-#: src/wx/screen_dialog.cc:88
+#: src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Välj certifikatfil"
 
-#: src/wx/kdm_dialog.cc:136
+#: src/wx/kdm_dialog.cc:140
 msgid "Send by email"
 msgstr "Skicka med mejl"
 
+#: src/wx/dolby_certificate_dialog.cc:47
+msgid "Serial number"
+msgstr ""
+
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:60
+#: src/wx/doremi_certificate_dialog.cc:35
+msgid "Server serial number"
+msgstr ""
+
+#: src/wx/config_dialog.cc:499
+#, fuzzy
+msgid "Servers"
+msgstr "Server"
+
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
 msgstr "Sätt"
 
-#: src/wx/config_dialog.cc:97
+#: src/wx/config_dialog.cc:86
 msgid "Set language"
 msgstr "Välj språk"
 
@@ -728,7 +818,7 @@ msgstr "Välj språk"
 msgid "Show Audio..."
 msgstr "Visa Audio..."
 
-#: src/wx/film_editor.cc:153
+#: src/wx/film_editor.cc:155
 msgid "Signed"
 msgstr "Signerad"
 
@@ -745,15 +835,15 @@ msgstr "Snap"
 msgid "Stable version "
 msgstr "Stabil version"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/dci_metadata_dialog.cc:55
+#: src/wx/dci_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/dci_metadata_dialog.cc:43
+#: src/wx/dci_metadata_dialog.cc:38
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Undertextspråk (ex. SV)"
 
@@ -779,19 +869,19 @@ msgstr "Undertext Förskjutning"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:132
+#: src/wx/about_dialog.cc:146
 msgid "Supported by"
 msgstr "Stöd från"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/config_dialog.cc:607
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:631
 msgid "Target path"
 msgstr "Målsökväg"
 
-#: src/wx/dci_metadata_dialog.cc:47
+#: src/wx/dci_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Område (ex. SV)"
 
@@ -799,6 +889,11 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
+#: src/wx/about_dialog.cc:188
+#, fuzzy
+msgid "Tested by"
+msgstr "Översatt av"
+
 #: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
@@ -812,15 +907,19 @@ msgstr ""
 msgid "There are no hints: everything looks good!"
 msgstr "Det finns inga råd: allt verkar bra!"
 
+#: src/wx/film_viewer.cc:133
+msgid "There is not enough free memory to do that."
+msgstr ""
+
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Trådar"
 
-#: src/wx/config_dialog.cc:115
+#: src/wx/config_dialog.cc:105
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
-#: src/wx/audio_plot.cc:148
+#: src/wx/audio_plot.cc:168
 msgid "Time"
 msgstr "Tid"
 
@@ -828,41 +927,51 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: src/wx/film_editor.cc:282
+#: src/wx/film_editor.cc:290
 msgid "Timeline..."
 msgstr "Tidslinje..."
 
 # Svengelska
-#: src/wx/timing_panel.cc:34
+#: src/wx/timing_panel.cc:35
 msgid "Timing"
 msgstr "Tajming"
 
-#: src/wx/video_panel.cc:112
+#: src/wx/video_panel.cc:109
 msgid "Top crop"
 msgstr "Övre beskärning"
 
-#: src/wx/about_dialog.cc:101
+#: src/wx/about_dialog.cc:103
 msgid "Translated by"
 msgstr "Översatt av"
 
-#: src/wx/timing_panel.cc:48
+#: src/wx/timing_panel.cc:49
 msgid "Trim from end"
 msgstr "Trimma från slut"
 
-#: src/wx/timing_panel.cc:45
+#: src/wx/timing_panel.cc:46
 msgid "Trim from start"
 msgstr "Trimma från start"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
 msgid "Type"
 msgstr "Typ"
 
+#: src/wx/dolby_certificate_dialog.cc:148
+#, fuzzy
+msgid "Unexpected certificate filename form"
+msgstr "Välj certifikatfil"
+
+#: src/wx/screen_dialog.cc:62
+#, fuzzy
+msgid "Unknown"
+msgstr "okänt"
+
 # sammanhang?
-#: src/wx/kdm_dialog.cc:91
+#: src/wx/kdm_dialog.cc:93
 msgid "Until"
 msgstr "Tills"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:286
 msgid "Up"
 msgstr "Upp"
 
@@ -870,31 +979,35 @@ msgstr "Upp"
 msgid "Update"
 msgstr "Uppdatera"
 
-#: src/wx/film_editor.cc:126
+#: src/wx/film_editor.cc:128
 msgid "Use DCI name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/config_dialog.cc:369
+#: src/wx/config_dialog.cc:515
 msgid "Use all servers"
 msgstr "Använd alla servrar"
 
-#: src/wx/film_editor.cc:147
+#: src/wx/film_editor.cc:149
 msgid "Use best"
 msgstr "Använd bästa"
 
-#: src/wx/content_colour_conversion_dialog.cc:41
+#: src/wx/content_colour_conversion_dialog.cc:42
 msgid "Use preset"
 msgstr "Använd förhandsinställning"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:635
 msgid "User name"
 msgstr "Användarnamn"
 
-#: src/wx/video_panel.cc:70
+#: src/wx/audio_mapping_view.cc:308
+msgid "VI"
+msgstr ""
+
+#: src/wx/video_panel.cc:67
 msgid "Video"
 msgstr "Video"
 
-#: src/wx/timing_panel.cc:56
+#: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
 msgstr "bildhastighet"
 
@@ -902,7 +1015,7 @@ msgstr "bildhastighet"
 msgid "With Subtitles"
 msgstr "Med Undertexter"
 
-#: src/wx/kdm_dialog.cc:122
+#: src/wx/kdm_dialog.cc:127
 msgid "Write to"
 msgstr "Skriv till"
 
@@ -952,20 +1065,20 @@ msgstr "audio"
 msgid "channels"
 msgstr "kanaler"
 
-#: src/wx/properties_dialog.cc:50
+#: src/wx/properties_dialog.cc:46
 msgid "counting..."
 msgstr "räknar..."
 
-#: src/wx/audio_gain_dialog.cc:35 src/wx/audio_panel.cc:62
+#: src/wx/audio_gain_dialog.cc:30 src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:242
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:357
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:204
+#: src/wx/config_dialog.cc:319
 msgid "s"
 msgstr "s"
 
@@ -974,7 +1087,7 @@ msgid "still"
 msgstr "stillbild"
 
 # Sammanhang?
-#: src/wx/repeat_dialog.cc:37
+#: src/wx/repeat_dialog.cc:28
 msgid "times"
 msgstr "tider"
 
@@ -982,6 +1095,30 @@ msgstr "tider"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Content channel"
+#~ msgstr "Innehållskanal"
+
+#~ msgid "Creator"
+#~ msgstr "Skapare"
+
+#~ msgid "DCP-o-matic Preferences"
+#~ msgstr "DCP-o-matic Inställningar"
+
+#~ msgid "Encoding servers"
+#~ msgstr "Kodningsservrar"
+
+#~ msgid "Issuer"
+#~ msgstr "Utgivare"
+
+#~ msgid "Metadata"
+#~ msgstr "Metadata"
+
+#~ msgid "Miscellaneous"
+#~ msgstr "Diverse"
+
+#~ msgid "No stretch"
+#~ msgstr "Ingen utsträckning"
+
 #~ msgid "MBps"
 #~ msgstr "MBps"
 
@@ -1068,9 +1205,6 @@ msgstr "video"
 #~ msgid "pixels"
 #~ msgstr "pixlar"
 
-#~ msgid "unknown"
-#~ msgstr "okänt"
-
 #~ msgid "TMS IP address"
 #~ msgstr "TMS IP-adress"
 
diff --git a/src/wx/properties_dialog.cc b/src/wx/properties_dialog.cc
index 8c976f53a..801996efa 100644
--- a/src/wx/properties_dialog.cc
+++ b/src/wx/properties_dialog.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
@@ -33,47 +33,25 @@ using boost::shared_ptr;
 using boost::lexical_cast;
 
 PropertiesDialog::PropertiesDialog (wxWindow* parent, shared_ptr<Film> film)
-	: wxDialog (parent, wxID_ANY, _("Film Properties"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+	: TableDialog (parent, _("Film Properties"), 2, false)
 	, _film (film)
 {
-	_table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	add (_("Frames"), true);
+	_frames = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	add_label_to_sizer (_table, this, _("Frames"), true);
-	_frames = new wxStaticText (this, wxID_ANY, wxT (""));
-	_table->Add (_frames, 1, wxALIGN_CENTER_VERTICAL);
+	add (_("Disk space required"), true);
+	_disk = add (new wxStaticText (this, wxID_ANY, wxT ("")));
 
-	add_label_to_sizer (_table, this, _("Disk space required"), true);
-	_disk = new wxStaticText (this, wxID_ANY, wxT (""));
-	_table->Add (_disk, 1, wxALIGN_CENTER_VERTICAL);
-
-	add_label_to_sizer (_table, this, _("Frames already encoded"), true);
-	_encoded = new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this));
+	add (_("Frames already encoded"), true);
+	_encoded = add (new ThreadedStaticText (this, _("counting..."), boost::bind (&PropertiesDialog::frames_already_encoded, this)));
 	_encoded->Finished.connect (boost::bind (&PropertiesDialog::layout, this));
-	_table->Add (_encoded, 1, wxALIGN_CENTER_VERTICAL);
-
 	_frames->SetLabel (std_to_wx (lexical_cast<string> (_film->length().frames (_film->video_frame_rate ()))));
 	double const disk = double (_film->required_disk_space()) / 1073741824.0f;
 	stringstream s;
 	s << fixed << setprecision (1) << disk << wx_to_std (_("Gb"));
 	_disk->SetLabel (std_to_wx (s.str ()));
 
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (_table, 0, wxALL, DCPOMATIC_DIALOG_BORDER);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	SetSizer (overall_sizer);
-	overall_sizer->SetSizeHints (this);
-}
-
-void
-PropertiesDialog::layout ()
-{
-	_table->Layout ();
-	Fit ();
+	layout ();
 }
 
 string
diff --git a/src/wx/properties_dialog.h b/src/wx/properties_dialog.h
index 03e0f01aa..aeb8927b2 100644
--- a/src/wx/properties_dialog.h
+++ b/src/wx/properties_dialog.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
@@ -18,21 +18,20 @@
 */
 
 #include <wx/wx.h>
+#include "table_dialog.h"
 
 class Film;
 class ThreadedStaticText;
 
-class PropertiesDialog : public wxDialog
+class PropertiesDialog : public TableDialog
 {
 public:
 	PropertiesDialog (wxWindow *, boost::shared_ptr<Film>);
 
 private:
 	std::string frames_already_encoded () const;
-	void layout ();
 
 	boost::shared_ptr<Film> _film;
-	wxFlexGridSizer* _table;
 	wxStaticText* _frames;
 	wxStaticText* _disk;
 	ThreadedStaticText* _encoded;
diff --git a/src/wx/repeat_dialog.cc b/src/wx/repeat_dialog.cc
index 3721c61b9..574dcd1c0 100644
--- a/src/wx/repeat_dialog.cc
+++ b/src/wx/repeat_dialog.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
@@ -21,30 +21,15 @@
 #include "wx_util.h"
 
 RepeatDialog::RepeatDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("Repeat Content"))
+	: TableDialog (parent, _("Repeat Content"), 3, true)
 {
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	SetSizer (overall_sizer);
-	
-	wxFlexGridSizer* table = new wxFlexGridSizer (3, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-	add_label_to_sizer (table, this, _("Repeat"), true);
-	_number = new wxSpinCtrl (this, wxID_ANY);
-	table->Add (_number, 1);
-
-	add_label_to_sizer (table, this, _("times"), false);
+	add (_("Repeat"), true);
+	_number = add (new wxSpinCtrl (this, wxID_ANY));
+	add (_("times"), false);
 
 	_number->SetRange (1, 1024);
 
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
-
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 int
diff --git a/src/wx/repeat_dialog.h b/src/wx/repeat_dialog.h
index cbcc6bb7a..0e2083097 100644
--- a/src/wx/repeat_dialog.h
+++ b/src/wx/repeat_dialog.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
@@ -19,8 +19,9 @@
 
 #include <wx/wx.h>
 #include <wx/spinctrl.h>
+#include "table_dialog.h"
 
-class RepeatDialog : public wxDialog
+class RepeatDialog : public TableDialog
 {
 public:
 	RepeatDialog (wxWindow *);
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index 89249645a..0d46a46ec 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.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
@@ -21,29 +21,35 @@
 #include <wx/validate.h>
 #include <dcp/exceptions.h>
 #include "lib/compose.hpp"
+#include "lib/util.h"
 #include "screen_dialog.h"
 #include "wx_util.h"
+#include "doremi_certificate_dialog.h"
+#include "dolby_certificate_dialog.h"
 
 using std::string;
 using std::cout;
 using boost::shared_ptr;
 
 ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_ptr<dcp::Certificate> certificate)
-	: wxDialog (parent, wxID_ANY, std_to_wx (title))
+	: TableDialog (parent, std_to_wx (title), 2, true)
 	, _certificate (certificate)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, 6, 6);
-	table->AddGrowableCol (1, 1);
+	add ("Name", true);
+	_name = add (new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1)));
 
-	add_label_to_sizer (table, this, "Name", true);
-	_name = new wxTextCtrl (this, wxID_ANY, std_to_wx (name), wxDefaultPosition, wxSize (320, -1));
-	table->Add (_name, 1, wxEXPAND);
+	add ("Server manufacturer", true);
+	_manufacturer = add (new wxChoice (this, wxID_ANY));
 
-	add_label_to_sizer (table, this, "Certificate", true);
-	_certificate_load = new wxButton (this, wxID_ANY, wxT ("Load from file..."));
-	table->Add (_certificate_load, 1, wxEXPAND);
+	add (_("Certificate"), true);
+	wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+	_load_certificate = new wxButton (this, wxID_ANY, _("Load from file..."));
+	_download_certificate = new wxButton (this, wxID_ANY, _("Download"));
+	s->Add (_load_certificate, 1, wxEXPAND);
+	s->Add (_download_certificate, 1, wxEXPAND);
+	add (s);
 
-	table->AddSpacer (0);
+	add_spacer ();
 	_certificate_text = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (320, 256), wxTE_MULTILINE | wxTE_READONLY);
 	if (certificate) {
 		_certificate_text->SetValue (certificate->certificate ());
@@ -51,23 +57,20 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, shared_
 	wxFont font = wxSystemSettings::GetFont (wxSYS_ANSI_FIXED_FONT);
 	font.SetPointSize (font.GetPointSize() / 2);
 	_certificate_text->SetFont (font);
-	table->Add (_certificate_text, 1, wxEXPAND);
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, 6);
-	
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
+	add (_certificate_text);
 
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	_manufacturer->Append (_("Unknown"));
+	_manufacturer->Append (_("Doremi"));
+	_manufacturer->Append (_("Dolby"));
+	_manufacturer->Append (_("Other"));
+	_manufacturer->SetSelection (0);
 
-	_certificate_load->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::load_certificate, this));
+	_load_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::select_certificate, this));
+	_download_certificate->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_certificate, this));
+	_manufacturer->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&ScreenDialog::setup_sensitivity, this));
 
 	setup_sensitivity ();
+	layout ();
 }
 
 string
@@ -83,27 +86,52 @@ ScreenDialog::certificate () const
 }
 
 void
-ScreenDialog::load_certificate ()
+ScreenDialog::load_certificate (boost::filesystem::path file)
 {
-	wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
+	try {
+		_certificate.reset (new dcp::Certificate (file));
+		_certificate_text->SetValue (_certificate->certificate ());
+	} catch (dcp::MiscError& e) {
+		error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
+	}
+}
 
+void
+ScreenDialog::select_certificate ()
+{
+	wxFileDialog* d = new wxFileDialog (this, _("Select Certificate File"));
 	if (d->ShowModal () == wxID_OK) {
-		try {
-			_certificate.reset (new dcp::Certificate (boost::filesystem::path (wx_to_std (d->GetPath ()))));
-			_certificate_text->SetValue (_certificate->certificate ());
-		} catch (dcp::MiscError& e) {
-			error_dialog (this, String::compose ("Could not read certificate file (%1)", e.what()));
-		}
+		load_certificate (boost::filesystem::path (wx_to_std (d->GetPath ())));
 	}
-	
 	d->Destroy ();
 
 	setup_sensitivity ();
 }
 
 void
+ScreenDialog::download_certificate ()
+{
+	if (_manufacturer->GetStringSelection() == _("Doremi")) {
+		DownloadCertificateDialog* d = new DoremiCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1));
+		d->ShowModal ();
+		d->Destroy ();
+	} else if (_manufacturer->GetStringSelection() == _("Dolby")) {
+		DownloadCertificateDialog* d = new DolbyCertificateDialog (this, boost::bind (&ScreenDialog::load_certificate, this, _1));
+		d->ShowModal ();
+		d->Destroy ();
+	}
+
+	setup_sensitivity ();
+}
+
+void
 ScreenDialog::setup_sensitivity ()
 {
 	wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
 	ok->Enable (_certificate.get ());
+
+	_download_certificate->Enable (
+		_manufacturer->GetStringSelection() == _("Doremi") ||
+		_manufacturer->GetStringSelection() == _("Dolby")
+		);
 }
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 0cd7d3c49..5c6d964b8 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.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
@@ -20,8 +20,11 @@
 #include <wx/wx.h>
 #include <boost/shared_ptr.hpp>
 #include <dcp/certificates.h>
+#include "table_dialog.h"
 
-class ScreenDialog : public wxDialog
+class Progress;
+
+class ScreenDialog : public TableDialog
 {
 public:
 	ScreenDialog (wxWindow *, std::string, std::string name = "", boost::shared_ptr<dcp::Certificate> c = boost::shared_ptr<dcp::Certificate> ());
@@ -30,11 +33,15 @@ public:
 	boost::shared_ptr<dcp::Certificate> certificate () const;
 	
 private:
-	void load_certificate ();
+	void select_certificate ();
+	void load_certificate (boost::filesystem::path);
+	void download_certificate ();
 	void setup_sensitivity ();
 	
 	wxTextCtrl* _name;
-	wxButton* _certificate_load;
+	wxChoice* _manufacturer;
+	wxButton* _load_certificate;
+	wxButton* _download_certificate;
 	wxTextCtrl* _certificate_text;
 
 	boost::shared_ptr<dcp::Certificate> _certificate;
diff --git a/src/wx/server_dialog.cc b/src/wx/server_dialog.cc
index 04da9ad7d..37f68da29 100644
--- a/src/wx/server_dialog.cc
+++ b/src/wx/server_dialog.cc
@@ -25,11 +25,8 @@ using std::string;
 using boost::shared_ptr;
 
 ServerDialog::ServerDialog (wxWindow* parent)
-	: wxDialog (parent, wxID_ANY, _("Server"))
+	: TableDialog (parent, _("Server"), 2, true)
 {
-	wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
-	table->AddGrowableCol (1, 1);
-
         wxClientDC dc (parent);
 	/* XXX: bit of a mystery why we need such a long string here */
         wxSize size = dc.GetTextExtent (wxT ("255.255.255.255.255.255.255.255"));
@@ -38,21 +35,10 @@ ServerDialog::ServerDialog (wxWindow* parent)
         wxTextValidator validator (wxFILTER_INCLUDE_CHAR_LIST);
         wxArrayString list;
 
-	add_label_to_sizer (table, this, _("Host name or IP address"), true);
-	_host = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size);
-	table->Add (_host, 1, wxEXPAND | wxALL);
-
-	wxBoxSizer* overall_sizer = new wxBoxSizer (wxVERTICAL);
-	overall_sizer->Add (table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
-
-	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK);
-	if (buttons) {
-		overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
-	}
+	add (_("Host name or IP address"), true);
+	_host = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, size));
 
-	SetSizer (overall_sizer);
-	overall_sizer->Layout ();
-	overall_sizer->SetSizeHints (this);
+	layout ();
 }
 
 void
diff --git a/src/wx/server_dialog.h b/src/wx/server_dialog.h
index 9d758d7c0..b434b0e1a 100644
--- a/src/wx/server_dialog.h
+++ b/src/wx/server_dialog.h
@@ -17,9 +17,9 @@
 
 */
 
-#include <wx/wx.h>
+#include "table_dialog.h"
 
-class ServerDialog : public wxDialog
+class ServerDialog : public TableDialog
 {
 public:
 	ServerDialog (wxWindow *);
diff --git a/src/wx/table_dialog.cc b/src/wx/table_dialog.cc
new file mode 100644
index 000000000..571fcf3a4
--- /dev/null
+++ b/src/wx/table_dialog.cc
@@ -0,0 +1,62 @@
+/*
+    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 "table_dialog.h"
+#include "wx_util.h"
+
+TableDialog::TableDialog (wxWindow* parent, wxString title, int columns, bool cancel)
+	: wxDialog (parent, wxID_ANY, title)
+{
+	_overall_sizer = new wxBoxSizer (wxVERTICAL);
+	SetSizer (_overall_sizer);
+
+	_table = new wxFlexGridSizer (columns, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
+	_table->AddGrowableCol (1, 1);
+
+	_overall_sizer->Add (_table, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
+
+	long int flags = wxOK;
+	if (cancel) {
+		flags |= wxCANCEL;
+	}
+	
+	wxSizer* buttons = CreateSeparatedButtonSizer (flags);
+	if (buttons) {
+		_overall_sizer->Add (buttons, wxSizerFlags().Expand().DoubleBorder());
+	}
+}
+
+void
+TableDialog::layout ()
+{
+	_overall_sizer->Layout ();
+	_overall_sizer->SetSizeHints (this);
+}
+
+void
+TableDialog::add (wxString text, bool label)
+{
+	add_label_to_sizer (_table, this, text, label);
+}
+
+void
+TableDialog::add_spacer ()
+{
+	_table->AddSpacer (0);
+}
diff --git a/src/wx/table_dialog.h b/src/wx/table_dialog.h
new file mode 100644
index 000000000..23017c3b6
--- /dev/null
+++ b/src/wx/table_dialog.h
@@ -0,0 +1,47 @@
+/*
+    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.
+
+*/
+
+#ifndef DCPOMATIC_TABLE_DIALOG_H
+#define DCPOMATIC_TABLE_DIALOG_H
+
+#include <wx/wx.h>
+
+class TableDialog : public wxDialog
+{
+public:
+	TableDialog (wxWindow* parent, wxString title, int columns, bool cancel);
+
+protected:
+	template<class T>
+	T* add (T* w) {
+		_table->Add (w, 1, wxEXPAND);
+		return w;
+	}
+
+	void add (wxString text, bool label);
+	void add_spacer ();
+	
+	void layout ();
+
+private:	
+	wxSizer* _overall_sizer;
+	wxFlexGridSizer* _table;
+};
+
+#endif
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 634a15625..1ab4b590b 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -102,7 +102,7 @@ Timecode::set (DCPTime t, int fps)
 	checked_set (_seconds, lexical_cast<string> (s));
 	checked_set (_frames, lexical_cast<string> (f));
 
-	_fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02ld", h, m, s, f));
+	_fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02" wxLongLongFmtSpec "d", h, m, s, f));
 }
 
 DCPTime
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index e1b507383..185abefeb 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.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
@@ -83,7 +83,6 @@ public:
 	ContentView (Timeline& tl, shared_ptr<Content> c)
 		: View (tl)
 		, _content (c)
-		, _track (0)
 		, _selected (false)
 	{
 		_content_connection = c->Changed.connect (bind (&ContentView::content_changed, this, _2, _3));
@@ -91,6 +90,8 @@ public:
 
 	dcpomatic::Rect<int> bbox () const
 	{
+		assert (_track);
+
 		shared_ptr<const Film> film = _timeline.film ();
 		shared_ptr<const Content> content = _content.lock ();
 		if (!film || !content) {
@@ -99,7 +100,7 @@ public:
 		
 		return dcpomatic::Rect<int> (
 			time_x (content->position ()) - 8,
-			y_pos (_track) - 8,
+			y_pos (_track.get()) - 8,
 			content->length_after_trim().seconds() * _timeline.pixels_per_second() + 16,
 			_timeline.track_height() + 16
 			);
@@ -122,7 +123,7 @@ public:
 		_track = t;
 	}
 
-	int track () const {
+	optional<int> track () const {
 		return _track;
 	}
 
@@ -133,6 +134,8 @@ private:
 
 	void do_paint (wxGraphicsContext* gc)
 	{
+		assert (_track);
+
 		shared_ptr<const Film> film = _timeline.film ();
 		shared_ptr<const Content> cont = content ();
 		if (!film || !cont) {
@@ -154,11 +157,11 @@ private:
 		}
 
 		wxGraphicsPath path = gc->CreatePath ();
-		path.MoveToPoint    (time_x (position),	      y_pos (_track) + 4);
-		path.AddLineToPoint (time_x (position + len), y_pos (_track) + 4);
-		path.AddLineToPoint (time_x (position + len), y_pos (_track + 1) - 4);
-		path.AddLineToPoint (time_x (position),	      y_pos (_track + 1) - 4);
-		path.AddLineToPoint (time_x (position),	      y_pos (_track) + 4);
+		path.MoveToPoint    (time_x (position),	      y_pos (_track.get()) + 4);
+		path.AddLineToPoint (time_x (position + len), y_pos (_track.get()) + 4);
+		path.AddLineToPoint (time_x (position + len), y_pos (_track.get() + 1) - 4);
+		path.AddLineToPoint (time_x (position),	      y_pos (_track.get() + 1) - 4);
+		path.AddLineToPoint (time_x (position),	      y_pos (_track.get()) + 4);
 		gc->StrokePath (path);
 		gc->FillPath (path);
 
@@ -169,8 +172,8 @@ private:
 		wxDouble name_leading;
 		gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
 		
-		gc->Clip (wxRegion (time_x (position), y_pos (_track), len.seconds() * _timeline.pixels_per_second(), _timeline.track_height()));
-		gc->DrawText (name, time_x (position) + 12, y_pos (_track + 1) - name_height - 4);
+		gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second(), _timeline.track_height()));
+		gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
 		gc->ResetClip ();
 	}
 
@@ -194,7 +197,7 @@ private:
 	}
 
 	boost::weak_ptr<Content> _content;
-	int _track;
+	optional<int> _track;
 	bool _selected;
 
 	boost::signals2::scoped_connection _content_connection;
@@ -431,55 +434,30 @@ Timeline::playlist_changed ()
 void
 Timeline::assign_tracks ()
 {
-	list<shared_ptr<VideoContentView> > video;
-	list<shared_ptr<AudioContentView> > audio;
-	list<shared_ptr<SubtitleContentView> > subtitle;
-
 	for (ViewList::iterator i = _views.begin(); i != _views.end(); ++i) {
-		shared_ptr<VideoContentView> v = dynamic_pointer_cast<VideoContentView> (*i);
-		if (v) {
-			video.push_back (v);
-		}
-		
-		shared_ptr<AudioContentView> a = dynamic_pointer_cast<AudioContentView> (*i);
-		if (a) {
-			audio.push_back (a);
-		}
-
-		shared_ptr<SubtitleContentView> s = dynamic_pointer_cast<SubtitleContentView> (*i);
-		if (s) {
-			subtitle.push_back (s);
-		}
-	}
-
-	_tracks = 0;
-	if (!video.empty ()) {
-		for (list<shared_ptr<VideoContentView> >::iterator i = video.begin(); i != video.end(); ++i) {
-			(*i)->set_track (_tracks);
-		}
-		++_tracks;
-	}
-	
-	if (!subtitle.empty ()) {
-		for (list<shared_ptr<SubtitleContentView> >::iterator i = subtitle.begin(); i != subtitle.end(); ++i) {
-			(*i)->set_track (_tracks);
+		shared_ptr<ContentView> cv = dynamic_pointer_cast<ContentView> (*i);
+		if (!cv) {
+			continue;
 		}
-		++_tracks;
-	}
-
-	int const audio_start = _tracks;
 
-	for (list<shared_ptr<AudioContentView> >::iterator i = audio.begin(); i != audio.end(); ++i) {
-		shared_ptr<Content> acv_content = (*i)->content();
+		shared_ptr<Content> content = cv->content();
 
-		int t = audio_start;
-		while (1) {
-			list<shared_ptr<AudioContentView> >::iterator j = audio.begin ();
-			while (j != audio.end()) {
-				if ((*j)->track() == t) {
+		int t = 0;
+		while (true) {
+			ViewList::iterator j = _views.begin();
+			while (j != _views.end()) {
+				shared_ptr<ContentView> test = dynamic_pointer_cast<ContentView> (*j);
+				if (!test) {
+					++j;
+					continue;
+				}
+				
+				shared_ptr<Content> test_content = test->content();
+					
+				if (test && test->track() && test->track().get() == t) {
 					bool const no_overlap =
-						(acv_content->position() < (*j)->content()->position() && acv_content->end() < (*j)->content()->position()) ||
-						(acv_content->position() > (*j)->content()->end()      && acv_content->end() > (*j)->content()->end());
+						(content->position() < test_content->position() && content->end() < test_content->position()) ||
+						(content->position() > test_content->end()      && content->end() > test_content->end());
 					
 					if (!no_overlap) {
 						/* we have an overlap on track `t' */
@@ -491,13 +469,13 @@ Timeline::assign_tracks ()
 				++j;
 			}
 
-			if (j == audio.end ()) {
+			if (j == _views.end ()) {
 				/* no overlap on `t' */
 				break;
 			}
 		}
 
-		(*i)->set_track (t);
+		cv->set_track (t);
 		_tracks = max (_tracks, t + 1);
 	}
 
diff --git a/src/wx/timing_panel.cc b/src/wx/timing_panel.cc
index 3fcb9b175..f33e052a1 100644
--- a/src/wx/timing_panel.cc
+++ b/src/wx/timing_panel.cc
@@ -19,6 +19,7 @@
 
 #include "lib/content.h"
 #include "lib/image_content.h"
+#include "lib/sndfile_content.h"
 #include "timing_panel.h"
 #include "wx_util.h"
 #include "timecode.h"
@@ -80,10 +81,12 @@ TimingPanel::film_content_changed (int property)
 	if (cl.size() == 1) {
 		content = cl.front ();
 	}
+
+	int const film_video_frame_rate = _editor->film()->video_frame_rate ();
 	
 	if (property == ContentProperty::POSITION) {
 		if (content) {
-			_position->set (content->position (), _editor->film()->video_frame_rate ());
+			_position->set (content->position (), film_video_frame_rate);
 		} else {
 			_position->set (DCPTime () , 24);
 		}
@@ -93,24 +96,24 @@ TimingPanel::film_content_changed (int property)
 		property == VideoContentProperty::VIDEO_FRAME_TYPE
 		) {
 		if (content) {
-			_full_length->set (content->full_length (), _editor->film()->video_frame_rate ());
-			_play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ());
+			_full_length->set (content->full_length (), film_video_frame_rate);
+			_play_length->set (content->length_after_trim (), film_video_frame_rate);
 		} else {
 			_full_length->set (DCPTime (), 24);
 			_play_length->set (DCPTime (), 24);
 		}
 	} else if (property == ContentProperty::TRIM_START) {
 		if (content) {
-			_trim_start->set (content->trim_start (), _editor->film()->video_frame_rate ());
-			_play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ());
+			_trim_start->set (content->trim_start (), film_video_frame_rate);
+			_play_length->set (content->length_after_trim (), film_video_frame_rate);
 		} else {
 			_trim_start->set (DCPTime (), 24);
 			_play_length->set (DCPTime (), 24);
 		}
 	} else if (property == ContentProperty::TRIM_END) {
 		if (content) {
-			_trim_end->set (content->trim_end (), _editor->film()->video_frame_rate ());
-			_play_length->set (content->length_after_trim (), _editor->film()->video_frame_rate ());
+			_trim_end->set (content->trim_end (), film_video_frame_rate);
+			_play_length->set (content->length_after_trim (), film_video_frame_rate);
 		} else {
 			_trim_end->set (DCPTime (), 24);
 			_play_length->set (DCPTime (), 24);
@@ -131,9 +134,10 @@ TimingPanel::film_content_changed (int property)
 	}
 
 	shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (content);
+	shared_ptr<SndfileContent> sc = dynamic_pointer_cast<SndfileContent> (content);
 	_full_length->set_editable (ic && ic->still ());
 	_play_length->set_editable (!ic || !ic->still ());
-	_video_frame_rate->Enable (ic && !ic->still ());
+	_video_frame_rate->Enable ((ic && !ic->still ()) || sc);
 	_set_video_frame_rate->Enable (false);
 }
 
@@ -201,8 +205,8 @@ TimingPanel::set_video_frame_rate ()
 		shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (c.front ());
 		if (ic) {
 			ic->set_video_frame_rate (lexical_cast<float> (wx_to_std (_video_frame_rate->GetValue ())));
-			_set_video_frame_rate->Enable (false);
 		}
+		_set_video_frame_rate->Enable (false);
 	}
 }
 
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index fad824727..399e71aac 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -197,6 +197,8 @@ VideoPanel::VideoPanel (FilmEditor* e)
 	_frame_type->wrapped()->Append (_("3D left/right"));
 	_frame_type->wrapped()->Append (_("3D top/bottom"));
 	_frame_type->wrapped()->Append (_("3D alternate"));
+	_frame_type->wrapped()->Append (_("3D left only"));
+	_frame_type->wrapped()->Append (_("3D right only"));
 
 	_filters_button->Bind           (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_filters_clicked, this));
 	_colour_conversion_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED,   boost::bind (&VideoPanel::edit_colour_conversion_clicked, this));
diff --git a/src/wx/wscript b/src/wx/wscript
index 45a5bc96d..cd78f0649 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -17,6 +17,9 @@ sources = """
           content_menu.cc
           dci_metadata_dialog.cc
           dir_picker_ctrl.cc
+          dolby_certificate_dialog.cc
+          doremi_certificate_dialog.cc
+          download_certificate_dialog.cc
           film_editor.cc
           film_editor_panel.cc
           film_viewer.cc
@@ -36,6 +39,7 @@ sources = """
           servers_list_dialog.cc
           subtitle_panel.cc
           subtitle_view.cc
+          table_dialog.cc
           timecode.cc
           timeline.cc
           timeline_dialog.cc
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index a5399e62e..048f87908 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -296,3 +296,11 @@ wx_get (wxChoice* w)
 {
 	return w->GetSelection ();
 }
+
+void
+run_gui_loop ()
+{
+	while (wxTheApp->Pending ()) {
+		wxTheApp->Dispatch ();
+	}
+}
diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 8ac824c50..0afd82b90 100644
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -48,6 +48,7 @@ extern wxStaticText* add_label_to_grid_bag_sizer (wxGridBagSizer *, wxWindow *,
 extern std::string wx_to_std (wxString);
 extern wxString std_to_wx (std::string);
 extern void dcpomatic_setup_i18n ();
+extern void run_gui_loop ();
 
 /** @class ThreadedStaticText
  *