Merge master.

22 files changed, 691 insertions, 482 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index a0211386b..bb1fcd211 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -67,9 +67,6 @@ Config::Config ()
 	, _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST"))
 	, _default_j2k_bandwidth (100000000)
 	, _default_audio_delay (0)
-	, _kdm_email (
-		_("Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nThe KDMs are valid from $START_TIME until $END_TIME.\n\nBest regards,\nDCP-o-matic")
-		)
 	, _check_for_updates (false)
 	, _check_for_test_updates (false)
 	, _maximum_j2k_bandwidth (250000000)
@@ -85,6 +82,8 @@ Config::Config ()
 	_colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6));
 	_colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6));
 	_colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6));
+
+	reset_kdm_email ();
 }
 
 void
@@ -188,6 +187,7 @@ Config::read ()
 	_mail_user = f.optional_string_child("MailUser").get_value_or ("");
 	_mail_password = f.optional_string_child("MailPassword").get_value_or ("");
 	_kdm_from = f.string_child ("KDMFrom");
+	_kdm_cc = f.optional_string_child ("KDMCC").get_value_or ("");
 	_kdm_email = f.string_child ("KDMEmail");
 
 	_check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false);
@@ -367,6 +367,7 @@ Config::write () const
 	root->add_child("MailUser")->add_child_text (_mail_user);
 	root->add_child("MailPassword")->add_child_text (_mail_password);
 	root->add_child("KDMFrom")->add_child_text (_kdm_from);
+	root->add_child("KDMCC")->add_child_text (_kdm_cc);
 	root->add_child("KDMEmail")->add_child_text (_kdm_email);
 
 	root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0");
@@ -408,3 +409,16 @@ Config::changed ()
 	write ();
 	Changed ();
 }
+
+void
+Config::reset_kdm_email ()
+{
+	_kdm_email = _(
+		"Dear Projectionist\n\n"
+		"Please find attached KDMs for $CPL_NAME.\n\n"
+		"Cinema: $CINEMA_NAME\n"
+		"Screen(s): $SCREENS\n\n"
+		"The KDMs are valid from $START_TIME until $END_TIME.\n\n"
+		"Best regards,\nDCP-o-matic"
+		);
+}
diff --git a/src/lib/config.h b/src/lib/config.h
index d82f52046..d9f104c7d 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -172,6 +172,10 @@ public:
 		return _kdm_from;
 	}
 
+	std::string kdm_cc () const {
+		return _kdm_cc;
+	}
+	
 	std::string kdm_email () const {
 		return _kdm_email;
 	}
@@ -323,11 +327,18 @@ public:
 		changed ();
 	}
 
+	void set_kdm_cc (std::string f) {
+		_kdm_cc = f;
+		changed ();
+	}
+	
 	void set_kdm_email (std::string e) {
 		_kdm_email = e;
 		changed ();
 	}
 
+	void reset_kdm_email ();
+
 	void set_check_for_updates (bool c) {
 		_check_for_updates = c;
 		changed ();
@@ -403,6 +414,7 @@ private:
 	std::string _mail_user;
 	std::string _mail_password;
 	std::string _kdm_from;
+	std::string _kdm_cc;
 	std::string _kdm_email;
 	/** true to check for updates on startup */
 	bool _check_for_updates;
diff --git a/src/lib/kdm.cc b/src/lib/kdm.cc
index c08750961..5754fd469 100644
--- a/src/lib/kdm.cc
+++ b/src/lib/kdm.cc
@@ -32,6 +32,7 @@
 using std::list;
 using std::string;
 using std::stringstream;
+using std::cout;
 using boost::shared_ptr;
 
 struct ScreenKDM
@@ -228,7 +229,9 @@ email_kdms (
 		quickmail_initialize ();
 		quickmail mail = quickmail_create (Config::instance()->kdm_from().c_str(), "KDM delivery");
 		quickmail_add_to (mail, i->cinema->email.c_str ());
-		
+		if (!Config::instance()->kdm_cc().empty ()) {
+			quickmail_add_cc (mail, Config::instance()->kdm_cc().c_str ());
+		}
 		string body = Config::instance()->kdm_email().c_str();
 		boost::algorithm::replace_all (body, "$CPL_NAME", film->dcp_name ());
 		stringstream start;
@@ -237,6 +240,12 @@ email_kdms (
 		stringstream end;
 		end << to.date() << " " << to.time_of_day();
 		boost::algorithm::replace_all (body, "$END_TIME", end.str ());
+		boost::algorithm::replace_all (body, "$CINEMA_NAME", i->cinema->name);
+		stringstream screens;
+		for (list<ScreenKDM>::const_iterator j = i->screen_kdms.begin(); j != i->screen_kdms.end(); ++j) {
+			screens << j->screen->name << ", ";
+		}
+		boost::algorithm::replace_all (body, "$SCREENS", screens.str().substr (0, screens.str().length() - 2));
 
 		quickmail_set_body (mail, body.c_str());
 		quickmail_add_attachment_file (mail, zip_file.string().c_str(), "application/zip");
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index f853d2ce2..9f6380c36 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-21 03:55+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -241,12 +241,16 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -425,7 +429,7 @@ msgstr "Hinweis"
 msgid "Rating"
 msgstr "Freigabehinweis"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -524,7 +528,7 @@ msgstr "Überleitung"
 msgid "Unexpected ZIP file contents"
 msgstr "Ungültiger ZIP Inhalt"
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr "Ungültiges Bildformat vom Server erhalten"
 
@@ -722,11 +726,11 @@ msgstr "Nur Bitmap Untertitel werden unterstützt"
 msgid "remaining"
 msgstr "verbleibend"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB nicht linearisiert"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 6f93bba55..d243f0b9a 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -237,12 +237,16 @@ msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -419,7 +423,7 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -518,7 +522,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -716,11 +720,11 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index e9e67bf4f..117565dce 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-20 15:53+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -240,12 +240,15 @@ msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -412,7 +415,7 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -510,7 +513,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -710,11 +713,11 @@ msgstr "sous-titres non-bitmap non supportés actuellement"
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 365360260..fb73fa1d0 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -244,12 +244,16 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -428,7 +432,7 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
@@ -532,7 +536,7 @@ msgstr "Di transizione"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -733,11 +737,11 @@ msgstr "sottotitoli non-bitmap non ancora supportati"
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non linearizzato"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index eae118175..98f5c918c 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-03-30 19:39+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -238,12 +238,16 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -423,7 +427,7 @@ msgstr "Publieke Service aankondiging"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -521,7 +525,7 @@ msgstr "Bumper"
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -719,11 +723,11 @@ msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 msgid "remaining"
 msgstr "resterend"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB non-linearised"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index ef2c36d85..f3c0ba9d2 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -242,12 +242,16 @@ msgid "De-interlacing"
 msgstr "Avflätning"
 
 # svåröversatt
-#: src/lib/config.cc:71
+#: src/lib/config.cc:417
+#, fuzzy
 msgid ""
 "Dear Projectionist\n"
 "\n"
 "Please find attached KDMs for $CPL_NAME.\n"
 "\n"
+"Cinema: $CINEMA_NAME\n"
+"Screen(s): $SCREENS\n"
+"\n"
 "The KDMs are valid from $START_TIME until $END_TIME.\n"
 "\n"
 "Best regards,\n"
@@ -425,7 +429,7 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/config.cc:87 src/lib/config.cc:174
+#: src/lib/config.cc:84 src/lib/config.cc:173
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
@@ -526,7 +530,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:172
+#: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -729,11 +733,11 @@ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/config.cc:85 src/lib/video_content.cc:175
+#: src/lib/config.cc:82 src/lib/video_content.cc:175
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:86
+#: src/lib/config.cc:83
 msgid "sRGB non-linearised"
 msgstr "sRGB icke-linjär"
 
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 79eab5fb7..8d4a51bac 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-21 02:38+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 92d9a7853..1fb15f5a0 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-04-20 10:21-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 832f409b9..cb81a4995 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-20 15:57+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index dc30ef04c..0d49d1396 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 5730dadad..7a6bd0602 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-03-30 19:38+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index bf69aafc9..fb114885e 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/wx/config_dialog.cc b/src/wx/config_dialog.cc
index 94ab0597b..b25b470c1 100644
--- a/src/wx/config_dialog.cc
+++ b/src/wx/config_dialog.cc
@@ -650,7 +650,7 @@ public:
 
 		wxFlexGridSizer* table = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 		table->AddGrowableCol (1, 1);
-		s->Add (table, 1, wxTOP | wxLEFT | wxRIGHT | wxEXPAND, _border);
+		s->Add (table, 1, wxEXPAND | wxALL, _border);
 
 		add_label_to_sizer (table, panel, _("Outgoing mail server"), true);
 		_mail_server = new wxTextCtrl (panel, wxID_ANY);
@@ -674,9 +674,16 @@ public:
 		add_label_to_sizer (table, panel, _("From address"), true);
 		_kdm_from = new wxTextCtrl (panel, wxID_ANY);
 		table->Add (_kdm_from, 1, wxEXPAND | wxALL);
+
+		add_label_to_sizer (table, panel, _("CC address"), true);
+		_kdm_cc = new wxTextCtrl (panel, wxID_ANY);
+		table->Add (_kdm_cc, 1, wxEXPAND | wxALL);
 		
 		_kdm_email = new wxTextCtrl (panel, wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize (480, 128), wxTE_MULTILINE);
-		s->Add (_kdm_email, 1.5, wxEXPAND | wxBOTTOM | wxLEFT | wxRIGHT, _border);
+		s->Add (_kdm_email, 1.5, wxEXPAND | wxALL, _border);
+
+		_reset_kdm_email = new wxButton (panel, wxID_ANY, _("Reset to default text"));
+		s->Add (_reset_kdm_email, 0, wxEXPAND | wxALL, _border);
 
 		Config* config = Config::instance ();
 		_mail_server->SetValue (std_to_wx (config->mail_server ()));
@@ -687,8 +694,11 @@ public:
 		_mail_password->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::mail_password_changed, this));
 		_kdm_from->SetValue (std_to_wx (config->kdm_from ()));
 		_kdm_from->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_from_changed, this));
