Merge.

19 files changed, 875 insertions, 806 deletions

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index e36d618a4..aa05076c1 100644
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2016 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
@@ -79,7 +79,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 
 	t = new wxStaticText (
 		this, wxID_ANY,
-		_("(C) 2012-2015 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
+		_("(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n Ole Laursen, Brecht Sanders"),
 		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
 		);
 
@@ -110,13 +110,14 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	translated_by.Add (wxT ("Carsten Kurz"));
 	translated_by.Add (wxT ("Lilian Lefranc"));
 	translated_by.Add (wxT ("Gérald Maruccia"));
-	translated_by.Add (wxT ("Rob van Nieuwkerk"));
 	translated_by.Add (wxT ("Anders Uhl Pedersen"));
 	translated_by.Add (wxT ("Olivier Perriere"));
 	translated_by.Add (wxT ("Markus Raab"));
+	translated_by.Add (wxT ("Tiago Casal Ribeiro"));
 	translated_by.Add (wxT ("Davide Sanvito"));
 	translated_by.Add (wxT ("Marek Skrzelowski"));
 	translated_by.Add (wxT ("Igor Voytovich"));
+	translated_by.Add (wxT ("Rob van Nieuwkerk"));
 	add_section (_("Translated by"), translated_by);
 
 	wxArrayString with_help_from;
@@ -132,8 +133,8 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Eric Audurier"));
 	supported_by.Add (wxT ("Louis Belloisy"));
 	supported_by.Add (wxT ("Mike Blakesley"));
-	supported_by.Add (wxT ("Jeff Boot"));
 	supported_by.Add (wxT ("Silvio Bonomi"));
+	supported_by.Add (wxT ("Jeff Boot"));
 	supported_by.Add (wxT ("Kieran Carroll"));
 	supported_by.Add (wxT ("Matt Carter"));
 	supported_by.Add (wxT ("Frank Cianciolo"));
@@ -164,6 +165,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Chris Kay"));
 	supported_by.Add (wxT ("Lars Kelto"));
 	supported_by.Add (wxT ("Erwan Kerzanet"));
+	supported_by.Add (wxT ("Kert Kiima"));
 	supported_by.Add (wxT ("Adam Klotblixt"));
 	supported_by.Add (wxT ("Filip Kovcin"));
 	supported_by.Add (wxT ("Cihan Kulaber"));
@@ -183,6 +185,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Howard Molton"));
 	supported_by.Add (wxT ("Lindsay Morris"));
 	supported_by.Add (wxT ("David Nedrow"));
+	supported_by.Add (wxT ("Casablanca Nuernberg"));
 	supported_by.Add (wxT ("Tim O'Brien"));
 	supported_by.Add (wxT ("Jerome Cohen Olivar"));
 	supported_by.Add (wxT ("Kevin Orman"));
@@ -205,6 +208,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Raoul Walzer"));
 	supported_by.Add (wxT ("Wolfram Weber"));
 	supported_by.Add (wxT ("Frank Wenz"));
+	supported_by.Add (wxT ("Anja Wenz"));
 	supported_by.Add (wxT ("Johannes Wilbrand"));
 	supported_by.Add (wxT ("Roland Wirtz"));
 	supported_by.Add (wxT ("Wolfgang Woehl"));
@@ -212,6 +216,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
 	supported_by.Add (wxT ("Pavel Zhdanko"));
 	supported_by.Add (wxT ("Cinéma de la Neuveville"));
 	supported_by.Add (wxT ("Frechen-Film e.V."));
+	supported_by.Add (wxT ("Mobiles Kino e.V."));
 	supported_by.Add (wxT ("Daniel Židek"));
 	supported_by.Add (wxT ("Гуляев Михаил"));
 	add_section (_("Supported by"), supported_by);
diff --git a/src/wx/editable_list.h b/src/wx/editable_list.h
index f895e4a0a..1f0ead3cd 100644
--- a/src/wx/editable_list.h
+++ b/src/wx/editable_list.h
@@ -39,7 +39,8 @@ public:
 		boost::function<std::vector<T> ()> get,
 		boost::function<void (std::vector<T>)> set,
 		boost::function<std::string (T, int)> column,
-		bool can_edit = true
+		bool can_edit = true,
+		bool title = true
 		)
 		: wxPanel (parent)
 		, _get (get)
@@ -55,7 +56,11 @@ public:
 		table->AddGrowableCol (0, 1);
 		s->Add (table, 1, wxEXPAND);
 
-		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), wxLC_REPORT | wxLC_SINGLE_SEL);
+		long style = wxLC_REPORT | wxLC_SINGLE_SEL;
+		if (title) {
+			style |= wxLC_NO_HEADER;
+		}
+		_list = new wxListCtrl (this, wxID_ANY, wxDefaultPosition, wxSize (columns.size() * 200, 100), style);
 
 		for (size_t i = 0; i < columns.size(); ++i) {
 			wxListItem ip;
@@ -104,6 +109,20 @@ public:
 		}
 	}
 
+	boost::optional<T> selection () const
+	{
+		int item = _list->GetNextItem (-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (item == -1) {
+			return boost::optional<T> ();
+		}
+
+		std::vector<T> all = _get ();
+		DCPOMATIC_ASSERT (item >= 0 && item < int (all.size ()));
+		return all[item];
+	}
+
+	boost::signals2::signal<void ()> SelectionChanged;
+
 private:
 
 	void add_to_control (T item)
@@ -125,13 +144,13 @@ private:
 			_edit->Enable (i >= 0);
 		}
 		_remove->Enable (i >= 0);
+
+		SelectionChanged ();
 	}
 
 	void add_clicked ()
 	{
-		T new_item;
 		S* dialog = new S (this);
-		dialog->set (new_item);
 
 		if (dialog->ShowModal() == wxID_OK) {
 			add_to_control (dialog->get ());
diff --git a/src/wx/file_dialog_wrapper.h b/src/wx/file_dialog_wrapper.h
new file mode 100644
index 000000000..d30d6ef91
--- /dev/null
+++ b/src/wx/file_dialog_wrapper.h
@@ -0,0 +1,54 @@
+/*
+    Copyright (C) 2012-2015 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 <dcp/util.h>
+
+template <class T>
+class FileDialogWrapper
+{
+public:
+	FileDialogWrapper (wxWindow* parent, wxString title)
+		: _parent (parent)
+	{
+		_dialog = new wxFileDialog (parent, title);
+	}
+
+	void set (T) {}
+
+	T get ()
+	{
+		return T (dcp::file_to_string (wx_to_std (_dialog->GetPath ())));
+	}
+
+	int ShowModal ()
+	{
+		return _dialog->ShowModal ();
+	}
+
+	void Destroy ()
+	{
+		_dialog->Destroy ();
+		/* eek! */
+		delete this;
+	}
+
+private:
+	wxWindow* _parent;
+	wxFileDialog* _dialog;
+};
diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index 00024fabe..2cf109e55 100644
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -96,19 +96,10 @@ HintsDialog::film_changed ()
 		_text->WriteText (_("You have specified a font file which is larger than 640kB.  This is very likely to cause problems on playback."));
 	}
 