+		_kdm_cc->SetValue (std_to_wx (config->kdm_cc ()));
+		_kdm_cc->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_cc_changed, this));
 		_kdm_email->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&KDMEmailPage::kdm_email_changed, this));
 		_kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+		_reset_kdm_email->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&KDMEmailPage::reset_kdm_email, this));
 
 		return panel;
 	}
@@ -714,16 +724,29 @@ private:
 		Config::instance()->set_kdm_from (wx_to_std (_kdm_from->GetValue ()));
 	}
 
+	void kdm_cc_changed ()
+	{
+		Config::instance()->set_kdm_cc (wx_to_std (_kdm_cc->GetValue ()));
+	}
+	
 	void kdm_email_changed ()
 	{
 		Config::instance()->set_kdm_email (wx_to_std (_kdm_email->GetValue ()));
 	}
 
+	void reset_kdm_email ()
+	{
+		Config::instance()->reset_kdm_email ();
+		_kdm_email->SetValue (wx_to_std (Config::instance()->kdm_email ()));
+	}
+
 	wxTextCtrl* _mail_server;
 	wxTextCtrl* _mail_user;
 	wxTextCtrl* _mail_password;
 	wxTextCtrl* _kdm_from;
+	wxTextCtrl* _kdm_cc;
 	wxTextCtrl* _kdm_email;
+	wxButton* _reset_kdm_email;
 };
 
 class AdvancedPage : public wxStockPreferencesPage, public Page
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 52e3a2cc4..017383c03 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-21 04:06+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:666
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(Passwort wird im Klartext gespeichert!)"
 
@@ -117,7 +117,7 @@ msgstr "Ordner hinzufügen..."
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: src/wx/config_dialog.cc:743
+#: src/wx/config_dialog.cc:780
 msgid "Allow any DCP frame rate"
 msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
 
@@ -129,22 +129,10 @@ msgstr "Grafik von"
 msgid "Audio"
 msgstr "Ton"
 
-#: src/wx/audio_panel.cc:67
-msgid "Audio Delay"
-msgstr "Verzögerung"
-
-#: src/wx/audio_panel.cc:52
-msgid "Audio Gain"
-msgstr "Verstärkung"
-
 #: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Ton Sprache (z.B. DE)"
 
-#: src/wx/audio_panel.cc:81
-msgid "Audio Stream"
-msgstr "Tonspur"
-
 #: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Ton Kanäle"
@@ -194,6 +182,11 @@ msgstr "Aber ich nutze gegenwärtig Faderstellung"
 msgid "C"
 msgstr "C"
 
+#: src/wx/config_dialog.cc:677
+#, fuzzy
+msgid "CC address"
+msgstr "IP Adresse"
+
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
 msgid "CPL"
 msgstr "CPL"
@@ -235,11 +228,11 @@ msgstr "Kanal Verstärkung"
 msgid "Channels"
 msgstr "Kanäle"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:114
 msgid "Check for testing updates as well as stable ones"
 msgstr "Zeige bei Updateprüfung auch Test-Versionen an"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:110
 msgid "Check for updates on startup"
 msgstr "Beim Start auf Updates überprüfen."
 
@@ -259,7 +252,7 @@ msgstr "Ordner wählen"
 msgid "Cinema"
 msgstr "Kino"
 
-#: src/wx/config_dialog.cc:547
+#: src/wx/config_dialog.cc:496
 msgid "Colour Conversions"
 msgstr "Farbumwandlungen"
 
@@ -268,7 +261,7 @@ msgstr "Farbumwandlungen"
 msgid "Colour conversion"
 msgstr "Farbumwandlung"
 
-#: src/wx/config_dialog.cc:756
+#: src/wx/config_dialog.cc:793
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Timing"
@@ -314,8 +307,8 @@ msgid "Could not make DCP: %s"
 msgstr "DCP konnte nicht erstellt werden: %s"
 
 #: src/wx/screen_dialog.cc:95
-#, fuzzy
-msgid "Could not read certificate file (%1)"
+#, fuzzy, c-format
+msgid "Could not read certificate file (%s)"
 msgstr "Bild konnte nicht zur Vorschau dekodiert werden (%s)"
 
 #: src/wx/dolby_certificate_dialog.cc:39
@@ -356,46 +349,51 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic Ton - %s"
 
-#: src/wx/config_dialog.cc:317
+#: src/wx/config_dialog.cc:266
 msgid "Default ISDCF name details"
 msgstr "Standard ISDCF Name Details"
 
-#: src/wx/config_dialog.cc:330
+#: src/wx/config_dialog.cc:279
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standard JPEG2000 Datenrate"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
 msgstr "Standard Ton Verzögerung"
 
-#: src/wx/config_dialog.cc:321
+#: src/wx/config_dialog.cc:270
 msgid "Default container"
 msgstr "Standard Container"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:274
 msgid "Default content type"
 msgstr "Standard Inhalt Typ"
 
-#: src/wx/config_dialog.cc:351
+#: src/wx/config_dialog.cc:300
 msgid "Default creator"
 msgstr "Standard 'creator' (DCI)"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:258
 msgid "Default directory for new films"
 msgstr "Standard Ordner für neue Projekte"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:250
 msgid "Default duration of still images"
 msgstr "Standard Länge für Standbilder"
 
-#: src/wx/config_dialog.cc:347
+#: src/wx/config_dialog.cc:296
 msgid "Default issuer"
 msgstr "Standard 'issuer' (DCI)"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:229
 msgid "Defaults"
 msgstr "Vorgaben"
 
+#: src/wx/audio_panel.cc:67
+#, fuzzy
+msgid "Delay"
+msgstr "Verzögerung"
+
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Details..."
@@ -443,7 +441,7 @@ msgstr "Kino bearbeiten..."
 msgid "Edit Screen..."
 msgstr "Saal bearbeiten..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
@@ -461,7 +459,7 @@ msgstr "Enkodier Server"
 msgid "Encrypted"
 msgstr "Verschlüsselt (-> KDM Erstellung)"
 
-#: src/wx/config_dialog.cc:753
+#: src/wx/config_dialog.cc:790
 msgid "Errors"
 msgstr "Fehler"
 
@@ -512,9 +510,10 @@ msgstr ""
 msgid "From"
 msgstr "Von"
 
-#: src/wx/config_dialog.cc:125
-msgid "From address for KDM emails"
-msgstr "Absenderadresse (KDM Zustellung)"
+#: src/wx/config_dialog.cc:673
+#, fuzzy
+msgid "From address"
+msgstr "IP Adresse"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
@@ -524,6 +523,10 @@ msgstr "Voll"
 msgid "Full length"
 msgstr "Gesamtlänge"
 
+#: src/wx/audio_panel.cc:52
+msgid "Gain"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Fader Rechner"
@@ -537,7 +540,7 @@ msgstr "Verstärkung des Kanals %d im DCP Kanal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:748
+#: src/wx/config_dialog.cc:785
 msgid "General"
 msgstr "Allgemein"
 
@@ -565,11 +568,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Ich möchte bei dieser Faderstellung spielen"
 
-#: src/wx/config_dialog.cc:613
+#: src/wx/config_dialog.cc:562
 msgid "IP address"
 msgstr "IP Adresse"
 
-#: src/wx/config_dialog.cc:505
+#: src/wx/config_dialog.cc:454
 msgid "IP address / host name"
 msgstr "IP Adresse / Host Name"
 
@@ -593,7 +596,7 @@ msgstr "JPEG2000 Datenrate"
 msgid "Join"
 msgstr "Verbinden"
 
-#: src/wx/config_dialog.cc:680
+#: src/wx/config_dialog.cc:629
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -630,7 +633,7 @@ msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
 msgid "Load from file..."
 msgstr "Lade aus Datei..."
 
-#: src/wx/config_dialog.cc:747
+#: src/wx/config_dialog.cc:784
 msgid "Log"
 msgstr "Log"
 
@@ -642,11 +645,11 @@ msgstr "SL"
 msgid "MISSING: "
 msgstr "FEHLT:"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:662
 msgid "Mail password"
 msgstr "Mail Passwort (KDM Zustellung)"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:658
 msgid "Mail user name"
 msgstr "Mail Benutzername/Login (KDM Zustellung)"
 
@@ -662,11 +665,12 @@ msgstr "Zielhelligkeit (z.B. '4fL' für 3D)"
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:739
+#: src/wx/config_dialog.cc:772
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximale JPEG2000 Datenrate(!)"
 
-#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
+#: src/wx/config_dialog.cc:283 src/wx/config_dialog.cc:776
+#: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
@@ -678,7 +682,7 @@ msgstr "Mehrere Inhalte ausgewählt"
 msgid "My Documents"
 msgstr "Meine Dokumente"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:512
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 #: src/wx/screen_dialog.cc:38
 msgid "Name"
@@ -709,7 +713,7 @@ msgstr "Aus"
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:654
 msgid "Outgoing mail server"
 msgstr "Ausgehender/SMTP Mail Server (KDM Zustellung)"
 
@@ -730,7 +734,7 @@ msgstr "DCP Paket Typ (z.B. OV)"
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Mit Schwarz gefüllt auf %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:574
 msgid "Password"
 msgstr "Passwort"
 
@@ -807,6 +811,10 @@ msgstr "Inhalt wiederholen"
 msgid "Repeat..."
 msgstr "Wiederhole..."
 
+#: src/wx/config_dialog.cc:684
+msgid "Reset to default text"
+msgstr ""
+
 #: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Auflösung"
@@ -831,6 +839,10 @@ msgstr "SR"
 msgid "SMPTE"
 msgstr "SMPTE"
 
+#: src/wx/subtitle_panel.cc:62
+msgid "Scale"
+msgstr "Skalierer"
+
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Skaliere zu"
@@ -877,7 +889,7 @@ msgstr "Server Seriennummer"
 msgid "Server serial number"
 msgstr "Server Seriennummer"
 
-#: src/wx/config_dialog.cc:485
+#: src/wx/config_dialog.cc:434
 msgid "Servers"
 msgstr "Server"
 
@@ -913,6 +925,10 @@ msgstr "Stabile Version"
 msgid "Standard"
 msgstr "Standard"
 
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+msgid "Stream"
+msgstr "Tonspur"
+
 #: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (z.B. TCF)"
@@ -921,22 +937,6 @@ msgstr "Studio (z.B. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Untertitel Sprache (z.B. EN)"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Subtitle Scale"
-msgstr "Untertitel Größe"
-
-#: src/wx/subtitle_panel.cc:70
-msgid "Subtitle Stream"
-msgstr "Untertitel Spur"
-
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle X Offset"
-msgstr "Untertitel X Offset"
-
-#: src/wx/subtitle_panel.cc:53
-msgid "Subtitle Y Offset"
-msgstr "Untertitel Y Offset"
-
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Untertitel"
@@ -945,11 +945,11 @@ msgstr "Untertitel"
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:542
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/config_dialog.cc:566
 msgid "Target path"
 msgstr "Zielpfad"
 
@@ -1060,7 +1060,7 @@ msgstr "Update"
 msgid "Use ISDCF name"
 msgstr "ISDCF Name benutzen"
 
-#: src/wx/config_dialog.cc:501
+#: src/wx/config_dialog.cc:450
 msgid "Use all servers"
 msgstr "Alle verfügbaren Server im Subnetz benutzen"
 
@@ -1072,7 +1072,7 @@ msgstr "Beste benutzen"
 msgid "Use preset"
 msgstr "Preset benutzen"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/config_dialog.cc:570
 msgid "User name"
 msgstr "Benutzer Name"
 
@@ -1088,7 +1088,7 @@ msgstr "Bild"
 msgid "Video frame rate"
 msgstr "Bildwiederholrate"
 
-#: src/wx/config_dialog.cc:750
+#: src/wx/config_dialog.cc:787
 msgid "Warnings"
 msgstr "Warnungen"
 
@@ -1104,6 +1104,15 @@ msgstr "Speichern nach"
 msgid "Written by"
 msgstr "Geschrieben von"
 
+#: src/wx/subtitle_panel.cc:44
+msgid "X Offset"
+msgstr "X Offset"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Y Offset"
+msgstr "Y Offset"
+
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
@@ -1156,11 +1165,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:292
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:254
 msgid "s"
 msgstr "s"
 
@@ -1176,6 +1185,18 @@ msgstr "Zeiten"
 msgid "video"
 msgstr "Bild"
 
+#~ msgid "Audio Gain"
+#~ msgstr "Verstärkung"
+
+#~ msgid "From address for KDM emails"
+#~ msgstr "Absenderadresse (KDM Zustellung)"
+
+#~ msgid "Subtitle Scale"
+#~ msgstr "Untertitel Größe"
+
+#~ msgid "Subtitle Stream"
+#~ msgstr "Untertitel Spur"
+
 #~ msgid "-3dB"
 #~ msgstr "-3dB"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index df5a134da..d7e48c045 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-04-20 12:06-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:666
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(claves guardadas como texto plano en el disco)"
 
@@ -118,7 +118,7 @@ msgstr "Añadir carpeta..."
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/wx/config_dialog.cc:743
+#: src/wx/config_dialog.cc:780
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "Velocidad de imagen"
@@ -131,22 +131,10 @@ msgstr "Grafismo de"
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:67
-msgid "Audio Delay"
-msgstr "Retardo del audio"
-
-#: src/wx/audio_panel.cc:52
-msgid "Audio Gain"
-msgstr "Ganancia del audio"
-
 #: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
-#: src/wx/audio_panel.cc:81
-msgid "Audio Stream"
-msgstr "Flujo de audio"
-
 #: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Canales de audio"
@@ -193,6 +181,11 @@ msgstr "pero tengo que usar el fader a"
 msgid "C"
 msgstr "C"
 
+#: src/wx/config_dialog.cc:677
+#, fuzzy
+msgid "CC address"
+msgstr "Dirección IP"
+
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
 #, fuzzy
 msgid "CPL"
@@ -235,11 +228,11 @@ msgstr "Ganancia del canal"
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:114
 msgid "Check for testing updates as well as stable ones"
 msgstr "Buscar actualizaciones de prueba y estables"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:110
 msgid "Check for updates on startup"
 msgstr "Buscar actualizaciones al iniciar"
 
@@ -259,7 +252,7 @@ msgstr "Elige una carpeta"
 msgid "Cinema"
 msgstr "Cine"
 
-#: src/wx/config_dialog.cc:547
+#: src/wx/config_dialog.cc:496
 msgid "Colour Conversions"
 msgstr "Conversiones de color"
 
@@ -268,7 +261,7 @@ msgstr "Conversiones de color"
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
-#: src/wx/config_dialog.cc:756
+#: src/wx/config_dialog.cc:793
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Tiempo"
@@ -314,8 +307,8 @@ msgid "Could not make DCP: %s"
 msgstr "No se pudo crear el DCP: %s"
 
 #: src/wx/screen_dialog.cc:95
-#, fuzzy
-msgid "Could not read certificate file (%1)"
+#, fuzzy, c-format
+msgid "Could not read certificate file (%s)"
 msgstr "No se pudo abrir el fichero (%s)"
 
 #: src/wx/dolby_certificate_dialog.cc:39
@@ -356,47 +349,52 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:317
+#: src/wx/config_dialog.cc:266
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:330
+#: src/wx/config_dialog.cc:279
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 por defecto"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
 msgstr "Retardo de audio por defecto"
 
-#: src/wx/config_dialog.cc:321
+#: src/wx/config_dialog.cc:270
 msgid "Default container"
 msgstr "Contenedor por defecto"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:274
 msgid "Default content type"
 msgstr "Tipo de contenido por defecto"
 
-#: src/wx/config_dialog.cc:351
+#: src/wx/config_dialog.cc:300
 msgid "Default creator"
 msgstr "Creador por defecto"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:258
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:250
 msgid "Default duration of still images"
 msgstr "Duración por defecto de las imágenes fijas"
 
-#: src/wx/config_dialog.cc:347
+#: src/wx/config_dialog.cc:296
 msgid "Default issuer"
 msgstr "Emisor por defecto"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:229
 msgid "Defaults"
 msgstr "Por defecto"
 
+#: src/wx/audio_panel.cc:67
+#, fuzzy
+msgid "Delay"
+msgstr "Retardo del audio"
+
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detalles..."
@@ -444,7 +442,7 @@ msgstr "Editar cine..."
 msgid "Edit Screen..."
 msgstr "Editar pantalla..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
@@ -462,7 +460,7 @@ msgstr "Servidores de codificación"
 msgid "Encrypted"
 msgstr "Encriptado"
 
-#: src/wx/config_dialog.cc:753
+#: src/wx/config_dialog.cc:790
 msgid "Errors"
 msgstr ""
 
@@ -512,9 +510,10 @@ msgstr ""
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:125
-msgid "From address for KDM emails"
-msgstr "Remitente para los emails de KDM"
+#: src/wx/config_dialog.cc:673
+#, fuzzy
+msgid "From address"
+msgstr "Dirección IP"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
@@ -524,6 +523,10 @@ msgstr "Completo"
 msgid "Full length"
 msgstr "Duración completa"
 
+#: src/wx/audio_panel.cc:52
+msgid "Gain"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculadora de ganancia"
@@ -537,7 +540,7 @@ msgstr "Ganancia del canal %d en el canal %d del DCP"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:748
+#: src/wx/config_dialog.cc:785
 msgid "General"
 msgstr ""
 
@@ -565,11 +568,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:613
+#: src/wx/config_dialog.cc:562
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/config_dialog.cc:505
+#: src/wx/config_dialog.cc:454
 msgid "IP address / host name"
 msgstr "Dirección IP / nombre"
 
@@ -594,7 +597,7 @@ msgstr "Ancho de banda JPEG2000"
 msgid "Join"
 msgstr "Unir"
 