-	if (film->audio_channels() % 2) {
-		hint = true;
-		_text->WriteText (_("Your DCP has an odd number of audio channels.  This is very likely to cause problems on playback."));
-		_text->Newline ();
-	} else if (film->audio_channels() < 6) {
+	if (film->audio_channels() < 6) {
 		hint = true;
 		_text->WriteText (_("Your DCP has fewer than 6 audio channels.  This may cause problems on some projectors."));
 		_text->Newline ();
-	} else if (film->audio_channels() == 0) {
-		/* Carsten Kurz reckons having no audio can be a problem */
-		hint = true;
-		_text->WriteText (_("Your DCP has no audio channels.  This is likely to cause problems on playback."));
-		_text->Newline ();
 	}
 
 	int flat_or_narrower = 0;
diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index d372237e5..183bb456c 100644
--- a/src/wx/po/da_DK.po
+++ b/src/wx/po/da_DK.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-10-27 20:35+0100\n"
 "Last-Translator: FULL NAME &lt;EMAIL@ADDRESS&gt;\n"
 "Language-Team: LANGUAGE &lt;LL@li.org&gt;\n"
@@ -83,6 +83,8 @@ msgstr "3D, top/bund"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -147,7 +149,7 @@ msgstr "Tilføj billedsekvens"
 msgid "Add video, image or sound files to the film."
 msgstr "Tilføj video-, billed- eller lydfiler til filmen."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Tilføj..."
 
@@ -285,8 +287,7 @@ msgstr "Annuller"
 msgid "Cannot reference this DCP.  "
 msgstr ""
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Certifikat downloadet"
 
@@ -331,10 +332,6 @@ msgstr "Vælg en skrifttype"
 msgid "Choose a font file"
 msgstr "Vælg fil med skrifttyper"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Biograf"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr ""
@@ -388,21 +385,6 @@ msgstr "Kopier som navn"
 msgid "Could not analyse audio."
 msgstr "Kunne ikke analysere lyden."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, fuzzy, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Kunne ikke læse nøgle fil (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, fuzzy, c-format
-msgid "Could not get country list (%s)"
-msgstr "Kunne ikke læse nøgle fil (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, fuzzy, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Kunne ikke læse nøgle fil (%s)"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -414,7 +396,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Kunne ikke indlæse KDM (%s)"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Kunne ikke læse certifikatfil (%s)"
@@ -424,10 +406,6 @@ msgstr "Kunne ikke læse certifikatfil (%s)"
 msgid "Could not read key file (%s)"
 msgstr "Kunne ikke læse nøgle fil (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Land"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Opret i folder"
@@ -522,31 +500,28 @@ msgstr "Forsinkelse"
 msgid "Details..."
 msgstr "Detaljer..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Ned"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Download"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Download certifikat"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Download..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Downloader certifikat"
 
@@ -560,7 +535,7 @@ msgstr "Rediger sal..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Rediger..."
 
@@ -619,11 +594,6 @@ msgstr ""
 msgid "Fade out"
 msgstr ""
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Henter..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Filnavn"
@@ -698,7 +668,7 @@ msgstr "Gain til indholdskanal %d i DCP-kanal %d"
 msgid "General"
 msgstr "Generelt"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 #, fuzzy
 msgid "Get from file..."
 msgstr "Indlæs fra .ttf fil..."
@@ -921,7 +891,7 @@ msgid "NEEDS KDM: "
 msgstr "HAR BRUG FOR KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Navn"
 
@@ -980,7 +950,7 @@ msgstr "Organisation"
 msgid "Organisational unit"
 msgstr "Organisations enhed"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr ""
 
@@ -1097,7 +1067,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 #, fuzzy
 msgid "Recipient certificate"
 msgstr "Downloader certifikat"
@@ -1130,7 +1100,7 @@ msgid "Refer to existing DCP"
 msgstr ""
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Fjern"
 
@@ -1221,7 +1191,7 @@ msgid "Select CPL XML file"
 msgstr "Vælg CPL XML-fil"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Vælg certifikatfil"
 
@@ -1233,7 +1203,7 @@ msgstr ""
 msgid "Select Key File"
 msgstr "Vælg Nøglefil"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Select certificate file"
 msgstr "Vælg certifikatfil"
@@ -1246,15 +1216,11 @@ msgstr "Send som e-mail"
 msgid "Send logs"
 msgstr "Send logfiler"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Serienummer"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Servers serienummer"
 
@@ -1351,7 +1317,7 @@ msgstr ""
 msgid "Subtitles"
 msgstr "Undertekster"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Støttet af"
 
@@ -1375,7 +1341,7 @@ msgstr "Område (f.eks. UK)"
 msgid "Test version "
 msgstr "Testversion "
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Testet af"
 
@@ -1388,7 +1354,7 @@ msgstr ""
 "De(n) angivne indholdsfil(er) stemmer ikke med dem, der mangler. Prøv igen "
 "med den korrekte indholdsfil eller fjern det manglende indhold fra filmen."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Der er ingen tips; det hele ser godt ud!"
 
@@ -1408,7 +1374,7 @@ msgstr "Tråde"
 msgid "Threads to use for encoding on this host"
 msgstr "Antal tråde der kan bruges til at danne filmen på denne maskine"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr ""
 
@@ -1432,7 +1398,7 @@ msgstr "Timing|Timing"
 msgid "Top"
 msgstr "Top"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Oversat af"
 
@@ -1462,10 +1428,6 @@ msgstr ""
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Uventet filnavnsformat for certifikat"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Op"
@@ -1522,7 +1484,7 @@ msgstr "Hvidpunkt"
 msgid "White point adjustment"
 msgstr "Hvidpunktsjustering"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Med hjælp fra"
 
@@ -1558,13 +1520,19 @@ msgstr ""
 msgid "YUV to RGB matrix"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1665,6 +1633,36 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Biograf"
+
+#, fuzzy
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Kunne ikke læse nøgle fil (%s)"
+
+#, fuzzy
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Kunne ikke læse nøgle fil (%s)"
+
+#, fuzzy
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Kunne ikke læse nøgle fil (%s)"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Henter..."
+
+#~ msgid "Serial number"
+#~ msgstr "Serienummer"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Uventet filnavnsformat for certifikat"
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Doremi-serienumre skal have 6 cifre"
 
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index c2731cfd7..ebf82c59c 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: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-12-15 03:22+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: DCP-o-matic translators\n"
@@ -83,6 +83,8 @@ msgstr "3D Oben/Unten"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -151,7 +153,7 @@ msgstr ""
 "Einzelne oder mehrere Video-, (Stand-)Bild-, Ton- oder Untertiteldateien "
 "hinzufügen."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Hinzufügen..."
 
@@ -293,8 +295,7 @@ msgstr "Abbrechen"
 msgid "Cannot reference this DCP.  "
 msgstr "Das DCP kann nicht gefunden werden."
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Zertifikat heruntergeladen"
 
@@ -338,10 +339,6 @@ msgstr "Zeichensatz wählen"
 msgid "Choose a font file"
 msgstr "Einen Zeichensatz wählen"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Kino"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr "Farbe"
@@ -395,21 +392,6 @@ msgstr "ISDCF Name kopieren"
 msgid "Could not analyse audio."
 msgstr "Ton konnte nicht analysiert werden"
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Konnte die Kinoliste (%s) nicht lesen."
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, c-format
-msgid "Could not get country list (%s)"
-msgstr "Konnte die Länderliste (%s) nicht lesen."
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Konnte die Saalliste (%s) nicht lesen."
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -421,7 +403,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Konnte KDM %s nicht laden"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Konnte die Zertifikatsdatei (%s) nicht lesen."
@@ -431,10 +413,6 @@ msgstr "Konnte die Zertifikatsdatei (%s) nicht lesen."
 msgid "Could not read key file (%s)"
 msgstr "Konnte Schlüssel nicht lesen (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Land"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "In Ordner erstellen"
@@ -528,31 +506,28 @@ msgstr "Verzögerung (+/-)"
 msgid "Details..."
 msgstr "Details..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Nach unten"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Download"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Lade Zertifikat"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Download..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Zertifikat wird heruntergeladen..."
 
@@ -566,7 +541,7 @@ msgstr "Saal bearbeiten..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
@@ -622,11 +597,6 @@ msgstr "Einblenden"
 msgid "Fade out"
 msgstr "Ausblenden"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Zugriff..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Dateiname"
@@ -703,7 +673,7 @@ msgstr "Abschwächung des Kanals %d im DCP Kanal %d"
 msgid "General"
 msgstr "Allgemein"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 msgid "Get from file..."
 msgstr "Lade aus Datei..."
 
@@ -923,7 +893,7 @@ msgid "NEEDS KDM: "
 msgstr "Benötigt KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Name"
 
@@ -981,7 +951,7 @@ msgstr "Organisation"
 msgid "Organisational unit"
 msgstr "Organisationsuntereinheit"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr "Andere 'trusted devices'"
 
@@ -1098,7 +1068,7 @@ msgstr "Rec. 601 (SD)"
 msgid "Rec. 709"
 msgstr "Rec. 709 (HD)"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 msgid "Recipient certificate"
 msgstr "Empfängerzertifikat"
 
@@ -1129,7 +1099,7 @@ msgid "Refer to existing DCP"
 msgstr "Aus bestehendem DCP einbinden"
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -1219,7 +1189,7 @@ msgid "Select CPL XML file"
 msgstr "CPL XML Datei auswählen"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Zertifikat Datei auswählen"
 
@@ -1231,7 +1201,7 @@ msgstr "KDM auswählen"
 msgid "Select Key File"
 msgstr "Schlüsseldatei auswählen"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 msgid "Select certificate file"
 msgstr "Zertifikats-Datei auswählen"
 
@@ -1243,15 +1213,11 @@ msgstr "Per Email senden"
 msgid "Send logs"
 msgstr "Logs übermitteln"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Seriennummer"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Server Seriennummer"
 
@@ -1347,7 +1313,7 @@ msgstr "Untertitel Darstellung"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
@@ -1371,7 +1337,7 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Getestet von"
 
@@ -1385,7 +1351,7 @@ msgstr ""
 "Entweder nochmals mit den richtigen Inhaltsdateien probieren oder Fehlende "
 "löschen."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Keine Warnungen: Alles sieht gut aus!"
 
@@ -1405,7 +1371,7 @@ msgstr "Threads"
 msgid "Threads to use for encoding on this host"
 msgstr "Auf diesem Rechner zu benutzende CPU-Threads"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Übersicht"
 
@@ -1429,7 +1395,7 @@ msgstr "Trimmen"
 msgid "Top"
 msgstr "Oben"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Übersetzt von"
 
@@ -1459,10 +1425,6 @@ msgstr "Spitzenwert (True peak) ist %.2fdB"
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Ungültige Zertifikats-Datei"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Nach oben"
@@ -1519,7 +1481,7 @@ msgstr "Weisspunkt"
 msgid "White point adjustment"
 msgstr "Weisspunktanpassung"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Mit Hilfe von"
 
@@ -1555,7 +1517,13 @@ msgstr "YUV-RGB Konvertierung:"
 msgid "YUV to RGB matrix"
 msgstr "YUV-RGB Matrix"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1563,7 +1531,7 @@ msgstr ""
 "Sie verwenden 3D Quellinhalte, ihr DCP Format ist aber auf 2D gesetzt. "
 "Ändern Sie es auf 3D, wenn Sie eine Wiedergabe in 3D beabsichtigen. "
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1669,6 +1637,33 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Kino"
+
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Konnte die Kinoliste (%s) nicht lesen."
+
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Konnte die Länderliste (%s) nicht lesen."
+
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Konnte die Saalliste (%s) nicht lesen."
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Zugriff..."
+
+#~ msgid "Serial number"
+#~ msgstr "Seriennummer"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Ungültige Zertifikats-Datei"
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Doremi Seriennummern müssen aus 6 Zahlen bestehen!"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 5d1d7463e..d9ac9d182 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: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-08-30 15:57-0400\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -83,6 +83,8 @@ msgstr "3D arriba/abajo"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -149,7 +151,7 @@ msgstr "Añadir secuencia de imágenes"
 msgid "Add video, image or sound files to the film."
 msgstr "Añadir ficheros de video, imagen o sonido a la película."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Añadir..."
 
@@ -286,8 +288,7 @@ msgstr "Cancelar"
 msgid "Cannot reference this DCP.  "
 msgstr ""
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Certificado descargado"
 
@@ -332,10 +333,6 @@ msgstr "Elige una fuente"
 msgid "Choose a font file"
 msgstr "Elegir un fichero de fuente"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Cine"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr ""
@@ -389,21 +386,6 @@ msgstr "Copiar como nombre"
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, fuzzy, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "No se pudo obtener el vídeo para mostrarlo (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, fuzzy, c-format
-msgid "Could not get country list (%s)"
-msgstr "No se pudo establecer el contenido: %s"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, fuzzy, c-format
-msgid "Could not get screen list (%s)"
-msgstr "No se pudo establecer el contenido: %s"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -415,7 +397,7 @@ msgid "Could not load KDM (%s)"
 msgstr "No se pudo cargar la KDM %s"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "No se pudo leer el fichero de certificado (%s)"
@@ -425,10 +407,6 @@ msgstr "No se pudo leer el fichero de certificado (%s)"
 msgid "Could not read key file (%s)"
 msgstr "No se pudo leer el fichero de llave (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "País"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Crear en carpeta"
@@ -524,31 +502,28 @@ msgstr "Retardo"
 msgid "Details..."
 msgstr "Detalles..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Bajar"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Descargar"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Descargar certificado"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Descargar…"
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Descargando certificado"
 
@@ -562,7 +537,7 @@ msgstr "Editar pantalla..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Editar..."
 
@@ -622,11 +597,6 @@ msgstr "Fundido de entrada"
 msgid "Fade out"
 msgstr "Fundido de salida"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Recuperando..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Nombre de fichero"
@@ -703,7 +673,7 @@ msgstr "Ganancia del canal %d en el canal %d del DCP"
 msgid "General"
 msgstr "General"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 #, fuzzy
 msgid "Get from file..."
 msgstr "Usar del fichero .ttf"
@@ -926,7 +896,7 @@ msgid "NEEDS KDM: "
 msgstr "NECESITA KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Nombre"
 
@@ -986,7 +956,7 @@ msgstr "Organización"
 msgid "Organisational unit"
 msgstr "Unidad organizativa"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr ""
 
@@ -1106,7 +1076,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 #, fuzzy
 msgid "Recipient certificate"
 msgstr "Descargando certificado"
@@ -1139,7 +1109,7 @@ msgid "Refer to existing DCP"
 msgstr ""
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Quitar"
 
@@ -1231,7 +1201,7 @@ msgid "Select CPL XML file"
 msgstr "Seleccionar XML del CPL"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Seleccionar fichero de certificado"
 
@@ -1243,7 +1213,7 @@ msgstr "Seleccionar KDM"
 msgid "Select Key File"
 msgstr "Seleccionar fichero de llave"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Select certificate file"
 msgstr "Seleccionar fichero de certificado"
@@ -1256,15 +1226,11 @@ msgstr "Enviar por email"
 msgid "Send logs"
 msgstr "Enviar registros"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Número de serie"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Servidor"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Número de serie del servidor"
 
@@ -1362,7 +1328,7 @@ msgstr "Escala del subtítulo"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Soportado por"
 
@@ -1386,7 +1352,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Comprobado por"
 
@@ -1399,7 +1365,7 @@ msgstr ""
 "El fichero(s) especificados no es el mismo que el ausente. Puedes probar de "
 "nuevo con el fichero correcto o eliminar el contenido ausente."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "No hay recomendaciones: ¡todo parece bien!"
 
@@ -1419,7 +1385,7 @@ msgstr "Hilos"
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Huella dactilar"
 
@@ -1443,7 +1409,7 @@ msgstr "Tiempo|Tiempo"
 msgid "Top"
 msgstr "Arriba"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Traducido por"
 
@@ -1473,10 +1439,6 @@ msgstr "El pico es %.2fdB"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Nombre inesperado del fichero de certificado"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Subir"
@@ -1533,7 +1495,7 @@ msgstr "Punto de blanco"
 msgid "White point adjustment"
 msgstr "Ajuste del punto de blanco"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Con ayuda de"
 
@@ -1569,7 +1531,13 @@ msgstr "Conversión YUV a RGB"
 msgid "YUV to RGB matrix"
 msgstr "Matriz YUV a RGB"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1577,7 +1545,7 @@ msgstr ""
 "Estás usando contenido 3D pero el DCP es 2D. Cambia el DCP a 3D si quieres "
 "que funcione en un sistema 3D (ej.: Real-D, MasterImage, etc.)"
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1682,6 +1650,36 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Cine"
+
+#, fuzzy
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "No se pudo obtener el vídeo para mostrarlo (%s)"
+
+#, fuzzy
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "No se pudo establecer el contenido: %s"
+
+#, fuzzy
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "No se pudo establecer el contenido: %s"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Recuperando..."
+
+#~ msgid "Serial number"
+#~ msgstr "Número de serie"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Nombre inesperado del fichero de certificado"
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Los números de serie de Doremi deben tener 6 cifras"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index bca4f2653..1138d12cc 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: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-11-13 20:44+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -82,6 +82,8 @@ msgstr "3D dessus/dessous"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -148,7 +150,7 @@ msgstr "Ajout séquence images"
 msgid "Add video, image or sound files to the film."
 msgstr "Ajout fichiers vidéo, image ou son au projet."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Ajouter..."
 
@@ -287,8 +289,7 @@ msgstr "Annuler"
 msgid "Cannot reference this DCP.  "
 msgstr "Ne peut pas se référer à ce DCP"
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Certificat téléchargé"
 
@@ -333,10 +334,6 @@ msgstr "Choisir une police"
 msgid "Choose a font file"
 msgstr "Choisir un fichier de police"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Cinéma"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr "Couleur"
@@ -390,21 +387,6 @@ msgstr "Copier le nom"
 msgid "Could not analyse audio."
 msgstr "Analyse du son impossible"
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Liste des cinémas non accessible (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, c-format
-msgid "Could not get country list (%s)"
-msgstr "Liste des pays non accessible (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Liste des salles non accessible (%s)"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -416,7 +398,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Chargement KDM impossible (%s)"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Lecture du ficher de certificat (%s) impossible"
@@ -426,10 +408,6 @@ msgstr "Lecture du ficher de certificat (%s) impossible"
 msgid "Could not read key file (%s)"
 msgstr "Aucun fichier clé à lire (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Pays"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
@@ -523,31 +501,28 @@ msgstr "Délai"
 msgid "Details..."
 msgstr "Détails..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Descendre"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Télécharger"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Téléchargement Certificat"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Téléchargement..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Téléchargement Certificat en cours"
 
@@ -561,7 +536,7 @@ msgstr "Éditer la salle"
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Éditer..."
 
@@ -619,11 +594,6 @@ msgstr "Fondu début"
 msgid "Fade out"
 msgstr "Fondu fin"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Obtention..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Nom de fichier"
@@ -698,7 +668,7 @@ msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 msgid "General"
 msgstr "Général"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 #, fuzzy
 msgid "Get from file..."
 msgstr "Choisir depuis un fichier..."
@@ -920,7 +890,7 @@ msgid "NEEDS KDM: "
 msgstr "DEMANDE de KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Nom"
 
@@ -978,7 +948,7 @@ msgstr "Organisation"
 msgid "Organisational unit"
 msgstr "Unité d'organisation"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr ""
 
@@ -1095,7 +1065,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 #, fuzzy
 msgid "Recipient certificate"
 msgstr "Téléchargement Certificat en cours"
@@ -1127,7 +1097,7 @@ msgid "Refer to existing DCP"
 msgstr "Se réferer à DCP existant"
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -1217,7 +1187,7 @@ msgid "Select CPL XML file"
 msgstr "Sélectionner le fichier CPL.xml"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Sélectionner le certificat"
 
@@ -1229,7 +1199,7 @@ msgstr "Selectionner KDM"
 msgid "Select Key File"
 msgstr "Sélectionner fichier clé"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Select certificate file"
 msgstr "Sélectionner le certificat"
@@ -1242,15 +1212,11 @@ msgstr "Envoyer par e-mail"
 msgid "Send logs"
 msgstr "Envoyer rapport"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Numéro de Série"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Serveur"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Numéro de Série du Serveur"
 
@@ -1346,7 +1312,7 @@ msgstr "Apparence des sous-titres"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Soutenu par"
 
@@ -1370,7 +1336,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version test"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Testé par"
 
@@ -1384,7 +1350,7 @@ msgstr ""
 "ceux détectés comme manquants. Vous pouvez réessayer avec les contenus "
 "corrects ou supprimer les contenus manquants."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Il n'y a aucun avertissement: tout semble correct!"
 
@@ -1404,7 +1370,7 @@ msgstr "Processus"
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Empreinte"
 
@@ -1428,7 +1394,7 @@ msgstr "Temps"
 msgid "Top"
 msgstr "Haut"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Traduit par"
 
@@ -1458,10 +1424,6 @@ msgstr "La crête est de %.2fdB"
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Nom de fichier certificat non conforme "
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Monter"
@@ -1518,7 +1480,7 @@ msgstr "Valeur de Blanc"
 msgid "White point adjustment"
 msgstr "Ajustement valeur de blanc"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "avec l'aide de"
 
@@ -1554,7 +1516,13 @@ msgstr "conversion YUV vers RGB"
 msgid "YUV to RGB matrix"
 msgstr "Matrice YUV vers RGB"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1563,7 +1531,7 @@ msgstr ""
 "sur 3D si vous voulez le lire sur un matériel 3D adapté (Real-D, MasterImage "
 "etc.)"
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1667,6 +1635,33 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Cinéma"
+
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Liste des cinémas non accessible (%s)"
+
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Liste des pays non accessible (%s)"
+
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Liste des salles non accessible (%s)"
+
+#~ msgid "Country"
+#~ msgstr "Pays"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Obtention..."
+
+#~ msgid "Serial number"
+#~ msgstr "Numéro de Série"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Nom de fichier certificat non conforme "
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Les numéros de série Doremi doivent être composés de 6 chiffres"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 79de30d50..ced24134c 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: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-10-14 10:27+0200\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -83,6 +83,8 @@ msgstr "3D su/giù"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -142,7 +144,7 @@ msgstr "Aggiungi sequenza immagini"
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Aggiungi..."
 
@@ -278,8 +280,7 @@ msgstr "Annulla"
 msgid "Cannot reference this DCP.  "
 msgstr ""
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Scarica certificato"
 
@@ -324,10 +325,6 @@ msgstr "Scegli un font"
 msgid "Choose a font file"
 msgstr "Scegli un file font"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Cinema"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr ""
@@ -382,21 +379,6 @@ msgstr "Salva una copia"
 msgid "Could not analyse audio."
 msgstr "Non posso analizzare l'audio."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, fuzzy, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Non posso aprire il file del contenuto (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, fuzzy, c-format
-msgid "Could not get country list (%s)"
-msgstr "Non posso regolare il contenuto: %s"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, fuzzy, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Non posso regolare il contenuto: %s"
-
 #: src/wx/film_viewer.cc:189
 #, fuzzy, c-format
 msgid "Could not get video for view (%s)"
@@ -408,7 +390,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Non posso creare il DCP: %s"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, fuzzy, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
@@ -418,10 +400,6 @@ msgstr "Non posso aprire il file del contenuto (%s)"
 msgid "Could not read key file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Nazione"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Crea nella cartella"
@@ -519,31 +497,27 @@ msgstr "Ritardo"
 msgid "Details..."
 msgstr "Dettagli"
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+msgid "Dolby / Doremi"
 msgstr ""
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr ""
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Download"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Download certificato"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Download..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Certificate in download"
 
@@ -557,7 +531,7 @@ msgstr "Modifica Schermo..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Modifica..."
 
@@ -617,12 +591,6 @@ msgstr "Dissolvenza in entrata"
 msgid "Fade out"
 msgstr "Dissolvenza in uscita"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-#, fuzzy
-msgid "Fetching..."
-msgstr "conteggio..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Nome del file"
@@ -699,7 +667,7 @@ msgstr "Guadagno per il canale sorgente %d nel canale DCP %d"
 msgid "General"
 msgstr ""
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 msgid "Get from file..."
 msgstr ""
 
@@ -927,7 +895,7 @@ msgid "NEEDS KDM: "
 msgstr ""
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Nome"
 
@@ -987,7 +955,7 @@ msgstr "Durata"
 msgid "Organisational unit"
 msgstr ""
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr ""
 
@@ -1109,7 +1077,7 @@ msgstr ""
 msgid "Rec. 709"
 msgstr ""
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 #, fuzzy
 msgid "Recipient certificate"
 msgstr "Certificate in download"
@@ -1141,7 +1109,7 @@ msgid "Refer to existing DCP"
 msgstr ""
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -1232,7 +1200,7 @@ msgid "Select CPL XML file"
 msgstr "Seleziona file XML CPL"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Seleziona il file del Certificato"
 
@@ -1245,7 +1213,7 @@ msgstr "Selezioa KDM"
 msgid "Select Key File"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Select certificate file"
 msgstr "Seleziona il file del Certificato"
@@ -1258,15 +1226,11 @@ msgstr "Manda per email"
 msgid "Send logs"
 msgstr ""
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Numero seriale"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Numero seriale server"
 
@@ -1363,7 +1327,7 @@ msgstr "Scala dei Sottotitoli"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Supportato da"
 
@@ -1388,7 +1352,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Testato da"
 
@@ -1401,7 +1365,7 @@ msgstr ""
 "Il/i file sorgenteo che hai specificato sono diversi da quelli mancanti. "
 "Riprova oppure rimuovi la sorgente mancante."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Non ci sono suggerimenti: sembra tutto a posto!"
 
@@ -1421,7 +1385,7 @@ msgstr "Threads"
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr ""
 
@@ -1445,7 +1409,7 @@ msgstr ""
 msgid "Top"
 msgstr ""
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Tradotto da"
 
@@ -1475,10 +1439,6 @@ msgstr ""
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr ""
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Su"
@@ -1536,7 +1496,7 @@ msgstr ""
 msgid "White point adjustment"
 msgstr ""
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr ""
 
@@ -1572,13 +1532,19 @@ msgstr ""
 msgid "YUV to RGB matrix"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1679,6 +1645,34 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Cinema"
+
+#, fuzzy
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Non posso aprire il file del contenuto (%s)"
+
+#, fuzzy
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Non posso regolare il contenuto: %s"
+
+#, fuzzy
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Non posso regolare il contenuto: %s"
+
+#~ msgid "Country"
+#~ msgstr "Nazione"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#, fuzzy
+#~ msgid "Fetching..."
+#~ msgstr "conteggio..."
+
+#~ msgid "Serial number"
+#~ msgstr "Numero seriale"
+
 #~ msgid "audio"
 #~ msgstr "audio"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 4a50be819..5ba9b413d 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-15 16:11+0000\n"
-"PO-Revision-Date: 2015-11-28 00:30+0100\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
+"PO-Revision-Date: 2015-12-23 02:05+0100\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language: nl_NL\n"
@@ -37,7 +37,7 @@ msgstr "(Geen)"
 
 #: src/wx/config_dialog.cc:175
 msgid "(restart DCP-o-matic to see language changes)"
-msgstr "(herstart DCP-o-matic om taalwijziging te zien)"
+msgstr "(herstart DCP-o-matic om taalwijzigingen te zien)"
 
 #: src/wx/audio_mapping_view.cc:144
 msgid "-6dB"
@@ -83,6 +83,8 @@ msgstr "3D boven/onder"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -150,7 +152,7 @@ msgstr "Voeg beeldsequentie toe"
 msgid "Add video, image or sound files to the film."
 msgstr "Voeg video-, beeld- of audio-bestanden aan de film toe."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Voeg toe..."
 
@@ -289,8 +291,7 @@ msgstr "Annuleer"
 msgid "Cannot reference this DCP.  "
 msgstr "Kan niet aan deze DCP refereren."
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Certificaat gedownload"
 
@@ -334,10 +335,6 @@ msgstr "Kies een lettertype"
 msgid "Choose a font file"
 msgstr "Kies een lettertype-bestand"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Bioscoop"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr "Kleur"
@@ -391,21 +388,6 @@ msgstr "Kopieer als naam"
 msgid "Could not analyse audio."
 msgstr "Kan audio niet analyseren."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Kan lijst met bioscopen niet ophalen (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, c-format
-msgid "Could not get country list (%s)"
-msgstr "Kan lijst met landen niet ophalen (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Kan lijst met schermen niet ophalen (%s)"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -417,7 +399,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Kan KDM niet laden (%s)"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Kan certificaat-bestand niet lezen (%s)"
@@ -427,10 +409,6 @@ msgstr "Kan certificaat-bestand niet lezen (%s)"
 msgid "Could not read key file (%s)"
 msgstr "Kan sleutel-bestand niet lezen (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Land"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Aanmaken in map"
@@ -524,31 +502,27 @@ msgstr "Vertraging"
 msgid "Details..."
 msgstr "Details..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
-msgstr "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+msgid "Dolby / Doremi"
+msgstr "Dolby / Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Download"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Download certificaat"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Download..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Downloaden certificaat"
 
@@ -562,7 +536,7 @@ msgstr "Wijzig Scherm..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Wijzig..."
 
@@ -618,11 +592,6 @@ msgstr "Fade in"
 msgid "Fade out"
 msgstr "Fade out"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Ophalen..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Bestandsnaam"
@@ -697,7 +666,7 @@ msgstr "Versterking voor content-kanaal %d in DCP-kanaal %d"
 msgid "General"
 msgstr "Algemeen"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 msgid "Get from file..."
 msgstr "Haal uit bestand..."
 
@@ -917,7 +886,7 @@ msgid "NEEDS KDM: "
 msgstr "HEEFT KDM NODIG: "
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Naam"
 
@@ -977,7 +946,7 @@ msgstr "Organisation"
 msgid "Organisational unit"
 msgstr "Organisational unit"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr "Andere 'trusted devices'"
 
@@ -1094,7 +1063,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 msgid "Recipient certificate"
 msgstr "Ontvanger-certificaat"
 
@@ -1125,7 +1094,7 @@ msgid "Refer to existing DCP"
 msgstr "Refereer aan bestaande DCP"
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Verwijder"
 
@@ -1215,7 +1184,7 @@ msgid "Select CPL XML file"
 msgstr "Selecteer CPL XML-bestand"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Selecteer Certificaat-bestand"
 
@@ -1227,7 +1196,7 @@ msgstr "Selecteer KDM"
 msgid "Select Key File"
 msgstr "Selecteer sleutelbestand"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 msgid "Select certificate file"
 msgstr "Selecteer certificaat-bestand"
 
@@ -1239,15 +1208,11 @@ msgstr "Stuur via email"
 msgid "Send logs"
 msgstr "Stuur logs"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Serienummer"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Server-serienummer"
 
@@ -1343,7 +1308,7 @@ msgstr "Ondertitelings-uiterlijk"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Ondersteund door"
 
@@ -1367,7 +1332,7 @@ msgstr "Gebied (bv. NL)"
 msgid "Test version "
 msgstr "Test-versie"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Getest door"
 
@@ -1381,7 +1346,7 @@ msgstr ""
 "ontbrekende bestand(en).  Probeer het opnieuw met de juiste content-"
 "bestand(en) of verwijder de ontbrekende content."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Er zijn geen hints, alles ziet er goed uit!"
 
@@ -1401,7 +1366,7 @@ msgstr "Threads"
 msgid "Threads to use for encoding on this host"
 msgstr "Threads die op deze host voor codering gebruikt worden"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Thumbprint"
 
@@ -1425,7 +1390,7 @@ msgstr "Timing"
 msgid "Top"
 msgstr "Boven"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Vertaald door"
 
@@ -1448,17 +1413,13 @@ msgstr "Wegknippen tot aan huidige positie"
 #: src/wx/audio_dialog.cc:292
 #, c-format
 msgid "True peak is %.2fdB"
-msgstr "Piek is %.2fdB"
+msgstr "Piek (True peak) is %.2fdB"
 
 #: src/wx/audio_dialog.cc:82 src/wx/config_dialog.cc:650
 #: src/wx/video_panel.cc:84
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Onverwachte vorm van certificaat-bestandsnaam"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Omhoog"
@@ -1515,7 +1476,7 @@ msgstr "Witpunt"
 msgid "White point adjustment"
 msgstr "Witpunt-aanpassing"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Met hulp van"
 
@@ -1551,7 +1512,16 @@ msgstr "YUV naar RGB conversie"
 msgid "YUV to RGB matrix"
 msgstr "YUV naar RGB matrix"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+"U heeft een Interop-DCP ingesteld met een beeldsnelheid die niet officieel "
+"ondersteund wordt.  U wordt geadviseerd om in plaats hiervan een SMPTE-DCP "
+"te maken."
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1559,7 +1529,7 @@ msgstr ""
 "U gebruikt 3D-content, maar uw DCP is op 2D ingesteld.  Stel de DCP in op 3D "
 "als u hem wilt afspelen op een 3D-systeem (bv. Real-D, MasterImage etc.)"
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1661,3 +1631,30 @@ msgstr "x"
 #: src/wx/colour_conversion_editor.cc:115
 msgid "y"
 msgstr "y"
+
+#~ msgid "Cinema"
+#~ msgstr "Bioscoop"
+
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Kan lijst met bioscopen niet ophalen (%s)"
+
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Kan lijst met landen niet ophalen (%s)"
+
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Kan lijst met schermen niet ophalen (%s)"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Ophalen..."
+
+#~ msgid "Serial number"
+#~ msgstr "Serienummer"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Onverwachte vorm van certificaat-bestandsnaam"
diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index 7db0a0b01..83fa48b4e 100644
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-10-10 20:35+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -85,6 +85,8 @@ msgstr "3D góra/dół"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -147,7 +149,7 @@ msgstr "Dodaj sekwencję obrazów"
 msgid "Add video, image or sound files to the film."
 msgstr "Dodaj plik wideo, audio lub obraz do filmu."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Dodaj"
 
@@ -286,8 +288,7 @@ msgstr "Anuluj"
 msgid "Cannot reference this DCP.  "
 msgstr ""
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Certyfikat ściągnięty"
 
@@ -332,10 +333,6 @@ msgstr "Wybierz czcionkę"
 msgid "Choose a font file"
 msgstr "Wybierz plik czcionki"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Kino"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr ""
@@ -389,21 +386,6 @@ msgstr "Kopiuj jako"
 msgid "Could not analyse audio."
 msgstr "Nie udało się przeanalizować dźwięku."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, fuzzy, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Nie udało się otworzyć podglądu obrazu (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, fuzzy, c-format
-msgid "Could not get country list (%s)"
-msgstr "Nie udało się otworzyć podglądu obrazu (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, fuzzy, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Nie udało się otworzyć podglądu obrazu (%s)"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -415,7 +397,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Nie udało się załadować KDM (%s)"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Nie udało się odczytać certyfikatu (%s)"
@@ -425,10 +407,6 @@ msgstr "Nie udało się odczytać certyfikatu (%s)"
 msgid "Could not read key file (%s)"
 msgstr "Nie udało się odczytać pliku klucza (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Kraj"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Utwórz folder"
@@ -523,31 +501,28 @@ msgstr "Opóźnienie"
 msgid "Details..."
 msgstr "Szczegóły"
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Dół"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Pobieranie"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Pobierz certyfikat"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Pobierz"
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Pobieranie certyfikatu"
 
@@ -561,7 +536,7 @@ msgstr "Zmień Sala"
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Zmień"
 
@@ -620,11 +595,6 @@ msgstr "Fade in"
 msgid "Fade out"
 msgstr "Fade out"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Pobieranie"
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Nazwa pliku"
@@ -700,7 +670,7 @@ msgstr "Wzocnienie dla kanału %d w %d kanale DCP"
 msgid "General"
 msgstr "Ogólne"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 #, fuzzy
 msgid "Get from file..."
 msgstr "Ustaw czcionkę z pliku .ttf"
@@ -923,7 +893,7 @@ msgid "NEEDS KDM: "
 msgstr "WYMAGA KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Nazwa"
 
@@ -983,7 +953,7 @@ msgstr "Organizacja"
 msgid "Organisational unit"
 msgstr "Dział"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr ""
 
@@ -1100,7 +1070,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 #, fuzzy
 msgid "Recipient certificate"
 msgstr "Pobieranie certyfikatu"
@@ -1133,7 +1103,7 @@ msgid "Refer to existing DCP"
 msgstr "Użyj istniejące DCP"
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Usuń"
 
@@ -1224,7 +1194,7 @@ msgid "Select CPL XML file"
 msgstr "Wybierz plik CPL XML"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Wybierz plik certyfikatu"
 
@@ -1236,7 +1206,7 @@ msgstr "Wybierz KDM"
 msgid "Select Key File"
 msgstr "Wybierz plik klucza"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Select certificate file"
 msgstr "Wybierz plik certyfikatu"
@@ -1249,15 +1219,11 @@ msgstr "Wyślij emailem"
 msgid "Send logs"
 msgstr "Wyślij logi"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Numer seryjny"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Serwer"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Numer seryjny serwera"
 
@@ -1354,7 +1320,7 @@ msgstr ""
 msgid "Subtitles"
 msgstr "Napisy"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Wsparli"
 
@@ -1378,7 +1344,7 @@ msgstr "Region (e.g. PL)"
 msgid "Test version "
 msgstr "Wersja testowa"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Testerzy"
 
@@ -1391,7 +1357,7 @@ msgstr ""
 "Plik(i) które dodałeś są inne od tych, które brakują. Spróbuj jeszcze raz "
 "dodać prawidłowe pliku, lub usuń brakujące."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Brak wskazówek: wszystko wygląda świetnie!"
 
@@ -1411,7 +1377,7 @@ msgstr "Wątki"
 msgid "Threads to use for encoding on this host"
 msgstr "Ilość wątków użytych dla kodowania na tym serwerze"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Sygnatura"
 
@@ -1435,7 +1401,7 @@ msgstr "Czas"
 msgid "Top"
 msgstr "Góra"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Tłumacze"
 
@@ -1465,10 +1431,6 @@ msgstr "Peak wynosi %.2fdB"
 msgid "Type"
 msgstr "Rodzaj"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Nieobsługiwana nazwa pliku certyfikatu"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Góra"
@@ -1525,7 +1487,7 @@ msgstr "Punkt bieli"
 msgid "White point adjustment"
 msgstr "Ustawienia punktu bieli"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Pomogli"
 
@@ -1561,7 +1523,13 @@ msgstr "Konwersja YUV do RGB"
 msgid "YUV to RGB matrix"
 msgstr "Matryca YUV do RGB"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1570,7 +1538,7 @@ msgstr ""
 "jeśli chcesz, aby DCP było prawidłowo wyświetlane na systemach 3D ( Real-D, "
 "MasterImage itp.)"
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1675,6 +1643,36 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Kino"
+
+#, fuzzy
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Nie udało się otworzyć podglądu obrazu (%s)"
+
+#, fuzzy
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Nie udało się otworzyć podglądu obrazu (%s)"
+
+#, fuzzy
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Nie udało się otworzyć podglądu obrazu (%s)"
+
+#~ msgid "Country"
+#~ msgstr "Kraj"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Pobieranie"
+
+#~ msgid "Serial number"
+#~ msgstr "Numer seryjny"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Nieobsługiwana nazwa pliku certyfikatu"
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Numer seryjny Doremi musi posiadać 6 cyfr"
 
diff --git a/src/wx/po/pt_PT.po b/src/wx/po/pt_PT.po
index 4cdaffcad..87e1c8f6c 100644
--- a/src/wx/po/pt_PT.po
+++ b/src/wx/po/pt_PT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic PORTUGUESE (Portugal)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-11-11 15:57+0000\n"
 "Last-Translator: Tiago Casal Ribeiro <tiago@casalribeiro.com>\n"
 "Language-Team: \n"
@@ -83,6 +83,8 @@ msgstr "3D superior/inferior"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -150,7 +152,7 @@ msgstr "Adicionar sequência de imagens"
 msgid "Add video, image or sound files to the film."
 msgstr "Adicionar ficheiros de video, imagem ou som ao filme."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Adicionar..."
 
@@ -290,8 +292,7 @@ msgstr "Cancelar"
 msgid "Cannot reference this DCP.  "
 msgstr "Não pode referenciar este DCP."
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Certificado transferido"
 
@@ -336,10 +337,6 @@ msgstr "Seleccionar tipo de letra"
 msgid "Choose a font file"
 msgstr "Seleccionar um ficheiro de tipo de letra"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Cinema"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr ""
@@ -393,21 +390,6 @@ msgstr "Copiar como nome"
 msgid "Could not analyse audio."
 msgstr "Não foi possível analizar audio."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, fuzzy, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Não foi possível obter o vídeo para visualizar (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, fuzzy, c-format
-msgid "Could not get country list (%s)"
-msgstr "Não foi possível obter o vídeo para visualizar (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, fuzzy, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Não foi possível obter o vídeo para visualizar (%s)"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -419,7 +401,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Não foi possível carregar a KDM (%s)"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Não foi possível ler o ficheiro do certificado (%s)"
@@ -429,10 +411,6 @@ msgstr "Não foi possível ler o ficheiro do certificado (%s)"
 msgid "Could not read key file (%s)"
 msgstr "Não foi possível ler o ficheiro da chave (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "País"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Criar na pasta"
@@ -526,31 +504,28 @@ msgstr "Atraso"
 msgid "Details..."
 msgstr "Pormenores..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Mover para baixo"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Transferir"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Transferir certificado"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Transferir..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "A transferir certificado"
 
@@ -564,7 +539,7 @@ msgstr "Editar ecrã..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Editar..."
 
@@ -622,11 +597,6 @@ msgstr "Fade in"
 msgid "Fade out"
 msgstr "Fade out"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Em busca..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Nome do ficheiro"
@@ -702,7 +672,7 @@ msgstr "Ganho para o canal de conteúdo %d no canal DCP %d"
 msgid "General"
 msgstr "Geral"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 #, fuzzy
 msgid "Get from file..."
 msgstr "Definir de ficheiro .ttf..."
@@ -928,7 +898,7 @@ msgid "NEEDS KDM: "
 msgstr "NECESSITA DE KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Nome"
 
@@ -987,7 +957,7 @@ msgstr "Organização"
 msgid "Organisational unit"
 msgstr "Unidade organizacional"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr ""
 
@@ -1106,7 +1076,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 #, fuzzy
 msgid "Recipient certificate"
 msgstr "A transferir certificado"
@@ -1138,7 +1108,7 @@ msgid "Refer to existing DCP"
 msgstr "Referido no DCP presente"
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Remover"
 
@@ -1229,7 +1199,7 @@ msgid "Select CPL XML file"
 msgstr "Seleccionar ficheiro XML da CPL"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Seleccionar Ficheiro do Certificado"
 
@@ -1241,7 +1211,7 @@ msgstr "Seleccionar KDM"
 msgid "Select Key File"
 msgstr "Seleccionar Ficheiro da Chave"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Select certificate file"
 msgstr "Seleccionar Ficheiro do Certificado"
@@ -1254,15 +1224,11 @@ msgstr "Enviar por email"
 msgid "Send logs"
 msgstr "Enviar registos"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Número de série"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Servidor"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Número de série do servidor"
 
@@ -1359,7 +1325,7 @@ msgstr ""
 msgid "Subtitles"
 msgstr "Legendas"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Apoiado por "
 
@@ -1383,7 +1349,7 @@ msgstr "Território (e.g. PT)"
 msgid "Test version "
 msgstr "Versão de teste"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Testado por"
 
@@ -1396,7 +1362,7 @@ msgstr ""
 "Os ficheiros de conteúdo especificados não são os mesmos que estão em falta. "
 "Tente novamente com os ficheiros correctos ou remova o conteúdo em falta."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Não há sugestões: Tudo parece bem!"
 
@@ -1416,7 +1382,7 @@ msgstr "Linhas de execução"
 msgid "Threads to use for encoding on this host"
 msgstr "Linhas de execução a usar para codificação neste anfitrião"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Impressão digital"
 
@@ -1440,7 +1406,7 @@ msgstr "Duração"
 msgid "Top"
 msgstr "Superior"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Traduzido por"
 
@@ -1470,10 +1436,6 @@ msgstr "Pico de %.2fdB"
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Formato inesperado de ficheiro de certificado"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Mover para cima"
@@ -1530,7 +1492,7 @@ msgstr "Ponto de branco"
 msgid "White point adjustment"
 msgstr "Ajustar ponto de branco"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Com a ajuda de "
 
@@ -1566,7 +1528,13 @@ msgstr "Conversão de YUV para RGB"
 msgid "YUV to RGB matrix"
 msgstr "Matriz de YUV para RGB"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1575,7 +1543,7 @@ msgstr ""
 "DCP para 3D se desejar reproduzi-lo num sistema 3D (e.g. Real-D, MasterImage "
 "etc.)"
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1680,6 +1648,36 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Cinema"
+
+#, fuzzy
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Não foi possível obter o vídeo para visualizar (%s)"
+
+#, fuzzy
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Não foi possível obter o vídeo para visualizar (%s)"
+
+#, fuzzy
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Não foi possível obter o vídeo para visualizar (%s)"
+
+#~ msgid "Country"
+#~ msgstr "País"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Em busca..."
+
+#~ msgid "Serial number"
+#~ msgstr "Número de série"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Formato inesperado de ficheiro de certificado"
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Os números de série da Doremi devem ter 6 dígitos"
 
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index 9f2d71583..0b10528a6 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-12-01 14:56+0200\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Russian\n"
@@ -80,6 +80,8 @@ msgstr "3D верх/низ"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -144,7 +146,7 @@ msgstr "Добавить последовательность изображен
 msgid "Add video, image or sound files to the film."
 msgstr "Добавить видео, изображение или звук в проект."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Добавить..."
 
@@ -282,8 +284,7 @@ msgstr "Отмена"
 msgid "Cannot reference this DCP.  "
 msgstr "Не удается сделать ссылку на этот DCP.  "
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Сертификат загружен"
 
@@ -327,10 +328,6 @@ msgstr "Выбрать шрифт"
 msgid "Choose a font file"
 msgstr "Выбрать файл шрифта"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Кинотеатр"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr "Цвет"
@@ -384,21 +381,6 @@ msgstr "Копировать в название"
 msgid "Could not analyse audio."
 msgstr "Не удалось проанализировать аудио."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Не удалось получить список кинотеатров (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, c-format
-msgid "Could not get country list (%s)"
-msgstr "Не удалось получить список стран (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Не удалось получит список экранов (%s)"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -410,7 +392,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Не удалось загрузить KDM (%s)"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Не удалось прочитать файл сертификата (%s)"
@@ -420,10 +402,6 @@ msgstr "Не удалось прочитать файл сертификата (
 msgid "Could not read key file (%s)"
 msgstr "Не удалось прочитать файл ключа (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Страна"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Создать в папке"
@@ -517,31 +495,28 @@ msgstr "Задержка"
 msgid "Details..."
 msgstr "Детали..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Вниз"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Скачать"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Скачать сертификат"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Загрузка..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Скачивание сертификата"
 
@@ -555,7 +530,7 @@ msgstr "Редактировать экран..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Редактировать..."
 
@@ -611,11 +586,6 @@ msgstr "Постепенное появление"
 msgid "Fade out"
 msgstr "Постепенное затухание"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Установка..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Имя файла"
@@ -692,7 +662,7 @@ msgstr "Усиление для канала %d контента в канале
 msgid "General"
 msgstr "Основные"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 msgid "Get from file..."
 msgstr "Выбрать из файла..."
 
@@ -912,7 +882,7 @@ msgid "NEEDS KDM: "
 msgstr "НЕОБХОДИМ KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Название"
 
@@ -970,7 +940,7 @@ msgstr "Organisation"
 msgid "Organisational unit"
 msgstr "Organisational unit"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr "Иные доверенные устройства"
 
@@ -1087,7 +1057,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 msgid "Recipient certificate"
 msgstr "Сертификат получателя"
 
@@ -1118,7 +1088,7 @@ msgid "Refer to existing DCP"
 msgstr "Ссылаться на существующий DCP"
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Убрать"
 
@@ -1208,7 +1178,7 @@ msgid "Select CPL XML file"
 msgstr "Выберите XML-файл CPL"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Выберите файл сертификата"
 
@@ -1220,7 +1190,7 @@ msgstr "Выберите KDM"
 msgid "Select Key File"
 msgstr "Выберите файл ключа"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 msgid "Select certificate file"
 msgstr "Выберите файл сертификата"
 
@@ -1232,15 +1202,11 @@ msgstr "Отправить по email"
 msgid "Send logs"
 msgstr "Отправить логи"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Серийный номер"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Сервер"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Серийный номер сервера"
 
@@ -1336,7 +1302,7 @@ msgstr "Внешний вид субтитров"
 msgid "Subtitles"
 msgstr "Субтитры"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Финансовая поддержка"
 
@@ -1360,7 +1326,7 @@ msgstr "Территория (напр. UA)"
 msgid "Test version "
 msgstr "Тестовая версия"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Тестирование"
 
@@ -1373,7 +1339,7 @@ msgstr ""
 "Файлы, которые вы выбрали - не те, которые отсутствуют. Либо попробуйте "
 "снова, выбрав правильные файлы, либо удалите отсутствующий контент."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Нет подсказок: похоже всё хорошо!"
 
@@ -1393,7 +1359,7 @@ msgstr "Потоки"
 msgid "Threads to use for encoding on this host"
 msgstr "Кол-во потоков кодирования на хосте"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Отпечаток"
 
@@ -1417,7 +1383,7 @@ msgstr "Тайминг"
 msgid "Top"
 msgstr "Верх"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Перевод"
 
@@ -1447,10 +1413,6 @@ msgstr "Пиковая громкость %.2fдБ"
 msgid "Type"
 msgstr "Тип"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Неожиданная форма имени файл сертификата"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Вверх"
@@ -1507,7 +1469,7 @@ msgstr "Беля точка"
 msgid "White point adjustment"
 msgstr "Регулировка белой точки"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Помощь в разработке"
 
@@ -1543,7 +1505,13 @@ msgstr "Преобразование YUV в RGB"
 msgid "YUV to RGB matrix"
 msgstr "Матрица YUV в RGB"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1552,7 +1520,7 @@ msgstr ""
 "если хотите воспроизвести его на 3D-системе (напр. Real-D, MasterImage и т."
 "п.)"
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1657,6 +1625,33 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Кинотеатр"
+
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Не удалось получить список кинотеатров (%s)"
+
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Не удалось получить список стран (%s)"
+
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Не удалось получит список экранов (%s)"
+
+#~ msgid "Country"
+#~ msgstr "Страна"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Установка..."
+
+#~ msgid "Serial number"
+#~ msgstr "Серийный номер"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Неожиданная форма имени файл сертификата"
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Серийные номера Doremi должны содержать 6 цифр"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index f1d44c4bd..fa88e3b48 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: 2015-12-15 16:11+0000\n"
+"POT-Creation-Date: 2015-12-23 00:24+0000\n"
 "PO-Revision-Date: 2015-11-11 17:12+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -82,6 +82,8 @@ msgstr "3D top/bottom"
 msgid "4K"
 msgstr "4K"
 
+#. //trac.wxwidgets.org/ticket/13389
+#.
 #: src/wx/timing_panel.cc:123
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
@@ -147,7 +149,7 @@ msgstr "Lägg till bildsekvens"
 msgid "Add video, image or sound files to the film."
 msgstr "Lägg till video-, bild- eller audio-filer till filmen."
 
-#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:72
+#: src/wx/config_dialog.cc:672 src/wx/editable_list.h:77
 msgid "Add..."
 msgstr "Lägg till..."
 
@@ -287,8 +289,7 @@ msgstr "Avbryt"
 msgid "Cannot reference this DCP.  "
 msgstr "Kan inte referera denna DCP."
 
-#: src/wx/dolby_certificate_panel.cc:209
-#: src/wx/doremi_certificate_panel.cc:128
+#: src/wx/dolby_doremi_certificate_panel.cc:128
 msgid "Certificate downloaded"
 msgstr "Certifikat nedladdat"
 
@@ -333,10 +334,6 @@ msgstr "Välj ett typsnitt"
 msgid "Choose a font file"
 msgstr "Välj en typsnittsfil"
 
-#: src/wx/dolby_certificate_panel.cc:48
-msgid "Cinema"
-msgstr "Cinema"
-
 #: src/wx/subtitle_appearance_dialog.cc:31
 msgid "Colour"
 msgstr ""
@@ -391,21 +388,6 @@ msgstr "Kopiera som namn"
 msgid "Could not analyse audio."
 msgstr "Kunde inte analysera audio."
 
-#: src/wx/dolby_certificate_panel.cc:134
-#, c-format
-msgid "Could not get cinema list (%s)"
-msgstr "Kunde inte hämta lista över biografer (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:106
-#, c-format
-msgid "Could not get country list (%s)"
-msgstr "Kunde inte hämta lista över länder (%s)"
-
-#: src/wx/dolby_certificate_panel.cc:166
-#, c-format
-msgid "Could not get screen list (%s)"
-msgstr "Kunde inte hämta lista över salonger (%s)"
-
 #: src/wx/film_viewer.cc:189
 #, c-format
 msgid "Could not get video for view (%s)"
@@ -417,7 +399,7 @@ msgid "Could not load KDM (%s)"
 msgstr "Kunde inte ladda KDM (%s)"
 
 #: src/wx/config_dialog.cc:742 src/wx/config_dialog.cc:907
-#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:136
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Kunde inte läsa certifikatfil (%s)"
@@ -427,10 +409,6 @@ msgstr "Kunde inte läsa certifikatfil (%s)"
 msgid "Could not read key file (%s)"
 msgstr "Kunde inte läsa nyckelfil (%s)"
 
-#: src/wx/dolby_certificate_panel.cc:43
-msgid "Country"
-msgstr "Land"
-
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
 msgstr "Skapa i katalog"
@@ -525,31 +503,28 @@ msgstr "Fördröjning"
 msgid "Details..."
 msgstr "Detaljer..."
 
-#: src/wx/download_certificate_dialog.cc:40
-msgid "Dolby"
-msgstr "Dolby"
-
-#: src/wx/download_certificate_dialog.cc:37
-msgid "Doremi"
+#: src/wx/download_certificate_dialog.cc:36
+#, fuzzy
+msgid "Dolby / Doremi"
 msgstr "Doremi"
 
 #: src/wx/content_panel.cc:93
 msgid "Down"
 msgstr "Ner"
 
-#: src/wx/download_certificate_dialog.cc:42
+#: src/wx/download_certificate_dialog.cc:38
 msgid "Download"
 msgstr "Ladda ner"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
 msgstr "Ladda ner certifikat"
 
-#: src/wx/screen_dialog.cc:103
+#: src/wx/screen_dialog.cc:82
 msgid "Download..."
 msgstr "Ladda ner..."
 
-#: src/wx/dolby_certificate_panel.cc:174 src/wx/doremi_certificate_panel.cc:53
+#: src/wx/dolby_doremi_certificate_panel.cc:54
 msgid "Downloading certificate"
 msgstr "Laddar ner certifikat"
 
@@ -563,7 +538,7 @@ msgstr "Redigera Skärm..."
 
 #: src/wx/audio_mapping_view.cc:145 src/wx/config_dialog.cc:407
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:75
+#: src/wx/video_panel.cc:199 src/wx/editable_list.h:80
 msgid "Edit..."
 msgstr "Redigera..."
 
@@ -621,11 +596,6 @@ msgstr "Tona in"
 msgid "Fade out"
 msgstr "Tona ut"
 
-#: src/wx/dolby_certificate_panel.cc:87 src/wx/dolby_certificate_panel.cc:115
-#: src/wx/dolby_certificate_panel.cc:143
-msgid "Fetching..."
-msgstr "Hämtar..."
-
 #: src/wx/content_properties_dialog.cc:40
 msgid "Filename"
 msgstr "Filnamn"
@@ -700,7 +670,7 @@ msgstr "Förstärkning för innehållskanal %d i DCP-kanal %d"
 msgid "General"
 msgstr "Generellt"
 
-#: src/wx/screen_dialog.cc:102
+#: src/wx/screen_dialog.cc:81
 #, fuzzy
 msgid "Get from file..."
 msgstr "Sätt från fil..."
@@ -923,7 +893,7 @@ msgid "NEEDS KDM: "
 msgstr "BEHÖVER KDM:"
 
 #: src/wx/cinema_dialog.cc:47 src/wx/dcp_panel.cc:67
-#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:85
+#: src/wx/preset_colour_conversion_dialog.cc:39 src/wx/screen_dialog.cc:64
 msgid "Name"
 msgstr "Namn"
 
@@ -983,7 +953,7 @@ msgstr "Organisation"
 msgid "Organisational unit"
 msgstr "Organisationsenhet"
 
-#: src/wx/screen_dialog.cc:110
+#: src/wx/screen_dialog.cc:89
 msgid "Other trusted devices"
 msgstr ""
 
@@ -1102,7 +1072,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:76
 #, fuzzy
 msgid "Recipient certificate"
 msgstr "Laddar ner certifikat"
@@ -1134,7 +1104,7 @@ msgid "Refer to existing DCP"
 msgstr "Referera till existerande DCP"
 
 #: src/wx/config_dialog.cc:674 src/wx/content_menu.cc:68
-#: src/wx/content_panel.cc:85 src/wx/editable_list.h:78
+#: src/wx/content_panel.cc:85 src/wx/editable_list.h:83
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -1224,7 +1194,7 @@ msgid "Select CPL XML file"
 msgstr "Välj CPL XML-fil"
 
 #: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:773
-#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:1004 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
 msgstr "Välj certifikatfil"
 
@@ -1236,7 +1206,7 @@ msgstr "Välj KDM"
 msgid "Select Key File"
 msgstr "Välj Nyckelfil"
 
-#: src/wx/screen_dialog.cc:42
+#: src/wx/screen_dialog.cc:47
 #, fuzzy
 msgid "Select certificate file"
 msgstr "Välj certifikatfil"
@@ -1249,15 +1219,11 @@ msgstr "Skicka med mejl"
 msgid "Send logs"
 msgstr "Skicka loggar"
 
-#: src/wx/dolby_certificate_panel.cc:53
-msgid "Serial number"
-msgstr "Serienummer"
-
 #: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
-#: src/wx/doremi_certificate_panel.cc:41
+#: src/wx/dolby_doremi_certificate_panel.cc:42
 msgid "Server serial number"
 msgstr "Server serienummer"
 
@@ -1354,7 +1320,7 @@ msgstr "Undertext Skalning"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:216
+#: src/wx/about_dialog.cc:220
 msgid "Supported by"
 msgstr "Stöd från"
 
@@ -1378,7 +1344,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:272
 msgid "Tested by"
 msgstr "Testad av"
 
@@ -1391,7 +1357,7 @@ msgstr ""
 "Innehållsfilerna du angav är inte samma som de som saknas. Försök igen med "
 "rätt innehållsfiler eller ta bort det saknade innehållet."
 
-#: src/wx/hints_dialog.cc:182
+#: src/wx/hints_dialog.cc:188
 msgid "There are no hints: everything looks good!"
 msgstr "Det finns inga råd: allt verkar bra!"
 
@@ -1411,7 +1377,7 @@ msgstr "Trådar"
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
-#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:114
+#: src/wx/config_dialog.cc:658 src/wx/screen_dialog.cc:93
 msgid "Thumbprint"
 msgstr "Tumavtryck"
 
@@ -1436,7 +1402,7 @@ msgstr "Timing|Tajming"
 msgid "Top"
 msgstr "Topp"
 
-#: src/wx/about_dialog.cc:119
+#: src/wx/about_dialog.cc:120
 msgid "Translated by"
 msgstr "Översatt av"
 
@@ -1466,10 +1432,6 @@ msgstr "Maxvärde är %.2fdB"
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/dolby_certificate_panel.cc:200
-msgid "Unexpected certificate filename form"
-msgstr "Oväntat utformning av certifikatfilnamn"
-
 #: src/wx/content_panel.cc:89
 msgid "Up"
 msgstr "Upp"
@@ -1526,7 +1488,7 @@ msgstr "Vitpunkt"
 msgid "White point adjustment"
 msgstr "Vitpunktsjustering"
 
-#: src/wx/about_dialog.cc:125
+#: src/wx/about_dialog.cc:126
 msgid "With help from"
 msgstr "Med hjälp av"
 
@@ -1562,7 +1524,13 @@ msgstr "YUV till RGB konvertering"
 msgid "YUV to RGB matrix"
 msgstr "YUV till RGB matris"
 
-#: src/wx/hints_dialog.cc:175
+#: src/wx/hints_dialog.cc:154
+msgid ""
+"You are set up for an Interop DCP at a frame rate which is not officially "
+"supported.  You are advised to make a SMPTE DCP instead."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:181
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
@@ -1571,7 +1539,7 @@ msgstr ""
 "3D om du vill kunna spela upp det på ett 3D-system (t.ex. Real-D, "
 "MasterImage etc.)"
 
-#: src/wx/hints_dialog.cc:161
+#: src/wx/hints_dialog.cc:167
 #, c-format
 msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
@@ -1675,6 +1643,33 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Cinema"
+#~ msgstr "Cinema"
+
+#~ msgid "Could not get cinema list (%s)"
+#~ msgstr "Kunde inte hämta lista över biografer (%s)"
+
+#~ msgid "Could not get country list (%s)"
+#~ msgstr "Kunde inte hämta lista över länder (%s)"
+
+#~ msgid "Could not get screen list (%s)"
+#~ msgstr "Kunde inte hämta lista över salonger (%s)"
+
+#~ msgid "Country"
+#~ msgstr "Land"
+
+#~ msgid "Dolby"
+#~ msgstr "Dolby"
+
+#~ msgid "Fetching..."
+#~ msgstr "Hämtar..."
+
+#~ msgid "Serial number"
+#~ msgstr "Serienummer"
+
+#~ msgid "Unexpected certificate filename form"
+#~ msgstr "Oväntat utformning av certifikatfilnamn"
+
 #~ msgid "Doremi serial numbers must have 6 digits"
 #~ msgstr "Doremi serienummer måste ha 6 siffror"
 
diff --git a/src/wx/screen_dialog.cc b/src/wx/screen_dialog.cc
index bec531879..705a7ff58 100644
--- a/src/wx/screen_dialog.cc
+++ b/src/wx/screen_dialog.cc
@@ -19,6 +19,7 @@
 
 #include "screen_dialog.h"
 #include "wx_util.h"
+#include "file_dialog_wrapper.h"
 #include "download_certificate_dialog.h"
 #include "lib/compose.hpp"
 #include "lib/util.h"
@@ -33,44 +34,22 @@ using std::vector;
 using boost::optional;
 using boost::bind;
 
-class FileDialogWrapper
+static string
+column (dcp::Certificate c)
+{
+	return c.thumbprint ();
+}
+
+class CertificateFileDialogWrapper : public FileDialogWrapper<dcp::Certificate>
 {
 public:
-	FileDialogWrapper (wxWindow* parent)
-		: _parent (parent)
+	CertificateFileDialogWrapper (wxWindow* parent)
+		: FileDialogWrapper<dcp::Certificate> (parent, _("Select certificate file"))
 	{
-		_dialog = new wxFileDialog (parent, _("Select certificate file"));
-	}
 
-	void set (dcp::Certificate) {}
-
-	dcp::Certificate get () {
-		return dcp::Certificate (dcp::file_to_string (wx_to_std (_dialog->GetPath ())));
-	}
-
-	int ShowModal ()
-	{
-		return _dialog->ShowModal ();
 	}
-
-	void Destroy ()
-	{
-		_dialog->Destroy ();
-		/* eek! */
-		delete this;
-	}
-
-private:
-	wxWindow* _parent;
-	wxFileDialog* _dialog;
 };
 
-static string
-column (dcp::Certificate c)
-{
-	return c.thumbprint ();
-}
-
 ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optional<dcp::Certificate> recipient, vector<dcp::Certificate> trusted_devices)
 	: wxDialog (parent, wxID_ANY, std_to_wx (title))
 	, _recipient (recipient)
@@ -112,18 +91,17 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona
 
 	vector<string> columns;
 	columns.push_back (wx_to_std (_("Thumbprint")));
-	_trusted_device_list = new EditableList<dcp::Certificate, FileDialogWrapper> (
+	_trusted_device_list = new EditableList<dcp::Certificate, CertificateFileDialogWrapper> (
 		this, columns, bind (&ScreenDialog::trusted_devices, this), bind (&ScreenDialog::set_trusted_devices, this, _1), bind (&column, _1), false
 		);
 
 	_sizer->Add (_trusted_device_list, wxGBPosition (r, 0), wxGBSpan (1, 3), wxEXPAND);
 	++r;
 
+	_name->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreenDialog::setup_sensitivity, this));
 	_get_recipient_from_file->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::get_recipient_from_file, this));
 	_download_recipient->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreenDialog::download_recipient, this));
 
-	setup_sensitivity ();
-
 	overall_sizer->Add (_sizer, 1, wxEXPAND | wxALL, DCPOMATIC_DIALOG_BORDER);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
@@ -133,6 +111,8 @@ ScreenDialog::ScreenDialog (wxWindow* parent, string title, string name, optiona
 
 	overall_sizer->Layout ();
 	overall_sizer->SetSizeHints (this);
+
+	setup_sensitivity ();
 }
 
 string
@@ -185,7 +165,7 @@ ScreenDialog::setup_sensitivity ()
 {
 	wxButton* ok = dynamic_cast<wxButton*> (FindWindowById (wxID_OK, this));
 	if (ok) {
-		ok->Enable (static_cast<bool>(_recipient));
+		ok->Enable (static_cast<bool>(_recipient) && !_name->GetValue().IsEmpty());
 	}
 }
 
diff --git a/src/wx/screen_dialog.h b/src/wx/screen_dialog.h
index 2985516c4..5ae369415 100644
--- a/src/wx/screen_dialog.h
+++ b/src/wx/screen_dialog.h
@@ -24,7 +24,7 @@
 #include <boost/optional.hpp>
 
 class Progress;
-class FileDialogWrapper;
+class CertificateFileDialogWrapper;
 
 class ScreenDialog : public wxDialog
 {
@@ -59,7 +59,7 @@ private:
 	wxStaticText* _recipient_thumbprint;
 	wxButton* _get_recipient_from_file;
 	wxButton* _download_recipient;
-	EditableList<dcp::Certificate, FileDialogWrapper>* _trusted_device_list;
+	EditableList<dcp::Certificate, CertificateFileDialogWrapper>* _trusted_device_list;
 
 	boost::optional<dcp::Certificate> _recipient;
 	std::vector<dcp::Certificate> _trusted_devices;
diff --git a/src/wx/screens_panel.cc b/src/wx/screens_panel.cc
index 3328fe61e..a081e2dfc 100644
--- a/src/wx/screens_panel.cc
+++ b/src/wx/screens_panel.cc
@@ -24,29 +24,31 @@
 #include "wx_util.h"
 #include "cinema_dialog.h"
 #include "screen_dialog.h"
+#include <boost/foreach.hpp>
 
 using std::list;
 using std::pair;
 using std::cout;
 using std::map;
+using std::string;
 using std::make_pair;
 using boost::shared_ptr;
 
 ScreensPanel::ScreensPanel (wxWindow* parent)
 	: wxPanel (parent, wxID_ANY)
+	, _ignore_selection_change (false)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
 
+	_search = new wxSearchCtrl (this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (200, -1));
+	_search->ShowCancelButton (true);
+	sizer->Add (_search, 0, wxBOTTOM, DCPOMATIC_SIZER_GAP);
+
 	wxBoxSizer* targets = new wxBoxSizer (wxHORIZONTAL);
 	_targets = new wxTreeCtrl (this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTR_HIDE_ROOT | wxTR_MULTIPLE | wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT);
-	targets->Add (_targets, 1, wxEXPAND | wxTOP | wxRIGHT, DCPOMATIC_SIZER_GAP);
+	targets->Add (_targets, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
 
-	_root = _targets->AddRoot ("Foo");
-
-	list<shared_ptr<Cinema> > c = Config::instance()->cinemas ();
-	for (list<shared_ptr<Cinema> >::iterator i = c.begin(); i != c.end(); ++i) {
-		add_cinema (*i);
-	}
+	add_cinemas ();
 
 	_targets->ExpandAll ();
 
@@ -70,6 +72,7 @@ ScreensPanel::ScreensPanel (wxWindow* parent)
 
 	sizer->Add (targets, 1, wxEXPAND);
 
+	_search->Bind        (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&ScreensPanel::search_changed, this));
 	_targets->Bind       (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this);
 
 	_add_cinema->Bind    (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&ScreensPanel::add_cinema_clicked, this));
@@ -88,45 +91,11 @@ ScreensPanel::~ScreensPanel ()
 	_targets->Unbind (wxEVT_COMMAND_TREE_SEL_CHANGED, &ScreensPanel::selection_changed, this);
 }
 
-list<pair<wxTreeItemId, shared_ptr<Cinema> > >
-ScreensPanel::selected_cinemas () const
-{
-	wxArrayTreeItemIds s;
-	_targets->GetSelections (s);
-
-	list<pair<wxTreeItemId, shared_ptr<Cinema> > > c;
-	for (size_t i = 0; i < s.GetCount(); ++i) {
-		map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator j = _cinemas.find (s[i]);
-		if (j != _cinemas.end ()) {
-			c.push_back (make_pair (j->first, j->second));
-		}
-	}
-
-	return c;
-}
-
-list<pair<wxTreeItemId, shared_ptr<Screen> > >
-ScreensPanel::selected_screens () const
-{
-	wxArrayTreeItemIds s;
-	_targets->GetSelections (s);
-
-	list<pair<wxTreeItemId, shared_ptr<Screen> > > c;
-	for (size_t i = 0; i < s.GetCount(); ++i) {
-		map<wxTreeItemId, shared_ptr<Screen> >::const_iterator j = _screens.find (s[i]);
-		if (j != _screens.end ()) {
-			c.push_back (make_pair (j->first, j->second));
-		}
-	}
-
-	return c;
-}
-
 void
 ScreensPanel::setup_sensitivity ()
 {
-	bool const sc = selected_cinemas().size() == 1;
-	bool const ss = selected_screens().size() == 1;
+	bool const sc = _selected_cinemas.size() == 1;
+	bool const ss = _selected_screens.size() == 1;
 
 	_edit_cinema->Enable (sc);
 	_remove_cinema->Enable (sc);
@@ -136,10 +105,20 @@ ScreensPanel::setup_sensitivity ()
 	_remove_screen->Enable (ss);
 }
 
-
 void
 ScreensPanel::add_cinema (shared_ptr<Cinema> c)
 {
+	string search = wx_to_std (_search->GetValue ());
+	transform (search.begin(), search.end(), search.begin(), ::tolower);
+
+	if (!search.empty ()) {
+		string name = c->name;
+		transform (name.begin(), name.end(), name.begin(), ::tolower);
+		if (name.find (search) == string::npos) {
+			return;
+		}
+	}
+
 	_cinemas[_targets->AppendItem (_root, std_to_wx (c->name))] = c;
 
 	list<shared_ptr<Screen> > sc = c->screens ();
@@ -153,7 +132,7 @@ ScreensPanel::add_cinema (shared_ptr<Cinema> c)
 void
 ScreensPanel::add_screen (shared_ptr<Cinema> c, shared_ptr<Screen> s)
 {
-	map<wxTreeItemId, shared_ptr<Cinema> >::const_iterator i = _cinemas.begin();
+	CinemaMap::const_iterator i = _cinemas.begin();
 	while (i != _cinemas.end() && i->second != c) {
 		++i;
 	}
@@ -182,11 +161,11 @@ ScreensPanel::add_cinema_clicked ()
 void
 ScreensPanel::edit_cinema_clicked ()
 {
-	if (selected_cinemas().size() != 1) {
+	if (_selected_cinemas.size() != 1) {
 		return;
 	}
 
-	pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
+	pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
 
 	CinemaDialog* d = new CinemaDialog (this, "Edit cinema", c.second->name, c.second->emails);
 	if (d->ShowModal () == wxID_OK) {
@@ -202,11 +181,11 @@ ScreensPanel::edit_cinema_clicked ()
 void
 ScreensPanel::remove_cinema_clicked ()
 {
-	if (selected_cinemas().size() != 1) {
+	if (_selected_cinemas.size() != 1) {
 		return;
 	}
 
-	pair<wxTreeItemId, shared_ptr<Cinema> > c = selected_cinemas().front();
+	pair<wxTreeItemId, shared_ptr<Cinema> > c = *_selected_cinemas.begin();
 
 	Config::instance()->remove_cinema (c.second);
 	_targets->Delete (c.first);
@@ -215,11 +194,11 @@ ScreensPanel::remove_cinema_clicked ()
 void
 ScreensPanel::add_screen_clicked ()
 {
-	if (selected_cinemas().size() != 1) {
+	if (_selected_cinemas.size() != 1) {
 		return;
 	}
 
-	shared_ptr<Cinema> c = selected_cinemas().front().second;
+	shared_ptr<Cinema> c = _selected_cinemas.begin()->second;
 
 	ScreenDialog* d = new ScreenDialog (this, "Add Screen");
 	if (d->ShowModal () != wxID_OK) {
@@ -238,11 +217,11 @@ ScreensPanel::add_screen_clicked ()
 void
 ScreensPanel::edit_screen_clicked ()
 {
-	if (selected_screens().size() != 1) {
+	if (_selected_screens.size() != 1) {
 		return;
 	}
 
-	pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+	pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
 
 	ScreenDialog* d = new ScreenDialog (this, "Edit screen", s.second->name, s.second->recipient, s.second->trusted_devices);
 	if (d->ShowModal () == wxID_OK) {
@@ -259,18 +238,20 @@ ScreensPanel::edit_screen_clicked ()
 void
 ScreensPanel::remove_screen_clicked ()
 {
-	if (selected_screens().size() != 1) {
+	if (_selected_screens.size() != 1) {
 		return;
 	}
 
-	pair<wxTreeItemId, shared_ptr<Screen> > s = selected_screens().front();
+	pair<wxTreeItemId, shared_ptr<Screen> > s = *_selected_screens.begin();
 
-	map<wxTreeItemId, shared_ptr<Cinema> >::iterator i = _cinemas.begin ();
+	CinemaMap::iterator i = _cinemas.begin ();
 	while (i != _cinemas.end ()) {
 		list<shared_ptr<Screen> > sc = i->second->screens ();
 		if (find (sc.begin(), sc.end(), s.second) != sc.end ()) {
 			break;
 		}
+
+		++i;
 	}
 
 	if (i == _cinemas.end()) {
@@ -288,16 +269,14 @@ ScreensPanel::screens () const
 {
 	list<shared_ptr<Screen> > s;
 
-	list<pair<wxTreeItemId, shared_ptr<Cinema> > > cinemas = selected_cinemas ();
-	for (list<pair<wxTreeItemId, shared_ptr<Cinema> > >::iterator i = cinemas.begin(); i != cinemas.end(); ++i) {
+	for (CinemaMap::const_iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
 		list<shared_ptr<Screen> > sc = i->second->screens ();
 		for (list<shared_ptr<Screen> >::const_iterator j = sc.begin(); j != sc.end(); ++j) {
 			s.push_back (*j);
 		}
 	}
 
-	list<pair<wxTreeItemId, shared_ptr<Screen> > > screens = selected_screens ();
-	for (list<pair<wxTreeItemId, shared_ptr<Screen> > >::iterator i = screens.begin(); i != screens.end(); ++i) {
+	for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
 		s.push_back (i->second);
 	}
 
@@ -310,6 +289,74 @@ ScreensPanel::screens () const
 void
 ScreensPanel::selection_changed (wxTreeEvent &)
 {
+	if (_ignore_selection_change) {
+		return;
+	}
+
+	wxArrayTreeItemIds s;
+	_targets->GetSelections (s);
+
+	_selected_cinemas.clear ();
+	_selected_screens.clear ();
+
+	for (size_t i = 0; i < s.GetCount(); ++i) {
+		CinemaMap::const_iterator j = _cinemas.find (s[i]);
+		if (j != _cinemas.end ()) {
+			_selected_cinemas[j->first] = j->second;
+		}
+		ScreenMap::const_iterator k = _screens.find (s[i]);
+		if (k != _screens.end ()) {
+			_selected_screens[k->first] = k->second;
+		}
+	}
+
 	setup_sensitivity ();
 	ScreensChanged ();
 }
+
+void
+ScreensPanel::add_cinemas ()
+{
+	_root = _targets->AddRoot ("Foo");
+
+	BOOST_FOREACH (shared_ptr<Cinema> i, Config::instance()->cinemas ()) {
+		add_cinema (i);
+	}
+}
+
+void
+ScreensPanel::search_changed ()
+{
+	_targets->DeleteAllItems ();
+	_cinemas.clear ();
+	_screens.clear ();
+
+	add_cinemas ();
+
+	_ignore_selection_change = true;
+
+	for (CinemaMap::const_iterator i = _selected_cinemas.begin(); i != _selected_cinemas.end(); ++i) {
+		/* The wxTreeItemIds will now be different, so we must search by cinema */
+		CinemaMap::const_iterator j = _cinemas.begin ();
+		while (j != _cinemas.end() && j->second != i->second) {
+			++j;
+		}
+
+		if (j != _cinemas.end ()) {
+			_targets->SelectItem (j->first);
+		}
+	}
+
+	for (ScreenMap::const_iterator i = _selected_screens.begin(); i != _selected_screens.end(); ++i) {
+		ScreenMap::const_iterator j = _screens.begin ();
+		while (j != _screens.end() && j->second != i->second) {
+			++j;
+		}
+
+		if (j != _screens.end ()) {
+			_targets->SelectItem (j->first);
+		}
+	}
+
+	_ignore_selection_change = false;
+}
diff --git a/src/wx/screens_panel.h b/src/wx/screens_panel.h
index 6cfff0a60..0095937b7 100644
--- a/src/wx/screens_panel.h
+++ b/src/wx/screens_panel.h
@@ -18,6 +18,7 @@
 */
 
 #include <wx/wx.h>
+#include <wx/srchctrl.h>
 #include <wx/treectrl.h>
 #include <boost/shared_ptr.hpp>
 #include <list>
@@ -38,6 +39,7 @@ public:
 	boost::signals2::signal<void ()> ScreensChanged;
 
 private:
+	void add_cinemas ();
 	void add_cinema (boost::shared_ptr<Cinema>);
 	void add_screen (boost::shared_ptr<Cinema>, boost::shared_ptr<Screen>);
 	void add_cinema_clicked ();
@@ -46,10 +48,10 @@ private:
 	void add_screen_clicked ();
 	void edit_screen_clicked ();
 	void remove_screen_clicked ();
-	std::list<std::pair<wxTreeItemId, boost::shared_ptr<Cinema> > > selected_cinemas () const;
-	std::list<std::pair<wxTreeItemId, boost::shared_ptr<Screen> > > selected_screens () const;
 	void selection_changed (wxTreeEvent &);
+	void search_changed ();
 
+	wxSearchCtrl* _search;
 	wxTreeCtrl* _targets;
 	wxButton* _add_cinema;
 	wxButton* _edit_cinema;
@@ -58,6 +60,14 @@ private:
 	wxButton* _edit_screen;
 	wxButton* _remove_screen;
 	wxTreeItemId _root;
-	std::map<wxTreeItemId, boost::shared_ptr<Cinema> > _cinemas;
-	std::map<wxTreeItemId, boost::shared_ptr<Screen> > _screens;
+
+	typedef std::map<wxTreeItemId, boost::shared_ptr<Cinema> > CinemaMap;
+	typedef std::map<wxTreeItemId, boost::shared_ptr<Screen> > ScreenMap;
+
+	CinemaMap _cinemas;
+	ScreenMap _screens;
+	CinemaMap _selected_cinemas;
+	ScreenMap _selected_screens;
+
+	bool _ignore_selection_change;
 };
diff --git a/src/wx/wscript b/src/wx/wscript
index 8dc3e972e..b78ccc928 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -100,7 +100,7 @@ sources = """
 def configure(conf):
     try:
         wx_config = 'wx-config-3.0-gtk2'
-        conf.check_cfg(msg='Checking for wxWidgets',
+        conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
                        package='',
                        path=wx_config,
                        args='--cppflags --cxxflags --libs std,richtext',
@@ -108,7 +108,7 @@ def configure(conf):
                        mandatory=True)
     except:
         wx_config = 'wx-config'
-        conf.check_cfg(msg='Checking for wxWidgets',
+        conf.check_cfg(msg='Checking for wxWidgets using wx-config',
                        package='',
                        path=wx_config,
                        args='--cppflags --cxxflags --libs std,richtext',