-#: src/wx/config_dialog.cc:680
+#: src/wx/config_dialog.cc:629
 msgid "KDM Email"
 msgstr "Email KDM"
 
@@ -631,7 +634,7 @@ msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 msgid "Load from file..."
 msgstr "Cargar de fichero..."
 
-#: src/wx/config_dialog.cc:747
+#: src/wx/config_dialog.cc:784
 msgid "Log"
 msgstr ""
 
@@ -643,11 +646,11 @@ msgstr "Ls"
 msgid "MISSING: "
 msgstr "FALTA:"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:662
 msgid "Mail password"
 msgstr "Clave del correo"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:658
 msgid "Mail user name"
 msgstr "Usuario del correo"
 
@@ -663,11 +666,12 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matriz"
 
-#: src/wx/config_dialog.cc:739
+#: src/wx/config_dialog.cc:772
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 máximo"
 
-#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
+#: src/wx/config_dialog.cc:283 src/wx/config_dialog.cc:776
+#: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
@@ -679,7 +683,7 @@ msgstr "Varios contenidos seleccionados"
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:512
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 #: src/wx/screen_dialog.cc:38
 msgid "Name"
@@ -710,7 +714,7 @@ msgstr "Off"
 msgid "Other"
 msgstr "Otros"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:654
 msgid "Outgoing mail server"
 msgstr "Servidor de salida de correo"
 
@@ -732,7 +736,7 @@ msgstr "Tipo de paquete (ej. OV)"
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Completado con negro hasta %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:574
 msgid "Password"
 msgstr "Clave"
 
@@ -809,6 +813,10 @@ msgstr "Repetir contenido"
 msgid "Repeat..."
 msgstr "Repetir..."
 
+#: src/wx/config_dialog.cc:684
+msgid "Reset to default text"
+msgstr ""
+
 #: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Resolución"
@@ -833,6 +841,11 @@ msgstr "Rs"
 msgid "SMPTE"
 msgstr "SMPTE"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "Scale"
+msgstr "Escalador"
+
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Redimensionar a"
@@ -881,7 +894,7 @@ msgstr "Número de serie del servidor"
 msgid "Server serial number"
 msgstr "Número de serie del servidor"
 
-#: src/wx/config_dialog.cc:485
+#: src/wx/config_dialog.cc:434
 msgid "Servers"
 msgstr "Servidores"
 
@@ -917,6 +930,11 @@ msgstr "Versión estable"
 msgid "Standard"
 msgstr "Estandard"
 
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#, fuzzy
+msgid "Stream"
+msgstr "Flujo"
+
 #: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Estudio (ej. TCF)"
@@ -925,22 +943,6 @@ msgstr "Estudio (ej. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Idioma del subtítulo (ej. EN)"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Subtitle Scale"
-msgstr "Escala del subtítulo"
-
-#: src/wx/subtitle_panel.cc:70
-msgid "Subtitle Stream"
-msgstr "Flujo de subtítulos"
-
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle X Offset"
-msgstr "Desplazamiento del subtítulo en X"
-
-#: src/wx/subtitle_panel.cc:53
-msgid "Subtitle Y Offset"
-msgstr "Desplazamiento del subtítulo en Y"
-
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Subtítulos"
@@ -949,11 +951,11 @@ msgstr "Subtítulos"
 msgid "Supported by"
 msgstr "Soportado por"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:542
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/config_dialog.cc:566
 msgid "Target path"
 msgstr "Ruta"
 
@@ -1065,7 +1067,7 @@ msgstr "Actualizar"
 msgid "Use ISDCF name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/config_dialog.cc:501
+#: src/wx/config_dialog.cc:450
 msgid "Use all servers"
 msgstr "Usar todos los servidores"
 
@@ -1077,7 +1079,7 @@ msgstr "Usar la mejor"
 msgid "Use preset"
 msgstr "Usar por defecto"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/config_dialog.cc:570
 msgid "User name"
 msgstr "Nombre de usuario"
 
@@ -1093,7 +1095,7 @@ msgstr "Vídeo"
 msgid "Video frame rate"
 msgstr "Velocidad de imagen"
 
-#: src/wx/config_dialog.cc:750
+#: src/wx/config_dialog.cc:787
 msgid "Warnings"
 msgstr ""
 
@@ -1109,6 +1111,16 @@ msgstr "Escribe a"
 msgid "Written by"
 msgstr "Escrito por"
 
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "X Offset"
+msgstr "Desplazamiento en X"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Y Offset"
+msgstr "Desplazamiento en Y"
+
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
@@ -1161,11 +1173,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:292
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:254
 msgid "s"
 msgstr "s"
 
@@ -1181,6 +1193,18 @@ msgstr "veces"
 msgid "video"
 msgstr "vídeo"
 
+#~ msgid "Audio Gain"
+#~ msgstr "Ganancia del audio"
+
+#~ msgid "From address for KDM emails"
+#~ msgstr "Remitente para los emails de KDM"
+
+#~ msgid "Subtitle Scale"
+#~ msgstr "Escala del subtítulo"
+
+#~ msgid "Subtitle Stream"
+#~ msgstr "Flujo de subtítulos"
+
 #~ msgid "Timing"
 #~ msgstr "Tiempo"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index f7c81d4dd..9801710eb 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-06-20 16:08+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -29,7 +29,7 @@ msgstr ""
 "(C) 2012-2014 par Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 "Laursen"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:666
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(le mot de passe sera enregistré sur le disque dur au format texte)"
 
@@ -117,7 +117,7 @@ msgstr "Ajout dossier..."
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: src/wx/config_dialog.cc:743
+#: src/wx/config_dialog.cc:780
 msgid "Allow any DCP frame rate"
 msgstr "Autoriser toutes cadences"
 
@@ -129,22 +129,10 @@ msgstr "Thème par"
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:67
-msgid "Audio Delay"
-msgstr "Délai audio"
-
-#: src/wx/audio_panel.cc:52
-msgid "Audio Gain"
-msgstr "Gain audio"
-
 #: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
-#: src/wx/audio_panel.cc:81
-msgid "Audio Stream"
-msgstr "Flux audio"
-
 #: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Canaux audios"
@@ -194,6 +182,11 @@ msgstr "Je souhaite utiliser ce volume"
 msgid "C"
 msgstr "C"
 
+#: src/wx/config_dialog.cc:677
+#, fuzzy
+msgid "CC address"
+msgstr "Adresse IP"
+
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
 msgid "CPL"
 msgstr "CPL"
@@ -235,11 +228,11 @@ msgstr "Gain Canal"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:114
 msgid "Check for testing updates as well as stable ones"
 msgstr "Recherche toutes mises à jour : test et stables."
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:110
 msgid "Check for updates on startup"
 msgstr "Recherche de mises à jour au démarrage."
 
@@ -259,7 +252,7 @@ msgstr "Choisissez un dossier"
 msgid "Cinema"
 msgstr "Cinéma"
 
-#: src/wx/config_dialog.cc:547
+#: src/wx/config_dialog.cc:496
 msgid "Colour Conversions"
 msgstr "Conversions Couleurs"
 
@@ -268,7 +261,7 @@ msgstr "Conversions Couleurs"
 msgid "Colour conversion"
 msgstr "Espace Couleurs"
 
-#: src/wx/config_dialog.cc:756
+#: src/wx/config_dialog.cc:793
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Durée"
@@ -314,8 +307,8 @@ msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
 #: src/wx/screen_dialog.cc:95
-#, fuzzy
-msgid "Could not read certificate file (%1)"
+#, fuzzy, c-format
+msgid "Could not read certificate file (%s)"
 msgstr "Ouverture du contenu impossible (%s)"
 
 #: src/wx/dolby_certificate_dialog.cc:39
@@ -356,46 +349,51 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:317
+#: src/wx/config_dialog.cc:266
 msgid "Default ISDCF name details"
 msgstr "Nom ISDCF par défaut"
 
-#: src/wx/config_dialog.cc:330
+#: src/wx/config_dialog.cc:279
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
 msgstr "Délais audio par défaut"
 
-#: src/wx/config_dialog.cc:321
+#: src/wx/config_dialog.cc:270
 msgid "Default container"
 msgstr "Format par défaut"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:274
 msgid "Default content type"
 msgstr "Catégorie par défaut"
 
-#: src/wx/config_dialog.cc:351
+#: src/wx/config_dialog.cc:300
 msgid "Default creator"
 msgstr "Créateur par défaut"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:258
 msgid "Default directory for new films"
 msgstr "Dossier par défaut pour les DCP"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:250
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/config_dialog.cc:347
+#: src/wx/config_dialog.cc:296
 msgid "Default issuer"
 msgstr "Labo par défaut"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:229
 msgid "Defaults"
 msgstr "Par défaut"
 
+#: src/wx/audio_panel.cc:67
+#, fuzzy
+msgid "Delay"
+msgstr "Délai audio"
+
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Détails..."
@@ -443,7 +441,7 @@ msgstr "Éditer le cinéma"
 msgid "Edit Screen..."
 msgstr "Éditer la salle"
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
@@ -461,7 +459,7 @@ msgstr "Serveurs Encodage"
 msgid "Encrypted"
 msgstr "Crypté"
 
-#: src/wx/config_dialog.cc:753
+#: src/wx/config_dialog.cc:790
 msgid "Errors"
 msgstr "Erreurs"
 
@@ -510,9 +508,10 @@ msgstr "Création de DCP libre et gratuit depuis presque tout."
 msgid "From"
 msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:125
-msgid "From address for KDM emails"
-msgstr "Email expéditeur pour les envoi de KDM"
+#: src/wx/config_dialog.cc:673
+#, fuzzy
+msgid "From address"
+msgstr "Adresse IP"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
@@ -522,6 +521,10 @@ msgstr "Plein"
 msgid "Full length"
 msgstr "Durée totale"
 
+#: src/wx/audio_panel.cc:52
+msgid "Gain"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculateur de gain"
@@ -535,7 +538,7 @@ msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:748
+#: src/wx/config_dialog.cc:785
 msgid "General"
 msgstr "Général"
 
@@ -563,11 +566,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:613
+#: src/wx/config_dialog.cc:562
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/config_dialog.cc:505
+#: src/wx/config_dialog.cc:454
 msgid "IP address / host name"
 msgstr "Adresse IP / Nom d'Hôte"
 
@@ -591,7 +594,7 @@ msgstr "Qualité JPEG2000"
 msgid "Join"
 msgstr "Ajouter"
 
-#: src/wx/config_dialog.cc:680
+#: src/wx/config_dialog.cc:629
 msgid "KDM Email"
 msgstr "e-mail KDM"
 
@@ -628,7 +631,7 @@ msgstr "Lisser la courbe gamma d'entrée pour les bas niveaux"
 msgid "Load from file..."
 msgstr "Chargement depuis fichier..."
 
-#: src/wx/config_dialog.cc:747
+#: src/wx/config_dialog.cc:784
 msgid "Log"
 msgstr "Rapport"
 
@@ -640,11 +643,11 @@ msgstr "Sr.G"
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:662
 msgid "Mail password"
 msgstr "Mot de passe Mail"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:658
 msgid "Mail user name"
 msgstr "Nom Utilisateur Mail"
 
@@ -660,11 +663,12 @@ msgstr "Luminance masterisée (ex: 4fl)"
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:739
+#: src/wx/config_dialog.cc:772
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 Maxi"
 
-#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
+#: src/wx/config_dialog.cc:283 src/wx/config_dialog.cc:776
+#: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
@@ -676,7 +680,7 @@ msgstr "Contenus multiples sélectionnés"
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:512
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 #: src/wx/screen_dialog.cc:38
 msgid "Name"
@@ -707,7 +711,7 @@ msgstr "Eteint"
 msgid "Other"
 msgstr "Autre"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:654
 msgid "Outgoing mail server"
 msgstr "Serveurs de messagerie sortante"
 
@@ -728,7 +732,7 @@ msgstr "Type de paquet (ex. OV)"
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:574
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -805,6 +809,10 @@ msgstr "Répéter le contenu"
 msgid "Repeat..."
 msgstr "Répéter..."
 
+#: src/wx/config_dialog.cc:684
+msgid "Reset to default text"
+msgstr ""
+
 #: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Résolution"
@@ -829,6 +837,10 @@ msgstr "Sr.D"
 msgid "SMPTE"
 msgstr "SMPTE"
 
+#: src/wx/subtitle_panel.cc:62
+msgid "Scale"
+msgstr "Mise à l'échelle"
+
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Mise à l'échelle"
@@ -875,7 +887,7 @@ msgstr "Numéro de Série du Serveur"
 msgid "Server serial number"
 msgstr "Numéro de Série du Serveur"
 
-#: src/wx/config_dialog.cc:485
+#: src/wx/config_dialog.cc:434
 msgid "Servers"
 msgstr "Serveurs"
 
@@ -911,6 +923,10 @@ msgstr "Version Stable"
 msgid "Standard"
 msgstr "Standard"
 
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+msgid "Stream"
+msgstr "Flux"
+
 #: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
@@ -919,22 +935,6 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Langue de sous-titres (ex. FR)"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Subtitle Scale"
-msgstr "Taille du sous-titre"
-
-#: src/wx/subtitle_panel.cc:70
-msgid "Subtitle Stream"
-msgstr "Flux de sous-titre"
-
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle X Offset"
-msgstr "Position Horizontale"
-
-#: src/wx/subtitle_panel.cc:53
-msgid "Subtitle Y Offset"
-msgstr "Position Verticale"
-
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Sous-titres"
@@ -943,11 +943,11 @@ msgstr "Sous-titres"
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:542
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/config_dialog.cc:566
 msgid "Target path"
 msgstr "Chemin d'accès"
 
@@ -1058,7 +1058,7 @@ msgstr "Mise à jour."
 msgid "Use ISDCF name"
 msgstr "Utiliser le nom ISDCF"
 
-#: src/wx/config_dialog.cc:501
+#: src/wx/config_dialog.cc:450
 msgid "Use all servers"
 msgstr "Utiliser tous les serveurs."
 
@@ -1070,7 +1070,7 @@ msgstr "Automatique"
 msgid "Use preset"
 msgstr "Utiliser le préréglage"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/config_dialog.cc:570
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
@@ -1086,7 +1086,7 @@ msgstr "Vidéo"
 msgid "Video frame rate"
 msgstr "Cadence vidéo"
 
-#: src/wx/config_dialog.cc:750
+#: src/wx/config_dialog.cc:787
 msgid "Warnings"
 msgstr "Avertissements"
 
@@ -1102,6 +1102,14 @@ msgstr "Ecrire à"
 msgid "Written by"
 msgstr "Développé par"
 
+#: src/wx/subtitle_panel.cc:44
+msgid "X Offset"
+msgstr "Position Horizontale"
+
+#: src/wx/subtitle_panel.cc:53
+msgid "Y Offset"
+msgstr "Position Verticale"
+
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
@@ -1154,11 +1162,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:292
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:254
 msgid "s"
 msgstr "s"
 
@@ -1174,6 +1182,18 @@ msgstr "fois"
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Audio Gain"
+#~ msgstr "Gain audio"
+
+#~ msgid "From address for KDM emails"
+#~ msgstr "Email expéditeur pour les envoi de KDM"
+
+#~ msgid "Subtitle Scale"
+#~ msgstr "Taille du sous-titre"
+
+#~ msgid "Subtitle Stream"
+#~ msgstr "Flux de sous-titre"
+
 #~ msgid "Timing"
 #~ msgstr "Durée"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index db7342be0..79febb5ab 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -27,7 +27,7 @@ msgid ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:666
 msgid "(password will be stored on disk in plaintext)"
 msgstr ""
 
@@ -116,7 +116,7 @@ msgstr "Aggiungi cartella"
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: src/wx/config_dialog.cc:743
+#: src/wx/config_dialog.cc:780
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "Frequenza fotogrammi video"
@@ -129,22 +129,10 @@ msgstr ""
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:67
-msgid "Audio Delay"
-msgstr "Ritardo dell'audio"
-
-#: src/wx/audio_panel.cc:52
-msgid "Audio Gain"
-msgstr "Guadagno dell'audio"
-
 #: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
-#: src/wx/audio_panel.cc:81
-msgid "Audio Stream"
-msgstr "Traccia Audio"
-
 #: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Canali audio"
@@ -194,6 +182,11 @@ msgstr "Ma dovrò riprodurre con il fader a"
 msgid "C"
 msgstr "C"
 
+#: src/wx/config_dialog.cc:677
+#, fuzzy
+msgid "CC address"
+msgstr "Indirizzo IP"
+
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
 msgid "CPL"
 msgstr ""
@@ -237,11 +230,11 @@ msgstr "Guadagno audio"
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:114
 msgid "Check for testing updates as well as stable ones"
 msgstr "Controlla per aggiornamenti test o stabili"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:110
 msgid "Check for updates on startup"
 msgstr "Controlla gli aggiornamentio alla partenza"
 
@@ -262,7 +255,7 @@ msgstr "Scegli una cartella"
 msgid "Cinema"
 msgstr "Aggiungi Cinema"
 
-#: src/wx/config_dialog.cc:547
+#: src/wx/config_dialog.cc:496
 #, fuzzy
 msgid "Colour Conversions"
 msgstr "Conversioni colore"
@@ -272,7 +265,7 @@ msgstr "Conversioni colore"
 msgid "Colour conversion"
 msgstr "Conversione colore"
 
-#: src/wx/config_dialog.cc:756
+#: src/wx/config_dialog.cc:793
 msgid "Config|Timing"
 msgstr ""
 
@@ -317,8 +310,8 @@ msgid "Could not make DCP: %s"
 msgstr "Non posso creare il DCP: %s"
 
 #: src/wx/screen_dialog.cc:95
-#, fuzzy
-msgid "Could not read certificate file (%1)"
+#, fuzzy, c-format
+msgid "Could not read certificate file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
 #: src/wx/dolby_certificate_dialog.cc:39
@@ -359,50 +352,55 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:317
+#: src/wx/config_dialog.cc:266
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Dettagli del nome DCI predefinito"
 
-#: src/wx/config_dialog.cc:330
+#: src/wx/config_dialog.cc:279
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
 msgstr "Ritardo audio predefinito"
 
-#: src/wx/config_dialog.cc:321
+#: src/wx/config_dialog.cc:270
 msgid "Default container"
 msgstr "Contenitore predefinito"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:274
 msgid "Default content type"
 msgstr "Tipo sorgente predefinito"
 
-#: src/wx/config_dialog.cc:351
+#: src/wx/config_dialog.cc:300
 #, fuzzy
 msgid "Default creator"
 msgstr "Contenitore predefinito"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:258
 msgid "Default directory for new films"
 msgstr "Cartella predefinita per i nuovi films"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:250
 msgid "Default duration of still images"
 msgstr "Durata predefinita immagini statiche"
 
-#: src/wx/config_dialog.cc:347
+#: src/wx/config_dialog.cc:296
 #, fuzzy
 msgid "Default issuer"
 msgstr "Predefiniti"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:229
 msgid "Defaults"
 msgstr "Predefiniti"
 
+#: src/wx/audio_panel.cc:67
+#, fuzzy
+msgid "Delay"
+msgstr "Ritardo dell'audio"
+
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Dettagli"
@@ -450,7 +448,7 @@ msgstr "Modifica Cinema..."
 msgid "Edit Screen..."
 msgstr "Modifica Schermo..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
@@ -469,7 +467,7 @@ msgstr "Servers di codifica"
 msgid "Encrypted"
 msgstr "Criptato"
 
-#: src/wx/config_dialog.cc:753
+#: src/wx/config_dialog.cc:790
 msgid "Errors"
 msgstr ""
 
@@ -519,9 +517,10 @@ msgstr ""
 msgid "From"
 msgstr "Da"
 
-#: src/wx/config_dialog.cc:125
-msgid "From address for KDM emails"
-msgstr ""
+#: src/wx/config_dialog.cc:673
+#, fuzzy
+msgid "From address"
+msgstr "Indirizzo IP"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
@@ -531,6 +530,10 @@ msgstr ""
 msgid "Full length"
 msgstr ""
 
+#: src/wx/audio_panel.cc:52
+msgid "Gain"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calcolatore del guadagno audio"
@@ -544,7 +547,7 @@ msgstr "Guadagno per il canale sorgente %d nel canale DCP %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:748
+#: src/wx/config_dialog.cc:785
 msgid "General"
 msgstr ""
 
@@ -572,11 +575,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:613
+#: src/wx/config_dialog.cc:562
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/config_dialog.cc:505
+#: src/wx/config_dialog.cc:454
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Indirizzo IP"
@@ -602,7 +605,7 @@ msgstr "Banda passante JPEG2000"
 msgid "Join"
 msgstr ""
 
-#: src/wx/config_dialog.cc:680
+#: src/wx/config_dialog.cc:629
 msgid "KDM Email"
 msgstr ""
 
@@ -638,7 +641,7 @@ msgstr "Linearizza la curva del gamma in ingresso per piccoli valori"
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:747
+#: src/wx/config_dialog.cc:784
 msgid "Log"
 msgstr ""
 
@@ -650,12 +653,12 @@ msgstr "Ls"
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:662
 #, fuzzy
 msgid "Mail password"
 msgstr "Password del TMS"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:658
 #, fuzzy
 msgid "Mail user name"
 msgstr "Nome utente del TMS"
@@ -672,12 +675,13 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:739
+#: src/wx/config_dialog.cc:772
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
+#: src/wx/config_dialog.cc:283 src/wx/config_dialog.cc:776
+#: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr ""
 
@@ -689,7 +693,7 @@ msgstr "Molteplici sorgenti selezionate"
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:512
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 #: src/wx/screen_dialog.cc:38
 msgid "Name"
@@ -720,7 +724,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:654
 msgid "Outgoing mail server"
 msgstr "Mail server posta in uscita"
 
@@ -742,7 +746,7 @@ msgstr "Tipo di Package (es. OV)"
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:574
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
@@ -820,6 +824,10 @@ msgstr "Ripeti il contenuto"
 msgid "Repeat..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:684
+msgid "Reset to default text"
+msgstr ""
+
 #: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Risoluzione"
@@ -844,6 +852,11 @@ msgstr "Rs"
 msgid "SMPTE"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "Scale"
+msgstr "Scaler"
+
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Scala a"
@@ -891,7 +904,7 @@ msgstr ""
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:485
+#: src/wx/config_dialog.cc:434
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
@@ -928,6 +941,11 @@ msgstr "Versione stabile"
 msgid "Standard"
 msgstr ""
 
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#, fuzzy
+msgid "Stream"
+msgstr "Traccia"
+
 #: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (es. TCF)"
@@ -936,22 +954,6 @@ msgstr "Studio (es. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Lingua dei Sottotitoli (es. FR)"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Subtitle Scale"
-msgstr "Scala dei Sottotitoli"
-
-#: src/wx/subtitle_panel.cc:70
-msgid "Subtitle Stream"
-msgstr "Traccia sottotitoli"
-
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle X Offset"
-msgstr "Spostamento X dei Sottotitoli"
-
-#: src/wx/subtitle_panel.cc:53
-msgid "Subtitle Y Offset"
-msgstr "Spostamento Y dei Sottotitoli"
-
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Sottotitoli"
@@ -960,11 +962,11 @@ msgstr "Sottotitoli"
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:542
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/config_dialog.cc:566
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
@@ -1078,7 +1080,7 @@ msgstr "Aggiorna"
 msgid "Use ISDCF name"
 msgstr "Usa nome DCI"
 
-#: src/wx/config_dialog.cc:501
+#: src/wx/config_dialog.cc:450
 msgid "Use all servers"
 msgstr "Usa tutti i server"
 
@@ -1090,7 +1092,7 @@ msgstr "Usa la migliore"
 msgid "Use preset"
 msgstr "Usa predefinito"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/config_dialog.cc:570
 msgid "User name"
 msgstr "Nome utente"
 
@@ -1106,7 +1108,7 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "Frequenza fotogrammi video"
 
-#: src/wx/config_dialog.cc:750
+#: src/wx/config_dialog.cc:787
 msgid "Warnings"
 msgstr ""
 
@@ -1122,6 +1124,14 @@ msgstr ""
 msgid "Written by"
 msgstr ""
 
+#: src/wx/subtitle_panel.cc:44
+msgid "X Offset"
+msgstr "Spostamento X"
+
+#: src/wx/subtitle_panel.cc:53
+msgid "Y Offset"
+msgstr "Spostamento Y"
+
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
@@ -1175,11 +1185,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:292
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:254
 msgid "s"
 msgstr "s"
 
@@ -1196,6 +1206,15 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Audio Gain"
+#~ msgstr "Guadagno dell'audio"
+
+#~ msgid "Subtitle Scale"
+#~ msgstr "Scala dei Sottotitoli"
+
+#~ msgid "Subtitle Stream"
+#~ msgstr "Traccia sottotitoli"
+
 #~ msgid "Content channel"
 #~ msgstr "Canale Sorgente"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 948511ddb..514ec4665 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-03-30 19:40+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -29,7 +29,7 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:666
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(wachtwoord wordt opgeslagen op disk in leesbare tekst)"
 
@@ -119,7 +119,7 @@ msgstr "Voeg map toe..."
 msgid "Add..."
 msgstr "Toevoegen.."
 
-#: src/wx/config_dialog.cc:743
+#: src/wx/config_dialog.cc:780
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "Video frame rate"
@@ -132,22 +132,10 @@ msgstr "Artwork door"
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:67
-msgid "Audio Delay"
-msgstr "Audio Delay"
-
-#: src/wx/audio_panel.cc:52
-msgid "Audio Gain"
-msgstr "Audio Gain"
-
 #: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "AudioTaal (e.g. NL)"
 
-#: src/wx/audio_panel.cc:81
-msgid "Audio Stream"
-msgstr "Audio Stream"
-
 #: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Audio kanalen"
@@ -198,6 +186,11 @@ msgstr "Maak ik gebruik een fader"
 msgid "C"
 msgstr "C"
 
+#: src/wx/config_dialog.cc:677
+#, fuzzy
+msgid "CC address"
+msgstr "IP adres"
+
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
 #, fuzzy
 msgid "CPL"
@@ -241,11 +234,11 @@ msgstr "Kanaal versterking"
 msgid "Channels"
 msgstr "Kanalen"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:114
 msgid "Check for testing updates as well as stable ones"
 msgstr "Selecteer voor Test updates en Stabiele versies "
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:110
 msgid "Check for updates on startup"
 msgstr "Selecteer voor updates controle bij startup"
 
@@ -265,7 +258,7 @@ msgstr "Kies map"
 msgid "Cinema"
 msgstr "Bioscoop"
 
-#: src/wx/config_dialog.cc:547
+#: src/wx/config_dialog.cc:496
 msgid "Colour Conversions"
 msgstr "Colour Conversions"
 
@@ -274,7 +267,7 @@ msgstr "Colour Conversions"
 msgid "Colour conversion"
 msgstr "Colour conversion"
 
-#: src/wx/config_dialog.cc:756
+#: src/wx/config_dialog.cc:793
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Timing"
@@ -320,8 +313,8 @@ msgid "Could not make DCP: %s"
 msgstr "Kan geen DCP maken: %s"
 
 #: src/wx/screen_dialog.cc:95
-#, fuzzy
-msgid "Could not read certificate file (%1)"
+#, fuzzy, c-format
+msgid "Could not read certificate file (%s)"
 msgstr "Kan video niet decoderen voor preview (%s)"
 
 #: src/wx/dolby_certificate_dialog.cc:39
@@ -362,47 +355,52 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:317
+#: src/wx/config_dialog.cc:266
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Standaard DCI naam details"
 
-#: src/wx/config_dialog.cc:330
+#: src/wx/config_dialog.cc:279
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standaard JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
 msgstr "Standaard audio delay"
 
-#: src/wx/config_dialog.cc:321
+#: src/wx/config_dialog.cc:270
 msgid "Default container"
 msgstr "Standaard container"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:274
 msgid "Default content type"
 msgstr "Standaard content type"
 
-#: src/wx/config_dialog.cc:351
+#: src/wx/config_dialog.cc:300
 msgid "Default creator"
 msgstr "Standaard maker"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:258
 msgid "Default directory for new films"
 msgstr "Standaard map voor nieuwe films"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:250
 msgid "Default duration of still images"
 msgstr "Standaard lengte van stills"
 
-#: src/wx/config_dialog.cc:347
+#: src/wx/config_dialog.cc:296
 msgid "Default issuer"
 msgstr "Standaard uitgever"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:229
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
+#: src/wx/audio_panel.cc:67
+#, fuzzy
+msgid "Delay"
+msgstr "Audio Delay"
+
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Details..."
@@ -450,7 +448,7 @@ msgstr "Edit Bioscoop"
 msgid "Edit Screen..."
 msgstr "Edit scherm"
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
@@ -468,7 +466,7 @@ msgstr "Encoding Servers"
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: src/wx/config_dialog.cc:753
+#: src/wx/config_dialog.cc:790
 msgid "Errors"
 msgstr ""
 
@@ -517,9 +515,10 @@ msgstr "Gratis, open-source DCP samensteller voor bijna alles."
 msgid "From"
 msgstr "Van"
 
-#: src/wx/config_dialog.cc:125
-msgid "From address for KDM emails"
-msgstr "Van adres voor KDM emails"
+#: src/wx/config_dialog.cc:673
+#, fuzzy
+msgid "From address"
+msgstr "IP adres"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
@@ -529,6 +528,10 @@ msgstr "Volledig"
 msgid "Full length"
 msgstr "Volledige lengte"
 
+#: src/wx/audio_panel.cc:52
+msgid "Gain"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Gain Calculator"
@@ -542,7 +545,7 @@ msgstr "Gain voor content kanaal %d in DCP kanaal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:748
+#: src/wx/config_dialog.cc:785
 msgid "General"
 msgstr ""
 
@@ -570,11 +573,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Ik wil dit afspelen met fader"
 
-#: src/wx/config_dialog.cc:613
+#: src/wx/config_dialog.cc:562
 msgid "IP address"
 msgstr "IP adres"
 
-#: src/wx/config_dialog.cc:505
+#: src/wx/config_dialog.cc:454
 msgid "IP address / host name"
 msgstr "IP adres / host naam"
 
@@ -599,7 +602,7 @@ msgstr "JPEG2000 bandbreedte"
 msgid "Join"
 msgstr "Samenvoegen"
 
-#: src/wx/config_dialog.cc:680
+#: src/wx/config_dialog.cc:629
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -636,7 +639,7 @@ msgstr "Linearise input gamma curve for low values"
 msgid "Load from file..."
 msgstr "Laad van bestand..."
 
-#: src/wx/config_dialog.cc:747
+#: src/wx/config_dialog.cc:784
 msgid "Log"
 msgstr ""
 
@@ -648,11 +651,11 @@ msgstr "Ls"
 msgid "MISSING: "
 msgstr "ONTBREEKT:"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:662
 msgid "Mail password"
 msgstr "Mail wachtwoord"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:658
 msgid "Mail user name"
 msgstr "Mail gebruikersnaam"
 
@@ -668,11 +671,12 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:739
+#: src/wx/config_dialog.cc:772
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximum JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
+#: src/wx/config_dialog.cc:283 src/wx/config_dialog.cc:776
+#: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
@@ -684,7 +688,7 @@ msgstr "Meedere content geselecteerd"
 msgid "My Documents"
 msgstr "Mijn documenten"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:512
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 #: src/wx/screen_dialog.cc:38
 msgid "Name"
@@ -717,7 +721,7 @@ msgstr "Uit"
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:654
 msgid "Outgoing mail server"
 msgstr "Uitgaande mail server"
 
@@ -739,7 +743,7 @@ msgstr "Package Type (e.g. OV)"
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Opgevuld met zwart tot %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:574
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -816,6 +820,10 @@ msgstr "Herhaal content"
 msgid "Repeat..."
 msgstr "Herhaal..."
 
+#: src/wx/config_dialog.cc:684
+msgid "Reset to default text"
+msgstr ""
+
 #: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Resolutie"
@@ -840,6 +848,11 @@ msgstr "Rs"
 msgid "SMPTE"
 msgstr "SMPTE"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "Scale"
+msgstr "Schaler"
+
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Schaal tot"
@@ -887,7 +900,7 @@ msgstr "Server serie nummer"
 msgid "Server serial number"
 msgstr "Server serie nummer"
 
-#: src/wx/config_dialog.cc:485
+#: src/wx/config_dialog.cc:434
 msgid "Servers"
 msgstr "Servers"
 
@@ -923,6 +936,11 @@ msgstr "Stabiele versie"
 msgid "Standard"
 msgstr "Standaard"
 
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#, fuzzy
+msgid "Stream"
+msgstr "Audio Stream"
+
 #: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (e.g. TCF)"
@@ -931,22 +949,6 @@ msgstr "Studio (e.g. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Ondertitel Taal (vb  NL)"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Subtitle Scale"
-msgstr "Ondertitel grootte"
-
-#: src/wx/subtitle_panel.cc:70
-msgid "Subtitle Stream"
-msgstr "Ondertitel Stream"
-
-#: src/wx/subtitle_panel.cc:44
-msgid "Subtitle X Offset"
-msgstr "Ondertitel X offset"
-
-#: src/wx/subtitle_panel.cc:53
-msgid "Subtitle Y Offset"
-msgstr "Ondertitel Y offset"
-
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Ondertitels"
@@ -955,11 +957,11 @@ msgstr "Ondertitels"
 msgid "Supported by"
 msgstr "Ondersteund door"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:542
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/config_dialog.cc:566
 msgid "Target path"
 msgstr "Doel pad"
 
@@ -1072,7 +1074,7 @@ msgstr "Update"
 msgid "Use ISDCF name"
 msgstr "Gebruik DCI naam"
 
-#: src/wx/config_dialog.cc:501
+#: src/wx/config_dialog.cc:450
 msgid "Use all servers"
 msgstr "Gebruik alle servers"
 
@@ -1084,7 +1086,7 @@ msgstr "Gebruik de beste"
 msgid "Use preset"
 msgstr "Gebruik preset"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/config_dialog.cc:570
 msgid "User name"
 msgstr "Gebruikersnaam"
 
@@ -1100,7 +1102,7 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "Video frame rate"
 
-#: src/wx/config_dialog.cc:750
+#: src/wx/config_dialog.cc:787
 msgid "Warnings"
 msgstr ""
 
@@ -1116,6 +1118,14 @@ msgstr "Schrijf naar"
 msgid "Written by"
 msgstr "Geschreven door"
 
+#: src/wx/subtitle_panel.cc:44
+msgid "X Offset"
+msgstr "X offset"
+
+#: src/wx/subtitle_panel.cc:53
+msgid "Y Offset"
+msgstr "Y offset"
+
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
@@ -1167,11 +1177,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:292
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:254
 msgid "s"
 msgstr "s"
 
@@ -1187,6 +1197,18 @@ msgstr "tijden"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Audio Gain"
+#~ msgstr "Audio Gain"
+
+#~ msgid "From address for KDM emails"
+#~ msgstr "Van adres voor KDM emails"
+
+#~ msgid "Subtitle Scale"
+#~ msgstr "Ondertitel grootte"
+
+#~ msgid "Subtitle Stream"
+#~ msgstr "Ondertitel Stream"
+
 #~ msgid "Timing"
 #~ msgstr "Timing"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 68e193c02..dd62b1e29 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-21 14:51+0100\n"
+"POT-Creation-Date: 2014-06-23 00:25+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -28,7 +28,7 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:666
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(lösenord sparas på disk i klartext)"
 
@@ -118,7 +118,7 @@ msgstr "Lägg till folder..."
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: src/wx/config_dialog.cc:743
+#: src/wx/config_dialog.cc:780
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "bildhastighet"
@@ -131,22 +131,10 @@ msgstr ""
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:67
-msgid "Audio Delay"
-msgstr "Audio Fördröjning"
-
-#: src/wx/audio_panel.cc:52
-msgid "Audio Gain"
-msgstr "Audio Förstärkning"
-
 #: src/wx/isdcf_metadata_dialog.cc:35
 msgid "Audio Language (e.g. EN)"
 msgstr "Audiospråk (ex. SV)"
 
-#: src/wx/audio_panel.cc:81
-msgid "Audio Stream"
-msgstr "Audioström"
-
 #: src/wx/film_editor.cc:166
 msgid "Audio channels"
 msgstr "Audio-kanaler"
@@ -197,6 +185,11 @@ msgstr "Men jag måste använda mixervolym"
 msgid "C"
 msgstr "C"
 
+#: src/wx/config_dialog.cc:677
+#, fuzzy
+msgid "CC address"
+msgstr "IP-adress"
+
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
 #, fuzzy
 msgid "CPL"
@@ -241,11 +234,11 @@ msgstr "Kanalförstärkning"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:114
 msgid "Check for testing updates as well as stable ones"
 msgstr "sök efter både test- och stabila uppdateringar"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:110
 msgid "Check for updates on startup"
 msgstr "Sök efter uppdateringar vid start"
 
@@ -266,7 +259,7 @@ msgstr "Välj en folder"
 msgid "Cinema"
 msgstr "Lägg till Cinema..."
 
-#: src/wx/config_dialog.cc:547
+#: src/wx/config_dialog.cc:496
 #, fuzzy
 msgid "Colour Conversions"
 msgstr "Färgkonverteringar"
@@ -277,7 +270,7 @@ msgid "Colour conversion"
 msgstr "Färgkonvertering"
 
 # Svengelska
-#: src/wx/config_dialog.cc:756
+#: src/wx/config_dialog.cc:793
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Tajming"
@@ -323,8 +316,8 @@ msgid "Could not make DCP: %s"
 msgstr "Kunde inte skapa DCP: %s"
 
 #: src/wx/screen_dialog.cc:95
-#, fuzzy
-msgid "Could not read certificate file (%1)"
+#, fuzzy, c-format
+msgid "Could not read certificate file (%s)"
 msgstr "Kunde inte öppna innehållsfilen (%s)"
 
 #: src/wx/dolby_certificate_dialog.cc:39
@@ -366,49 +359,54 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:317
+#: src/wx/config_dialog.cc:266
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:330
+#: src/wx/config_dialog.cc:279
 msgid "Default JPEG2000 bandwidth"
 msgstr "Förvald JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:339
+#: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
 msgstr "Förvald audiofördröjning"
 
-#: src/wx/config_dialog.cc:321
+#: src/wx/config_dialog.cc:270
 msgid "Default container"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:274
 msgid "Default content type"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:351
+#: src/wx/config_dialog.cc:300
 #, fuzzy
 msgid "Default creator"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:258
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:301
+#: src/wx/config_dialog.cc:250
 msgid "Default duration of still images"
 msgstr "Förvald varaktighet på stillbilder"
 
-#: src/wx/config_dialog.cc:347
+#: src/wx/config_dialog.cc:296
 #, fuzzy
 msgid "Default issuer"
 msgstr "Standardval"
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:229
 msgid "Defaults"
 msgstr "Standardval"
 
+#: src/wx/audio_panel.cc:67
+#, fuzzy
+msgid "Delay"
+msgstr "Audio Fördröjning"
+
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detaljer..."
@@ -457,7 +455,7 @@ msgstr "Redigera Cinema..."
 msgid "Edit Screen..."
 msgstr "Redigera Skärm..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:318
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:64
 msgid "Edit..."
@@ -475,7 +473,7 @@ msgstr "Kodningsservrar"
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/wx/config_dialog.cc:753
+#: src/wx/config_dialog.cc:790
 msgid "Errors"
 msgstr ""
 
@@ -526,9 +524,10 @@ msgstr "Fri, öppen-källkods DCP-generering från nästan vad som helst."
 msgid "From"
 msgstr "Avsändare"
 
-#: src/wx/config_dialog.cc:125
-msgid "From address for KDM emails"
-msgstr "Avsändare för KDM-mejl"
+#: src/wx/config_dialog.cc:673
+#, fuzzy
+msgid "From address"
+msgstr "IP-adress"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
@@ -538,6 +537,10 @@ msgstr "Full"
 msgid "Full length"
 msgstr "Full längd"
 
+#: src/wx/audio_panel.cc:52
+msgid "Gain"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Volym Kalkylator"
@@ -551,7 +554,7 @@ msgstr "Förstärkning för innehållskanal %d i DCP-kanal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:748
+#: src/wx/config_dialog.cc:785
 msgid "General"
 msgstr ""
 
@@ -579,11 +582,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
 
-#: src/wx/config_dialog.cc:613
+#: src/wx/config_dialog.cc:562
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/config_dialog.cc:505
+#: src/wx/config_dialog.cc:454
 msgid "IP address / host name"
 msgstr "IP-adress / datornamn"
 
@@ -608,7 +611,7 @@ msgstr "JPEG2000-bandbredd"
 msgid "Join"
 msgstr "Anslut"
 
-#: src/wx/config_dialog.cc:680
+#: src/wx/config_dialog.cc:629
 #, fuzzy
 msgid "KDM Email"
 msgstr "KDM mejl"
@@ -648,7 +651,7 @@ msgstr "Linjärisera indatas gammakurva för låga värden"
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:747
+#: src/wx/config_dialog.cc:784
 msgid "Log"
 msgstr ""
 
@@ -660,11 +663,11 @@ msgstr "Vs"
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:662
 msgid "Mail password"
 msgstr "Mejl-lösenord"
 
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:658
 msgid "Mail user name"
 msgstr "Mejl-användarnamn"
 
@@ -680,12 +683,13 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matris"
 
-#: src/wx/config_dialog.cc:739
+#: src/wx/config_dialog.cc:772
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:334 src/wx/film_editor.cc:185
+#: src/wx/config_dialog.cc:283 src/wx/config_dialog.cc:776
+#: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr ""
 
@@ -698,7 +702,7 @@ msgstr "Flera innehåll valda"
 msgid "My Documents"
 msgstr "Mina Dokument"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:563
+#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:512
 #: src/wx/film_editor.cc:113 src/wx/preset_colour_conversion_dialog.cc:38
 #: src/wx/screen_dialog.cc:38
 msgid "Name"
@@ -731,7 +735,7 @@ msgstr "Av"
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:109
+#: src/wx/config_dialog.cc:654
 msgid "Outgoing mail server"
 msgstr "Utgående mejlserver"
 
@@ -753,7 +757,7 @@ msgstr "Förpackningstyp (ex. OV)"
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:625
+#: src/wx/config_dialog.cc:574
 msgid "Password"
 msgstr "Lösenord"
 
@@ -831,6 +835,10 @@ msgstr "Repetera Innehåll"
 msgid "Repeat..."
 msgstr "Upprepa..."
 
+#: src/wx/config_dialog.cc:684
+msgid "Reset to default text"
+msgstr ""
+
 #: src/wx/film_editor.cc:175
 msgid "Resolution"
 msgstr "Upplösning"
@@ -855,6 +863,11 @@ msgstr "Hs"
 msgid "SMPTE"
 msgstr "SMPTE"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "Scale"
+msgstr "Omskalare"
+
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Skala om till"
@@ -902,7 +915,7 @@ msgstr ""
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:485
+#: src/wx/config_dialog.cc:434
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
@@ -940,6 +953,11 @@ msgstr "Stabil version"
 msgid "Standard"
 msgstr "Standard"
 
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#, fuzzy
+msgid "Stream"
+msgstr "Audioström"
+
 #: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
@@ -948,24 +966,6 @@ msgstr "Studio (ex. TCF)"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "Undertextspråk (ex. SV)"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Subtitle Scale"
-msgstr "Undertext Skalning"
-
-#: src/wx/subtitle_panel.cc:70
-msgid "Subtitle Stream"
-msgstr "Undertextström"
-
-#: src/wx/subtitle_panel.cc:44
-#, fuzzy
-msgid "Subtitle X Offset"
-msgstr "Undertext Förskjutning"
-
-#: src/wx/subtitle_panel.cc:53
-#, fuzzy
-msgid "Subtitle Y Offset"
-msgstr "Undertext Förskjutning"
-
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
 msgstr "Undertexter"
@@ -974,11 +974,11 @@ msgstr "Undertexter"
 msgid "Supported by"
 msgstr "Stöd från"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:542
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/config_dialog.cc:566
 msgid "Target path"
 msgstr "Målsökväg"
 
@@ -1095,7 +1095,7 @@ msgstr "Uppdatera"
 msgid "Use ISDCF name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/config_dialog.cc:501
+#: src/wx/config_dialog.cc:450
 msgid "Use all servers"
 msgstr "Använd alla servrar"
 
@@ -1107,7 +1107,7 @@ msgstr "Använd bästa"
 msgid "Use preset"
 msgstr "Använd förhandsinställning"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/config_dialog.cc:570
 msgid "User name"
 msgstr "Användarnamn"
 
@@ -1123,7 +1123,7 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "bildhastighet"
 
-#: src/wx/config_dialog.cc:750
+#: src/wx/config_dialog.cc:787
 msgid "Warnings"
 msgstr ""
 
@@ -1139,6 +1139,16 @@ msgstr "Skriv till"
 msgid "Written by"
 msgstr "Skriven av"
 
+#: src/wx/subtitle_panel.cc:44
+#, fuzzy
+msgid "X Offset"
+msgstr "Undertext Förskjutning"
+
+#: src/wx/subtitle_panel.cc:53
+#, fuzzy
+msgid "Y Offset"
+msgstr "Undertext Förskjutning"
+
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
@@ -1190,11 +1200,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:343
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:292
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:305
+#: src/wx/config_dialog.cc:254
 msgid "s"
 msgstr "s"
 
@@ -1211,6 +1221,18 @@ msgstr "tider"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Audio Gain"
+#~ msgstr "Audio Förstärkning"
+
+#~ msgid "From address for KDM emails"
+#~ msgstr "Avsändare för KDM-mejl"
+
+#~ msgid "Subtitle Scale"
+#~ msgstr "Undertext Skalning"
+
+#~ msgid "Subtitle Stream"
+#~ msgstr "Undertextström"
+
 # Svengelska
 #~ msgid "Timing"
 #~ msgstr "Tajming"