Merge master.

23 files changed, 1059 insertions, 907 deletions

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index 46477950c..9f92bdb50 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -44,7 +44,10 @@ AudioPoint::AudioPoint ()
 AudioPoint::AudioPoint (FILE* f)
 {
 	for (int i = 0; i < COUNT; ++i) {
-		fscanf (f, "%f", &_data[i]);
+		int n = fscanf (f, "%f", &_data[i]);
+		if (n != 1) {
+			_data[i] = 0;
+		}
 	}
 }
 
@@ -87,7 +90,7 @@ AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 {
 	FILE* f = fopen_boost (filename, "r");
 
-	int channels;
+	int channels = 0;
 	fscanf (f, "%d", &channels);
 	_data.resize (channels);
 
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index c517d5946..db084cb3e 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-07-13 02:32+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -102,11 +102,11 @@ msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:82
+#: src/lib/writer.cc:83
 msgid "Checking existing image data"
 msgstr "Überprüfe bestehende Bilddateien"
 
-#: src/lib/writer.cc:471
+#: src/lib/writer.cc:475
 msgid "Computing audio digest"
 msgstr "Tonübersicht berechnen"
 
@@ -114,7 +114,7 @@ msgstr "Tonübersicht berechnen"
 msgid "Computing digest"
 msgstr "Zusammenfassung berechnen"
 
-#: src/lib/writer.cc:467
+#: src/lib/writer.cc:471
 msgid "Computing image digest"
 msgstr "Bildübersicht berechnen"
 
@@ -147,20 +147,26 @@ msgstr "Zu verbindende Inhalte müssen die gleiche Bildgröße haben."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Zu verbindende Inhalte müssen die gleiche Skalierung verwenden."
 
-#: src/lib/subtitle_content.cc:73
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Zu verbindende Inhalte müssen den gleichen horizontalen Untertitelversatz "
 "verwenden."
 
-#: src/lib/subtitle_content.cc:77
+#: src/lib/subtitle_content.cc:89
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X scale."
+msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
+
+#: src/lib/subtitle_content.cc:85
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Zu verbindende Inhalte müssen den gleichen vertikalen Untertitelversatz "
 "verwenden."
 
-#: src/lib/subtitle_content.cc:81
-msgid "Content to be joined must have the same subtitle scale."
+#: src/lib/subtitle_content.cc:93
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelgröße verwenden."
 
 #: src/lib/video_content.cc:130
@@ -289,7 +295,7 @@ msgstr "Jedes Bild der Quelle wird %1 mal im DCP wiederholt.\n"
 msgid "Email KDMs for %1"
 msgstr "Email KDMs für %1"
 
-#: src/lib/writer.cc:125
+#: src/lib/writer.cc:126
 msgid "Encoding image data"
 msgstr "Kodiere Bilddaten"
 
@@ -501,7 +507,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Zu wenig Speicher für diese Operation."
 
-#: src/lib/film.cc:412
+#: src/lib/film.cc:414
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -510,7 +516,7 @@ msgstr ""
 "kann leider nicht mit dieser älteren Version geladen werden. Sie müssen den "
 "Film neu erstellen. Sorry!"
 
-#: src/lib/film.cc:404
+#: src/lib/film.cc:406
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -572,7 +578,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Und ein weiterer De-Interlacer..."
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:311
 msgid "You must add some content to the DCP before creating it"
 msgstr "Sie müssen erst Inhalte hinzufügen bevor Sie ein DCP erstellen können!"
 
@@ -584,7 +590,7 @@ msgstr "[Bewegte Bilder]"
 msgid "[still]"
 msgstr "[Standbild]"
 
-#: src/lib/film.cc:257
+#: src/lib/film.cc:259
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
@@ -596,11 +602,11 @@ msgstr "Zeit für Verbindung abgelaufen"
 msgid "connecting"
 msgstr "verbinde..."
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:307
 msgid "container"
 msgstr "Containerformat"
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:315
 msgid "content type"
 msgstr "Inhaltsbeschreibung"
 
@@ -624,7 +630,7 @@ msgstr "Keine Spur-Information gefunden"
 msgid "could not find video decoder"
 msgstr "Bild-Dekoder nicht gefunden"
 
-#: src/lib/writer.cc:435
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
@@ -720,7 +726,7 @@ msgstr "wird verschoben"
 msgid "multi-part subtitles not yet supported"
 msgstr "Mehr-Segment Untertitel werden noch nicht unterstützt"
 
-#: src/lib/film.cc:257 src/lib/film.cc:317
+#: src/lib/film.cc:259 src/lib/film.cc:319
 msgid "name"
 msgstr "Name"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 800f9f972..fe5615e1e 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -101,11 +101,11 @@ msgstr "No se puede usar el formato de pixel %1 para %2"
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:82
+#: src/lib/writer.cc:83
 msgid "Checking existing image data"
 msgstr "Comprobando las imágenes existentes"
 
-#: src/lib/writer.cc:471
+#: src/lib/writer.cc:475
 msgid "Computing audio digest"
 msgstr "Calculando la firma resumen del audio"
 
@@ -113,7 +113,7 @@ msgstr "Calculando la firma resumen del audio"
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
-#: src/lib/writer.cc:467
+#: src/lib/writer.cc:471
 msgid "Computing image digest"
 msgstr "Calculando la firma resumen de imagen"
 
@@ -145,18 +145,24 @@ msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Para unir contenido debe tener la misma redimensión."
 
-#: src/lib/subtitle_content.cc:73
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en X."
 
-#: src/lib/subtitle_content.cc:77
+#: src/lib/subtitle_content.cc:89
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X scale."
+msgstr "Para unir contenido debe tener el mismo tamaño de subtítulo."
+
+#: src/lib/subtitle_content.cc:85
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Para unir contenido debe tener el mismo desplazamiento de subtítulo en Y."
 
-#: src/lib/subtitle_content.cc:81
-msgid "Content to be joined must have the same subtitle scale."
+#: src/lib/subtitle_content.cc:93
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Para unir contenido debe tener el mismo tamaño de subtítulo."
 
 #: src/lib/video_content.cc:130
@@ -281,7 +287,7 @@ msgstr "Cada imagen será repetida otras %1 veces en el DCP.\n"
 msgid "Email KDMs for %1"
 msgstr "Enviar por email las KDM para %1"
 
-#: src/lib/writer.cc:125
+#: src/lib/writer.cc:126
 msgid "Encoding image data"
 msgstr "Codificando imagen"
 
@@ -491,7 +497,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "No hubo suficiente memoria para hacer esto."
 
-#: src/lib/film.cc:412
+#: src/lib/film.cc:414
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -500,7 +506,7 @@ msgstr ""
 "desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
 "volver a añadir y configurar ton contenido. ¡Lo siento!"
 
-#: src/lib/film.cc:404
+#: src/lib/film.cc:406
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -562,7 +568,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:311
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
@@ -574,7 +580,7 @@ msgstr "[imágenes en movimiento]"
 msgid "[still]"
 msgstr "[imagen fija]"
 
-#: src/lib/film.cc:257
+#: src/lib/film.cc:259
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
@@ -586,11 +592,11 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:307
 msgid "container"
 msgstr "continente"
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:315
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -614,7 +620,7 @@ msgstr "no se pudo encontrar información del flujo"
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
-#: src/lib/writer.cc:435
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "no s puedo mover el audio MXF en el DCP (%1)"
 
@@ -710,7 +716,7 @@ msgstr "moviendo"
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:257 src/lib/film.cc:317
+#: src/lib/film.cc:259 src/lib/film.cc:319
 msgid "name"
 msgstr "nombre"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 55759baa3..8f26f336a 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-07-14 12:04+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -101,11 +101,11 @@ msgstr "Format du pixel %1 non géré par %2"
 msgid "Centre"
 msgstr "Centre"
 
-#: src/lib/writer.cc:82
+#: src/lib/writer.cc:83
 msgid "Checking existing image data"
 msgstr "Recherche de données images existantes"
 
-#: src/lib/writer.cc:471
+#: src/lib/writer.cc:475
 msgid "Computing audio digest"
 msgstr "Fabrication rendu audio"
 
@@ -113,7 +113,7 @@ msgstr "Fabrication rendu audio"
 msgid "Computing digest"
 msgstr "fabrication rendu"
 
-#: src/lib/writer.cc:467
+#: src/lib/writer.cc:471
 msgid "Computing image digest"
 msgstr "Fabrication rendu image"
 
@@ -146,20 +146,26 @@ msgid "Content to be joined must have the same scale setting."
 msgstr ""
 "Le contenu à ajouter doit avoir les mêmes paramètres de mise à l'échelle"
 
-#: src/lib/subtitle_content.cc:73
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement horizontal des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:77
+#: src/lib/subtitle_content.cc:89
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X scale."
+msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
+
+#: src/lib/subtitle_content.cc:85
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Le contenu à ajouter doit avoir le même positionnement vertical des sous-"
 "titres"
 
-#: src/lib/subtitle_content.cc:81
-msgid "Content to be joined must have the same subtitle scale."
+#: src/lib/subtitle_content.cc:93
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "le contenu à ajouter doit avoir le même positionnement de sous-titre"
 
 #: src/lib/video_content.cc:130
@@ -286,7 +292,7 @@ msgstr "Chaque image source sera répetée %1 fois dans le DCP.\n"
 msgid "Email KDMs for %1"
 msgstr "Envoyer KDM par email pour %1"
 
-#: src/lib/writer.cc:125
+#: src/lib/writer.cc:126
 msgid "Encoding image data"
 msgstr "encodage des données image"
 
@@ -494,7 +500,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Il n'y avait pas assez de mémoire pour faire cela."
 
-#: src/lib/film.cc:412
+#: src/lib/film.cc:414
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -502,7 +508,7 @@ msgstr ""
 "Ce film a été créé avec une nouvelle version de DCP-o-matic et il ne peut "
 "être ouvert dans cette version du programme. Désolé!"
 
-#: src/lib/film.cc:404
+#: src/lib/film.cc:406
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -564,7 +570,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:311
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
@@ -576,7 +582,7 @@ msgstr "[Déplacement d'images]"
 msgid "[still]"
 msgstr "[restant]"
 
-#: src/lib/film.cc:257
+#: src/lib/film.cc:259
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
@@ -588,11 +594,11 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:307
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:315
 msgid "content type"
 msgstr "type de contenu"
 
@@ -616,7 +622,7 @@ msgstr "information du flux introuvable"
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
-#: src/lib/writer.cc:435
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
 
@@ -714,7 +720,7 @@ msgstr "déplacement"
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:257 src/lib/film.cc:317
+#: src/lib/film.cc:259 src/lib/film.cc:319
 msgid "name"
 msgstr "nom"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 75e6928c8..d4760b9d5 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -102,11 +102,11 @@ msgstr "Non posso gestire il formato di pixel %1 durante %2"
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/writer.cc:82
+#: src/lib/writer.cc:83
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:471
+#: src/lib/writer.cc:475
 msgid "Computing audio digest"
 msgstr ""
 
@@ -114,7 +114,7 @@ msgstr ""
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:467
+#: src/lib/writer.cc:471
 msgid "Computing image digest"
 msgstr ""
 
@@ -149,19 +149,27 @@ msgid "Content to be joined must have the same scale setting."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:73
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:77
+#: src/lib/subtitle_content.cc:89
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X scale."
+msgstr ""
+"Il contenuto da unire deve avere lo stesso spostamento X dei sottotitoli."
+
+#: src/lib/subtitle_content.cc:85
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
 
-#: src/lib/subtitle_content.cc:81
-msgid "Content to be joined must have the same subtitle scale."
+#: src/lib/subtitle_content.cc:93
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y scale."
 msgstr ""
+"Il contenuto da unire deve avere lo stesso spostamento Y dei sottotitoli."
 
 #: src/lib/video_content.cc:130
 msgid "Content to be joined must have the same video frame rate."
@@ -289,7 +297,7 @@ msgstr "Ogni fotogramma del sorgente sarà ripetuto %1 volte nel DCP.\n"
 msgid "Email KDMs for %1"
 msgstr ""
 
-#: src/lib/writer.cc:125
+#: src/lib/writer.cc:126
 msgid "Encoding image data"
 msgstr ""
 
@@ -502,7 +510,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:412
+#: src/lib/film.cc:414
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -513,7 +521,7 @@ msgstr ""
 "un nuovo film, ri-aggiungere i tuoi contenuti e configurarlo di nuovo. Ci "
 "dispiace!"
 
-#: src/lib/film.cc:404
+#: src/lib/film.cc:406
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -576,7 +584,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:311
 msgid "You must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
@@ -589,7 +597,7 @@ msgstr ""
 msgid "[still]"
 msgstr "ancora"
 
-#: src/lib/film.cc:257
+#: src/lib/film.cc:259
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
@@ -601,11 +609,11 @@ msgstr "connessione scaduta"
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:307
 msgid "container"
 msgstr "contenitore"
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:315
 msgid "content type"
 msgstr "tipo di contenuto"
 
@@ -629,7 +637,7 @@ msgstr "non riesco a trovare informazioni sullo streaming"
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
-#: src/lib/writer.cc:435
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr ""
 
@@ -727,7 +735,7 @@ msgstr ""
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:257 src/lib/film.cc:317
+#: src/lib/film.cc:259 src/lib/film.cc:319
 msgid "name"
 msgstr "nome"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index b13a49a64..09f14e1ac 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-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-09-04 20:34+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -34,7 +34,7 @@ msgstr "%1 kanalen, %2kHz, %3 samples"
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 frames; %2 frames per seconde"
 
-#: src/lib/video_content.cc:213
+#: src/lib/video_content.cc:211
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -98,15 +98,15 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:786
 msgid "Centre"
 msgstr "Midden"
 
-#: src/lib/writer.cc:81
+#: src/lib/writer.cc:83
 msgid "Checking existing image data"
 msgstr "Controleer bestaande videodata"
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:475
 msgid "Computing audio digest"
 msgstr "Verwerk audio data"
 
@@ -114,7 +114,7 @@ msgstr "Verwerk audio data"
 msgid "Computing digest"
 msgstr "Verwerken..."
 
-#: src/lib/writer.cc:466
+#: src/lib/writer.cc:471
 msgid "Computing image digest"
 msgstr "Verwerk video data"
 
@@ -130,39 +130,45 @@ msgstr "Toegevoegde bestanden moeten dezelfde audio vertraging hebben."
 msgid "Content to be joined must have the same audio gain."
 msgstr "Toegevoegde bestanden moeten dezelfde audio gain hebben."
 
-#: src/lib/video_content.cc:148
+#: src/lib/video_content.cc:146
 msgid "Content to be joined must have the same colour conversion."
 msgstr "Toegevoegde bestanden moeten dezelfde kleurindeling hebben."
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:138
 msgid "Content to be joined must have the same crop."
 msgstr "Toegevoegde bestanden moeten dezelfde crop hebben."
 
-#: src/lib/video_content.cc:128
+#: src/lib/video_content.cc:126
 msgid "Content to be joined must have the same picture size."
 msgstr "Toegevoegde bestanden moeten dezelfde grootte hebben."
 
-#: src/lib/video_content.cc:144
+#: src/lib/video_content.cc:142
 msgid "Content to be joined must have the same scale setting."
 msgstr "Toegevoegde bestanden moeten dezelfde schaal hebben."
 
-#: src/lib/subtitle_content.cc:73
+#: src/lib/subtitle_content.cc:81
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel X offset hebben."
 
-#: src/lib/subtitle_content.cc:77
+#: src/lib/subtitle_content.cc:89
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X scale."
+msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
+
+#: src/lib/subtitle_content.cc:85
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel Y offset hebben."
 
-#: src/lib/subtitle_content.cc:81
-msgid "Content to be joined must have the same subtitle scale."
+#: src/lib/subtitle_content.cc:93
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Toegevoegde bestanden moeten dezelfde ondertitel grootte hebben."
 
-#: src/lib/video_content.cc:132
+#: src/lib/video_content.cc:130
 msgid "Content to be joined must have the same video frame rate."
 msgstr "Toegevoegde bestanden moeten dezelfde video frame rate hebben."
 
-#: src/lib/video_content.cc:136
+#: src/lib/video_content.cc:134
 msgid "Content to be joined must have the same video frame type."
 msgstr "Toegevoegde bestanden moeten dezelfde video formaat hebben."
 
@@ -186,8 +192,9 @@ msgstr "Kan niet verbinden met server %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kan geen remote map maken %1 (%2)"
 
-#: src/lib/image_proxy.cc:127
-msgid "Could not decode image file"
+#: src/lib/image_proxy.cc:147
+#, fuzzy
+msgid "Could not decode image file (%1)"
 msgstr "Kan beeldbestand niet decoderen"
 
 #: src/lib/job.cc:90
@@ -198,7 +205,7 @@ msgstr "Kan niet openen %1"
 msgid "Could not open %1 to send"
 msgstr "Kan niet openen %1 om te verzenden"
 
-#: src/lib/internet.cc:72
+#: src/lib/internet.cc:74
 msgid "Could not open downloaded ZIP file"
 msgstr "Kan gedownloade ZIP bestand niet openen"
 
@@ -237,7 +244,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:440
+#: src/lib/config.cc:436
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -266,7 +273,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP650 and CP750"
 
-#: src/lib/internet.cc:65
+#: src/lib/internet.cc:67
 msgid "Download failed (%1/%2 error %3)"
 msgstr "Fout met download(%1/%2 error %3)"
 
@@ -282,7 +289,7 @@ msgstr "Elk content frame zal %1  herhaald worden in de DCP.\n"
 msgid "Email KDMs for %1"
 msgstr "Email KDMs voor %1"
 
-#: src/lib/writer.cc:124
+#: src/lib/writer.cc:126
 msgid "Encoding image data"
 msgstr "Encoding bestandsdata"
 
@@ -322,7 +329,7 @@ msgstr "Gaussian"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:790
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -338,7 +345,7 @@ msgstr ""
 "Dit is een onbekende fout. U kunt deze het beste melden bij de DCP-o-matic "
 "maker (carl@dcpomatic.com)"
 
-#: src/lib/config.cc:196
+#: src/lib/config.cc:199
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM levering: $CPL_NAME"
 
@@ -350,23 +357,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:784
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:792
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:794
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:788
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:787
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -378,11 +385,11 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content.cc:498
+#: src/lib/video_content_scale.cc:105
 msgid "No scale"
 msgstr "Niet vergroten of verkleinen"
 
-#: src/lib/video_content.cc:495
+#: src/lib/video_content_scale.cc:102
 msgid "No stretch"
 msgstr "Niet uitvullen"
 
@@ -430,23 +437,23 @@ msgstr "Publieke Service aankondiging"
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/config.cc:86 src/lib/config.cc:180
+#: src/lib/config.cc:86 src/lib/config.cc:183
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:785
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:793
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:795
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:789
 msgid "Right surround"
 msgstr "Rechts surround"
 
@@ -494,7 +501,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr "Er was niet genoeg geheugen om dit uit te voeren."
 
-#: src/lib/film.cc:412
+#: src/lib/film.cc:414
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -502,7 +509,7 @@ msgstr ""
 "Deze film is gemaakt met een nieuwere versie van DCP-o-matic en kan niet "
 "geopend worden. Sorry!"
 
-#: src/lib/film.cc:404
+#: src/lib/film.cc:406
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -524,11 +531,11 @@ msgstr "Omzetten %1"
 msgid "Transitional"
 msgstr "Bumper"
 
-#: src/lib/internet.cc:77
+#: src/lib/internet.cc:79
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:173
+#: src/lib/image_proxy.cc:193
 msgid "Unexpected image type received by server"
 msgstr "Onverwacht beeldtype ontvangen door server"
 
@@ -548,7 +555,7 @@ msgstr "Unsharp mask and Gaussian blur"
 msgid "Untitled"
 msgstr "Niet benoemd"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:791
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -564,7 +571,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:311
 msgid "You must add some content to the DCP before creating it"
 msgstr "U moet wat content toevoegen voor het maken van de DCP"
 
@@ -576,11 +583,11 @@ msgstr "[bewegend beeld]"
 msgid "[still]"
 msgstr "[still]"
 
-#: src/lib/film.cc:257
+#: src/lib/film.cc:259
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
-#: src/lib/util.cc:558
+#: src/lib/util.cc:565
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
@@ -588,11 +595,11 @@ msgstr "verbinding timeout"
 msgid "connecting"
 msgstr "verbinden"
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:307
 msgid "container"
 msgstr "container"
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:315
 msgid "content type"
 msgstr "content type"
 
@@ -616,7 +623,7 @@ msgstr "kan geen stream informatie vinden"
 msgid "could not find video decoder"
 msgstr "kan geen videodecoder vinden"
 
-#: src/lib/writer.cc:434
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kan MXF audio niet plaatsen in DCP (%1)"
 
@@ -660,19 +667,19 @@ msgstr "kan SSH sessie niet starten"
 msgid "could not write to file %1 (%2)"
 msgstr "kan niet schrijven naar bestand %1 (%2)"
 
-#: src/lib/util.cc:578
+#: src/lib/util.cc:585
 msgid "error during async_accept (%1)"
 msgstr "fout met async_accepteren (FTP) (%1)"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:561
 msgid "error during async_connect (%1)"
 msgstr "fout met async_verbinden (FTP) (%1)"
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:634
 msgid "error during async_read (%1)"
 msgstr "fout met async_lezen (FTP) (%1)"
 
-#: src/lib/util.cc:599
+#: src/lib/util.cc:606
 msgid "error during async_write (%1)"
 msgstr "fout met async_schrijven (FTP) (%1)"
 
@@ -696,7 +703,7 @@ msgstr "minuut"
 msgid "minutes"
 msgstr "minuten"
 
-#: src/lib/util.cc:699
+#: src/lib/util.cc:706
 msgid "missing key %1 in key-value set"
 msgstr "ontbrekende key %1 in key-value set"
 
@@ -712,7 +719,7 @@ msgstr "bewegend"
 msgid "multi-part subtitles not yet supported"
 msgstr "ondertitels met meerdere delen worden nog niet ondersteund."
 
-#: src/lib/film.cc:257 src/lib/film.cc:317
+#: src/lib/film.cc:259 src/lib/film.cc:319
 msgid "name"
 msgstr "naam"
 
@@ -726,7 +733,7 @@ msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 msgid "remaining"
 msgstr "resterend"
 
-#: src/lib/config.cc:84 src/lib/video_content.cc:181
+#: src/lib/config.cc:84 src/lib/video_content.cc:179
 msgid "sRGB"
 msgstr "sRGB"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 2b96dd2e2..32843da7a 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -101,11 +101,11 @@ msgstr "Kan inte hantera pixelformat %1 under %2"
 msgid "Centre"
 msgstr "Center"
 
-#: src/lib/writer.cc:82
+#: src/lib/writer.cc:83
 msgid "Checking existing image data"
 msgstr "Kontrollerar befintligt bilddata"
 
-#: src/lib/writer.cc:471
+#: src/lib/writer.cc:475
 msgid "Computing audio digest"
 msgstr "Beräknar audiosammanfattning"
 
@@ -113,7 +113,7 @@ msgstr "Beräknar audiosammanfattning"
 msgid "Computing digest"
 msgstr "Beräknar sammanfattning"
 
-#: src/lib/writer.cc:467
+#: src/lib/writer.cc:471
 msgid "Computing image digest"
 msgstr "Beräknar bildsammanfattning"
 
@@ -146,20 +146,26 @@ msgstr "Innehåll som ska sammanfogas måste använda samma bildstorlek."
 msgid "Content to be joined must have the same scale setting."
 msgstr "Innehåll som ska sammanfogas måste använda samma bildförhållande."
 
-#: src/lib/subtitle_content.cc:73
+#: src/lib/subtitle_content.cc:81
 #, fuzzy
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr ""
 "Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
 
-#: src/lib/subtitle_content.cc:77
+#: src/lib/subtitle_content.cc:89
+#, fuzzy
+msgid "Content to be joined must have the same subtitle X scale."
+msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
+
+#: src/lib/subtitle_content.cc:85
 #, fuzzy
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr ""
 "Innehåll som ska sammanfogas måste använda samma förskjutning på undertexten."
 
-#: src/lib/subtitle_content.cc:81
-msgid "Content to be joined must have the same subtitle scale."
+#: src/lib/subtitle_content.cc:93
+#, fuzzy
+msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "Innehåll som ska sammanfogas måste använda samma skala på undertexten."
 
 #: src/lib/video_content.cc:130
@@ -285,7 +291,7 @@ msgstr ""
 msgid "Email KDMs for %1"
 msgstr "E-posta KDM:er för %1"
 
-#: src/lib/writer.cc:125
+#: src/lib/writer.cc:126
 msgid "Encoding image data"
 msgstr "Kodar bild-data"
 
@@ -498,7 +504,7 @@ msgstr ""
 msgid "There was not enough memory to do this."
 msgstr ""
 
-#: src/lib/film.cc:412
+#: src/lib/film.cc:414
 #, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
@@ -508,7 +514,7 @@ msgstr ""
 "inte öppnas i denna version. Du måste skapa en ny Film, lägga till ditt "
 "innehåll och konfigurera allt igen. Ursäkta!"
 
-#: src/lib/film.cc:404
+#: src/lib/film.cc:406
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -572,7 +578,7 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:311
 msgid "You must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
@@ -584,7 +590,7 @@ msgstr "[rörliga bilder]"
 msgid "[still]"
 msgstr "[stillbild]"
 
-#: src/lib/film.cc:257
+#: src/lib/film.cc:259
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
@@ -597,11 +603,11 @@ msgstr "uppkopplingen tajmade ur"
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:307
 msgid "container"
 msgstr "behållare"
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:315
 msgid "content type"
 msgstr "innehållstyp"
 
@@ -625,7 +631,7 @@ msgstr "kunde inte hitta information om strömmen"
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
-#: src/lib/writer.cc:435
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)"
 
@@ -723,7 +729,7 @@ msgstr "rörlig"
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:257 src/lib/film.cc:317
+#: src/lib/film.cc:259 src/lib/film.cc:319
 msgid "name"
 msgstr "namn"
 
diff --git a/src/lib/server.cc b/src/lib/server.cc
index d2c573c1b..a699be577 100644
--- a/src/lib/server.cc
+++ b/src/lib/server.cc
@@ -252,6 +252,9 @@ Server::broadcast_received ()
 		root->add_child("Threads")->add_child_text (raw_convert<string> (_worker_threads.size ()));
 		string xml = doc.write_to_string ("UTF-8");
 
+		if (_verbose) {
+			cout << "Offering services to master " << _broadcast.send_endpoint.address().to_string () << "\n";
+		}
 		shared_ptr<Socket> socket (new Socket);
 		try {
 			socket->connect (boost::asio::ip::tcp::endpoint (_broadcast.send_endpoint.address(), Config::instance()->server_port_base() + 1));
diff --git a/src/lib/server_finder.cc b/src/lib/server_finder.cc
index 14cb3af59..637103591 100644
--- a/src/lib/server_finder.cc
+++ b/src/lib/server_finder.cc
@@ -102,24 +102,31 @@ void
 ServerFinder::listen_thread ()
 try
 {
+	using namespace boost::asio::ip;
+
+	boost::asio::io_service io_service;
+	tcp::acceptor acceptor (io_service, tcp::endpoint (tcp::v4(), Config::instance()->server_port_base() + 1));
+
 	while (true) {
-		shared_ptr<Socket> sock (new Socket (60));
+		tcp::socket socket (io_service);
+		acceptor.accept (socket);
 
-		try {
-			sock->accept (Config::instance()->server_port_base() + 1);
-		} catch (std::exception& e) {
-			continue;
-		}
+		/* XXX: these reads should have timeouts, otherwise we will stop finding servers
+		   if one dies during this conversation
+		*/
+
+		uint32_t length = 0;
+		boost::asio::read (socket, boost::asio::buffer (&length, sizeof (uint32_t)));
+		length = ntohl (length);
 
-		uint32_t length = sock->read_uint32 ();
 		scoped_array<char> buffer (new char[length]);
-		sock->read (reinterpret_cast<uint8_t*> (buffer.get()), length);
+		boost::asio::read (socket, boost::asio::buffer (reinterpret_cast<uint8_t*> (buffer.get ()), length));
 		
 		string s (buffer.get());
 		shared_ptr<cxml::Document> xml (new cxml::Document ("ServerAvailable"));
 		xml->read_string (s);
-
-		string const ip = sock->socket().remote_endpoint().address().to_string ();
+		
+		string const ip = socket.remote_endpoint().address().to_string ();
 		if (!server_found (ip)) {
 			ServerDescription sd (ip, xml->number_child<int> ("Threads"));
 			_servers.push_back (sd);
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 344a9f97d..e0db5de2e 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -565,7 +565,7 @@ Socket::accept (int port)
 	_acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1);
 	do {
 		_io_service.run_one ();
-	} while (ec == boost::asio::error::would_block );
+	} while (ec == boost::asio::error::would_block);
 
 	delete _acceptor;
 	_acceptor = 0;
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 6635d396a..24ed468a8 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-07-13 03:04+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:298
+#: src/tools/dcpomatic.cc:306
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "%1 existiert bereits als Datei, kann also nicht für einen neuen Film benutzt "
@@ -28,67 +28,70 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "&Projekt hinzufügen"
 
-#: src/tools/dcpomatic.cc:644
+#: src/tools/dcpomatic.cc:652
 msgid "&Content"
 msgstr "&Quelle..."
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:650
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: src/tools/dcpomatic.cc:606
+#: src/tools/dcpomatic.cc:614
 msgid "&Exit"
 msgstr "&Ende"
 
-#: src/tools/dcpomatic.cc:640 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Datei"
 
-#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:653
 msgid "&Jobs"
 msgstr "&Aufgaben"
 
-#: src/tools/dcpomatic.cc:623
-msgid "&Make DCP"
-msgstr "&DCP erstellen"
+#: src/tools/dcpomatic.cc:631
+#, fuzzy
+msgid "&Make DCP\tCtrl-M"
+msgstr "&DCP erstellen\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:593
-msgid "&Open..."
-msgstr "&Öffnen..."
+#: src/tools/dcpomatic.cc:601
+#, fuzzy
+msgid "&Open...\tCtrl-O"
+msgstr "&Öffnen...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:612 src/tools/dcpomatic.cc:615
-msgid "&Preferences..."
-msgstr "&Einstellungen..."
+#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#, fuzzy
+msgid "&Preferences...\tCtrl-P"
+msgstr "&Einstellungen...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:597
+#: src/tools/dcpomatic.cc:605
 msgid "&Properties..."
 msgstr "&Eigenschaften..."
 
-#: src/tools/dcpomatic.cc:608 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: src/tools/dcpomatic.cc:595
-msgid "&Save"
-msgstr "&Speichern"
+#: src/tools/dcpomatic.cc:603
+msgid "&Save\tCtrl-S"
+msgstr ""
 
-#: src/tools/dcpomatic.cc:625
+#: src/tools/dcpomatic.cc:633
 msgid "&Send DCP to TMS"
 msgstr "&DCP an TMS senden"
 
-#: src/tools/dcpomatic.cc:646
+#: src/tools/dcpomatic.cc:654
 msgid "&Tools"
 msgstr "&Werkzeuge"
 
-#: src/tools/dcpomatic.cc:637 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Über"
 
-#: src/tools/dcpomatic.cc:635
+#: src/tools/dcpomatic.cc:643
 msgid "About DCP-o-matic"
 msgstr "Über DCP-o-matic"
 
@@ -96,7 +99,7 @@ msgstr "Über DCP-o-matic"
 msgid "Add Film..."
 msgstr "Projekt hinzufügen..."
 
-#: src/tools/dcpomatic.cc:813
+#: src/tools/dcpomatic.cc:821
 #, fuzzy, c-format
 msgid ""
 "An exception occurred (%s).  Please report this problem to the DCP-o-matic "
@@ -105,7 +108,7 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
 "den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
-#: src/tools/dcpomatic.cc:815 src/tools/dcpomatic.cc:824
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -113,38 +116,38 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
 "den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
-#: src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:418
 msgid "An unknown exeception occurred."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/tools/dcpomatic.cc:406
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Medien der CPL sind nicht verschlüsselt worden."
 
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:639
 msgid "Check for updates"
 msgstr "Auf Updates überprüfen..."
 
-#: src/tools/dcpomatic.cc:752 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Film %1 (%2) konnte nicht geladen werden"
 
-#: src/tools/dcpomatic.cc:249 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Der Film konnte nicht bei %s (%s) geöffnet werden"
 
-#: src/tools/dcpomatic.cc:456
+#: src/tools/dcpomatic.cc:464
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 "DCP kann nicht angezeigt werden (Konqueror konnte nicht gestartet werden)"
 
-#: src/tools/dcpomatic.cc:449
+#: src/tools/dcpomatic.cc:457
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "DCP kann nicht angezeigt werden (Nautilus konnte nicht geladen werden)"
 
-#: src/tools/dcpomatic.cc:269 src/tools/dcpomatic.cc:707
-#: src/tools/dcpomatic.cc:743
+#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
+#: src/tools/dcpomatic.cc:751
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -152,7 +155,7 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic Batch Converter"
 
-#: src/tools/dcpomatic.cc:630
+#: src/tools/dcpomatic.cc:638
 msgid "Encoding servers..."
 msgstr "Encoding Server..."
 
@@ -160,19 +163,19 @@ msgstr "Encoding Server..."
 msgid "Film changed"
 msgstr "Projekt gewechselt"
 
-#: src/tools/dcpomatic.cc:629
-msgid "Hints..."
-msgstr "Tipps..."
+#: src/tools/dcpomatic.cc:637
+msgid "Hints...\tCtrl-H"
+msgstr "Tipps...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:624
-msgid "Make &KDMs..."
-msgstr "&KDM erstellen..."
+#: src/tools/dcpomatic.cc:632
+msgid "Make &KDMs...\tCtrl-K"
+msgstr "&KDM erstellen...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:592
-msgid "New..."
-msgstr "Neu..."
+#: src/tools/dcpomatic.cc:600
+msgid "New...\tCtrl-N"
+msgstr "Neu...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:626
+#: src/tools/dcpomatic.cc:634
 msgid "S&how DCP"
 msgstr "Z&eige DCP"
 
@@ -181,19 +184,19 @@ msgstr "Z&eige DCP"
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
-#: src/tools/dcpomatic.cc:620
+#: src/tools/dcpomatic.cc:628
 msgid "Scale to fit &height"
 msgstr "...skalieren auf &Höhe DCI-Container"
 
-#: src/tools/dcpomatic.cc:619
+#: src/tools/dcpomatic.cc:627
 msgid "Scale to fit &width"
 msgstr "...skalieren auf &Breite DCI-Container"
 
-#: src/tools/dcpomatic.cc:314 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Zu öffnendes Projekt auswählen"
 
-#: src/tools/dcpomatic.cc:377
+#: src/tools/dcpomatic.cc:385
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -202,11 +205,11 @@ msgstr ""
 "Das DCP für diesen Film wird etwa %.1f Gbyte groß. Auf dem ausgewählten "
 "Laufwerk sind aber nur %.1f Gbyte frei. Möchten Sie trotzdem weitermachen ?"
 
-#: src/tools/dcpomatic.cc:862
+#: src/tools/dcpomatic.cc:870
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Der DCP-o-matic Download Server ist nicht erreichbar."
 
-#: src/tools/dcpomatic.cc:288
+#: src/tools/dcpomatic.cc:296
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -214,17 +217,17 @@ msgstr ""
 "Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
 "benutzen ?"
 
-#: src/tools/dcpomatic.cc:857
+#: src/tools/dcpomatic.cc:865
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Es ist keine neue Version von DCP-o-matic verfügbar."
 
-#: src/tools/dcpomatic.cc:501 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Manche Aufgaben sind nicht erledigt - sind Sie sicher, dass Sie Beenden "
 "wollen ?"
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:243
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -233,16 +236,19 @@ msgstr ""
 "worden und wird in dieser Programmversion möglicherweise nicht korrekt "
 "umgesetzt. Bitte prüfen Sie alle Projekteinstellungen sorgfältig!"
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Unerledigte Aufgaben"
 
-#: src/tools/dcpomatic.cc:323 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr "Kein Ordner ausgewählt. Wählen Sie vor dem Öffnen einen Ordner aus."
 
+#~ msgid "&Save"
+#~ msgstr "&Speichern"
+
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 1d8b5e573..f6d2e4439 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.4\n"
 
-#: src/tools/dcpomatic.cc:298
+#: src/tools/dcpomatic.cc:306
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
 
@@ -25,67 +25,70 @@ msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
 msgid "&Add Film..."
 msgstr "&Añadir película..."
 
-#: src/tools/dcpomatic.cc:644
+#: src/tools/dcpomatic.cc:652
 msgid "&Content"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:650
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:606
+#: src/tools/dcpomatic.cc:614
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:640 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:653
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:623
-msgid "&Make DCP"
-msgstr "&Crear DCP"
+#: src/tools/dcpomatic.cc:631
+#, fuzzy
+msgid "&Make DCP\tCtrl-M"
+msgstr "&Crear DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:593
-msgid "&Open..."
-msgstr "&Abrir..."
+#: src/tools/dcpomatic.cc:601
+#, fuzzy
+msgid "&Open...\tCtrl-O"
+msgstr "&Abrir...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:612 src/tools/dcpomatic.cc:615
-msgid "&Preferences..."
-msgstr "&Preferencias..."
+#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#, fuzzy
+msgid "&Preferences...\tCtrl-P"
+msgstr "&Preferencias...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:597
+#: src/tools/dcpomatic.cc:605
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dcpomatic.cc:608 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:595
-msgid "&Save"
-msgstr "&Guardar"
+#: src/tools/dcpomatic.cc:603
+msgid "&Save\tCtrl-S"
+msgstr ""
 
-#: src/tools/dcpomatic.cc:625
+#: src/tools/dcpomatic.cc:633
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:646
+#: src/tools/dcpomatic.cc:654
 msgid "&Tools"
 msgstr "&Herramientas"
 
-#: src/tools/dcpomatic.cc:637 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:635
+#: src/tools/dcpomatic.cc:643
 msgid "About DCP-o-matic"
 msgstr "Acerca de DVD-o-matic"
 
@@ -93,50 +96,50 @@ msgstr "Acerca de DVD-o-matic"
 msgid "Add Film..."
 msgstr "Añadir película..."
 
-#: src/tools/dcpomatic.cc:813
+#: src/tools/dcpomatic.cc:821
 #, c-format
 msgid ""
 "An exception occurred (%s).  Please report this problem to the DCP-o-matic "
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:815 src/tools/dcpomatic.cc:824
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:418
 msgid "An unknown exeception occurred."
 msgstr "Ha ocurrido un error desconocido."
 
-#: src/tools/dcpomatic.cc:406
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:639
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
-#: src/tools/dcpomatic.cc:752 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:249 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "No se pudo cargar la película en %s (%s)"
 
-#: src/tools/dcpomatic.cc:456
+#: src/tools/dcpomatic.cc:464
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar konqueror)"
 
-#: src/tools/dcpomatic.cc:449
+#: src/tools/dcpomatic.cc:457
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilos)"
 
-#: src/tools/dcpomatic.cc:269 src/tools/dcpomatic.cc:707
-#: src/tools/dcpomatic.cc:743
+#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
+#: src/tools/dcpomatic.cc:751
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -144,7 +147,7 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "Convertidor por lotes DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:630
+#: src/tools/dcpomatic.cc:638
 msgid "Encoding servers..."
 msgstr "Servidores de codificación..."
 
@@ -152,19 +155,22 @@ msgstr "Servidores de codificación..."
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dcpomatic.cc:629
-msgid "Hints..."
-msgstr "Pistas..."
+#: src/tools/dcpomatic.cc:637
+#, fuzzy
+msgid "Hints...\tCtrl-H"
+msgstr "Pistas...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:624
-msgid "Make &KDMs..."
-msgstr "Crear &KDMs..."
+#: src/tools/dcpomatic.cc:632
+#, fuzzy
+msgid "Make &KDMs...\tCtrl-K"
+msgstr "Crear &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:592
-msgid "New..."
-msgstr "Nuevo..."
+#: src/tools/dcpomatic.cc:600
+#, fuzzy
+msgid "New...\tCtrl-N"
+msgstr "Nuevo...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:626
+#: src/tools/dcpomatic.cc:634
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
@@ -173,19 +179,19 @@ msgstr "&Mostrar DCP"
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar cambios de la película \"%s\" antes de cerrar?"
 
-#: src/tools/dcpomatic.cc:620
+#: src/tools/dcpomatic.cc:628
 msgid "Scale to fit &height"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:619
+#: src/tools/dcpomatic.cc:627
 msgid "Scale to fit &width"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:314 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic.cc:377
+#: src/tools/dcpomatic.cc:385
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -195,26 +201,26 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:862
+#: src/tools/dcpomatic.cc:870
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:288
+#: src/tools/dcpomatic.cc:296
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 "El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
 
-#: src/tools/dcpomatic.cc:857
+#: src/tools/dcpomatic.cc:865
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:501 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Hay trabajos sin finalizar; ¿estás seguro de querer cerrar?"
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:243
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -223,11 +229,11 @@ msgstr ""
 "cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
 "opciones."
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
-#: src/tools/dcpomatic.cc:323 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -235,6 +241,9 @@ msgstr ""
 "No has seleccionado una carpeta. Asegúrate de seleccionar una antes de "
 "pinchar sobre Abrir."
 
+#~ msgid "&Save"
+#~ msgstr "&Guardar"
+
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 7b0a3671b..86994dc71 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-07-14 10:43+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.6\n"
 
-#: src/tools/dcpomatic.cc:298
+#: src/tools/dcpomatic.cc:306
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "Le fichier %1 existe déjà, vous ne pouvez l'utiliser pour un nouveau projet."
@@ -26,67 +26,70 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "&Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:644
+#: src/tools/dcpomatic.cc:652
 msgid "&Content"
 msgstr "&Contenu"
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:650
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:606
+#: src/tools/dcpomatic.cc:614
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:640 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:653
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:623
-msgid "&Make DCP"
-msgstr "&Créer le DCP"
+#: src/tools/dcpomatic.cc:631
+#, fuzzy
+msgid "&Make DCP\tCtrl-M"
+msgstr "&Créer le DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:593
-msgid "&Open..."
-msgstr "&Ouvrir..."
+#: src/tools/dcpomatic.cc:601
+#, fuzzy
+msgid "&Open...\tCtrl-O"
+msgstr "&Ouvrir...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:612 src/tools/dcpomatic.cc:615
-msgid "&Preferences..."
-msgstr "&Préférences..."
+#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#, fuzzy
+msgid "&Preferences...\tCtrl-P"
+msgstr "&Préférences...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:597
+#: src/tools/dcpomatic.cc:605
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dcpomatic.cc:608 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:595
-msgid "&Save"
-msgstr "&Enregistrer"
+#: src/tools/dcpomatic.cc:603
+msgid "&Save\tCtrl-S"
+msgstr ""
 
-#: src/tools/dcpomatic.cc:625
+#: src/tools/dcpomatic.cc:633
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP au TMS"
 
-#: src/tools/dcpomatic.cc:646
+#: src/tools/dcpomatic.cc:654
 msgid "&Tools"
 msgstr "&Outils"
 
-#: src/tools/dcpomatic.cc:637 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "A propos"
 
-#: src/tools/dcpomatic.cc:635
+#: src/tools/dcpomatic.cc:643
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
@@ -94,7 +97,7 @@ msgstr "À propos de DCP-o-matic"
 msgid "Add Film..."
 msgstr "Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:813
+#: src/tools/dcpomatic.cc:821
 #, fuzzy, c-format
 msgid ""
 "An exception occurred (%s).  Please report this problem to the DCP-o-matic "
@@ -103,7 +106,7 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:815 src/tools/dcpomatic.cc:824
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -111,37 +114,37 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:418
 msgid "An unknown exeception occurred."
 msgstr "Exception inconnue"
 
-#: src/tools/dcpomatic.cc:406
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Le contenu du CPL n'est pas crypté."
 
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:639
 msgid "Check for updates"
 msgstr "Recherche mises à jour"
 
-#: src/tools/dcpomatic.cc:752 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:249 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:456
+#: src/tools/dcpomatic.cc:464
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
-#: src/tools/dcpomatic.cc:449
+#: src/tools/dcpomatic.cc:457
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
-#: src/tools/dcpomatic.cc:269 src/tools/dcpomatic.cc:707
-#: src/tools/dcpomatic.cc:743
+#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
+#: src/tools/dcpomatic.cc:751
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -149,7 +152,7 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic - Convertisseur par lots"
 
-#: src/tools/dcpomatic.cc:630
+#: src/tools/dcpomatic.cc:638
 msgid "Encoding servers..."
 msgstr "Serveurs d'encodage"
 
@@ -157,19 +160,20 @@ msgstr "Serveurs d'encodage"
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dcpomatic.cc:629
-msgid "Hints..."
-msgstr "Conseils..."
+#: src/tools/dcpomatic.cc:637
+#, fuzzy
+msgid "Hints...\tCtrl-H"
+msgstr "Conseils...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:624
-msgid "Make &KDMs..."
-msgstr "Générer &KDMs..."
+#: src/tools/dcpomatic.cc:632
+msgid "Make &KDMs...\tCtrl-K"
+msgstr "Générer &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:592
-msgid "New..."
-msgstr "Nouveau..."
+#: src/tools/dcpomatic.cc:600
+msgid "New...\tCtrl-N"
+msgstr "Nouveau...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:626
+#: src/tools/dcpomatic.cc:634
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
@@ -178,19 +182,19 @@ msgstr "Voir le DCP"
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:620
+#: src/tools/dcpomatic.cc:628
 msgid "Scale to fit &height"
 msgstr "Adapter pour remplir la &hauteur"
 
-#: src/tools/dcpomatic.cc:619
+#: src/tools/dcpomatic.cc:627
 msgid "Scale to fit &width"
 msgstr "Adapter pour remplir la largeur"
 
-#: src/tools/dcpomatic.cc:314 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic.cc:377
+#: src/tools/dcpomatic.cc:385
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -199,26 +203,26 @@ msgstr ""
 "Le DCP de ce film pèsera environ %.1f Go. Le disque que vous utilisez n'a "
 "que %.1f Go disponible(s). Souhaitez-vous continuer?"
 
-#: src/tools/dcpomatic.cc:862
+#: src/tools/dcpomatic.cc:870
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
 
-#: src/tools/dcpomatic.cc:288
+#: src/tools/dcpomatic.cc:296
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 "Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
 
-#: src/tools/dcpomatic.cc:857
+#: src/tools/dcpomatic.cc:865
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Aucune mise à jour disponible pour DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:501 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Il y a des tâches inachevées ; voulez-vous vraiment quitter ?"
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:243
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -227,11 +231,11 @@ msgstr ""
 "être ouvert correctement dans cette version. Veuillez vérifier les "
 "paramètres de réglages très attentivement."
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Travaux incomplets"
 
-#: src/tools/dcpomatic.cc:323 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -239,6 +243,9 @@ msgstr ""
 "Aucun dossier sélectionné. Selectionnez un dossier avant de cliquer sur "
 "Ouvrir"
 
+#~ msgid "&Save"
+#~ msgstr "&Enregistrer"
+
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 13d6bd92c..56b050df0 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:298
+#: src/tools/dcpomatic.cc:306
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 
@@ -25,67 +25,67 @@ msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:644
+#: src/tools/dcpomatic.cc:652
 msgid "&Content"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:650
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:606
+#: src/tools/dcpomatic.cc:614
 msgid "&Exit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:640 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:653
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dcpomatic.cc:623
-msgid "&Make DCP"
-msgstr "&Crea DCP"
+#: src/tools/dcpomatic.cc:631
+msgid "&Make DCP\tCtrl-M"
+msgstr "&Crea DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:593
-msgid "&Open..."
-msgstr "&Apri..."
+#: src/tools/dcpomatic.cc:601
+msgid "&Open...\tCtrl-O"
+msgstr "&Apri...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:612 src/tools/dcpomatic.cc:615
-msgid "&Preferences..."
-msgstr "&Preferenze..."
+#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+msgid "&Preferences...\tCtrl-P"
+msgstr "&Preferenze...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:597
+#: src/tools/dcpomatic.cc:605
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dcpomatic.cc:608 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:595
-msgid "&Save"
-msgstr "&Salva"
+#: src/tools/dcpomatic.cc:603
+msgid "&Save\tCtrl-S"
+msgstr ""
 
-#: src/tools/dcpomatic.cc:625
+#: src/tools/dcpomatic.cc:633
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:646
+#: src/tools/dcpomatic.cc:654
 msgid "&Tools"
 msgstr "&Strumenti"
 
-#: src/tools/dcpomatic.cc:637 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:635
+#: src/tools/dcpomatic.cc:643
 msgid "About DCP-o-matic"
 msgstr "Su DVD-o-matic"
 
@@ -93,50 +93,50 @@ msgstr "Su DVD-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:813
+#: src/tools/dcpomatic.cc:821
 #, c-format
 msgid ""
 "An exception occurred (%s).  Please report this problem to the DCP-o-matic "
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:815 src/tools/dcpomatic.cc:824
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:418
 msgid "An unknown exeception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:406
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:639
 msgid "Check for updates"
 msgstr "Controlla aggiornamenti"
 
-#: src/tools/dcpomatic.cc:752 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:249 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:456
+#: src/tools/dcpomatic.cc:464
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:449
+#: src/tools/dcpomatic.cc:457
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:269 src/tools/dcpomatic.cc:707
-#: src/tools/dcpomatic.cc:743
+#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
+#: src/tools/dcpomatic.cc:751
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -144,7 +144,7 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:630
+#: src/tools/dcpomatic.cc:638
 msgid "Encoding servers..."
 msgstr ""
 
@@ -152,19 +152,19 @@ msgstr ""
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dcpomatic.cc:629
-msgid "Hints..."
-msgstr "Suggerimenti..."
+#: src/tools/dcpomatic.cc:637
+msgid "Hints...\tCtrl-H"
+msgstr "Suggerimenti...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:624
-msgid "Make &KDMs..."
+#: src/tools/dcpomatic.cc:632
+msgid "Make &KDMs...\tCtrl-K"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:592
-msgid "New..."
-msgstr "Nuovo"
+#: src/tools/dcpomatic.cc:600
+msgid "New...\tCtrl-N"
+msgstr "Nuovo...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:626
+#: src/tools/dcpomatic.cc:634
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
@@ -173,19 +173,19 @@ msgstr "&Mostra DCP"
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:620
+#: src/tools/dcpomatic.cc:628
 msgid "Scale to fit &height"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:619
+#: src/tools/dcpomatic.cc:627
 msgid "Scale to fit &width"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:314 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic.cc:377
+#: src/tools/dcpomatic.cc:385
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -194,35 +194,35 @@ msgstr ""
 "Il DCP di questo film occupa %.1f Gb, ma il disco che stai usando dispone di "
 "%.1f Gb liberi.  Vuoi continuare ugualmente?"
 
-#: src/tools/dcpomatic.cc:862
+#: src/tools/dcpomatic.cc:870
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Il download server di DCP-o-matic non può essere contattato."
 
-#: src/tools/dcpomatic.cc:288
+#: src/tools/dcpomatic.cc:296
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
-#: src/tools/dcpomatic.cc:857
+#: src/tools/dcpomatic.cc:865
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Non ci sono nuove versioni di DCP-o-matic disponibili."
 
-#: src/tools/dcpomatic.cc:501 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "C'è un processo in corso: sei sicuro di voler uscire?"
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:243
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Processo in corso"
 
-#: src/tools/dcpomatic.cc:323 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -230,6 +230,9 @@ msgstr ""
 "Non hai selezionato una cartella. Assicurati di selezionare una cartella "
 "prima di cliccare Apri."
 
+#~ msgid "&Save"
+#~ msgstr "&Salva"
+
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 48bd71306..f6d076d69 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-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-09-04 20:29+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -18,83 +18,77 @@ msgstr ""
 "X-Generator: Poedit 1.6.9\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:298
+#: src/tools/dcpomatic.cc:306
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "%1 Dit bestand bestaat al, hierdoor kunt u het niet gebruiken voor een "
 "nieuwe film"
 
-#: src/tools/dcpomatic_batch.cc:49
+#: src/tools/dcpomatic_batch.cc:50
 msgid "&Add Film..."
 msgstr "Open een DCP map"
 
-#: src/tools/dcpomatic.cc:639
+#: src/tools/dcpomatic.cc:652
 msgid "&Content"
 msgstr "&Content"
 
-#: src/tools/dcpomatic.cc:637
+#: src/tools/dcpomatic.cc:650
 msgid "&Edit"
 msgstr "&Edit"
 
-#: src/tools/dcpomatic.cc:601
+#: src/tools/dcpomatic.cc:614
 msgid "&Exit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:635 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Bestand"
 
-#: src/tools/dcpomatic.cc:642 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Help"
 
-#: src/tools/dcpomatic.cc:640
+#: src/tools/dcpomatic.cc:653
 msgid "&Jobs"
 msgstr "&Projecten"
 
-#: src/tools/dcpomatic.cc:618
-msgid "&Make DCP"
-msgstr "&Maak een DCP"
+#: src/tools/dcpomatic.cc:
+msgid "&Make DCP\tCtrl-M"
+msgstr "&Maak een DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:588
-msgid "&Open..."
-msgstr "&Openen..."
+#: src/tools/dcpomatic.cc:601
+msgid "&Open...\tCtrl-O"
+msgstr "&Openen...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:607 src/tools/dcpomatic.cc:610
-msgid "&Preferences..."
-msgstr "&Voorkeuren..."
+#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+msgid "&Preferences...\tCtrl-P"
+msgstr "&Voorkeuren...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:592
+#: src/tools/dcpomatic.cc:605
 msgid "&Properties..."
 msgstr "&Instellingen..."
 
-#: src/tools/dcpomatic.cc:603 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:590
-msgid "&Save"
-msgstr "&Opslaan"
+#: src/tools/dcpomatic.cc:603
+msgid "&Save\tCtrl-S"
+msgstr ""
 
-#: src/tools/dcpomatic.cc:620
+#: src/tools/dcpomatic.cc:633
 msgid "&Send DCP to TMS"
 msgstr "&Verstuur DCP naar TMS"
 
-#: src/tools/dcpomatic.cc:641
+#: src/tools/dcpomatic.cc:654
 msgid "&Tools"
 msgstr "&Gereedschappen"
 
-#: src/tools/dcpomatic_batch.cc:146
-msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-
-#: src/tools/dcpomatic.cc:632 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Over.."
 
-#: src/tools/dcpomatic.cc:630
+#: src/tools/dcpomatic.cc:643
 msgid "About DCP-o-matic"
 msgstr "Over DCP-o-matic"
 
@@ -102,7 +96,16 @@ msgstr "Over DCP-o-matic"
 msgid "Add Film..."
 msgstr "Voeg Film Toe"
 
-#: src/tools/dcpomatic.cc:803 src/tools/dcpomatic.cc:809
+#: src/tools/dcpomatic.cc:821
+#, fuzzy, c-format
+msgid ""
+"An exception occurred (%s).  Please report this problem to the DCP-o-matic "
+"author (carl@dcpomatic.com)."
+msgstr ""
+"Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
+"(carl@dcpomatic.com)."
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -110,45 +113,45 @@ msgstr ""
 "Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
 "(carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:418
 msgid "An unknown exeception occurred."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: src/tools/dcpomatic.cc:406
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "De inhoud van de CPL is niet geëncrypteerd."
 
-#: src/tools/dcpomatic.cc:626
+#: src/tools/dcpomatic.cc:639
 msgid "Check for updates"
 msgstr "Controleer op updates"
 
-#: src/tools/dcpomatic.cc:746 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Kan film niet openen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:249 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kan film niet openen in  %s (%s)"
 
-#: src/tools/dcpomatic.cc:456
+#: src/tools/dcpomatic.cc:464
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kan DCP niet vertonen (Kan Konqueror niet starten)"
 
-#: src/tools/dcpomatic.cc:449
+#: src/tools/dcpomatic.cc:457
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kan DCP niet vertonen (Kan Nautilus niet starten)"
 
-#: src/tools/dcpomatic.cc:269 src/tools/dcpomatic.cc:701
-#: src/tools/dcpomatic.cc:737
+#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
+#: src/tools/dcpomatic.cc:751
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_batch.cc:139 src/tools/dcpomatic_batch.cc:240
+#: src/tools/dcpomatic_batch.cc:223
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic Bulk Omzetter"
 
-#: src/tools/dcpomatic.cc:625
+#: src/tools/dcpomatic.cc:638
 msgid "Encoding servers..."
 msgstr "Render servers..."
 
@@ -156,23 +159,19 @@ msgstr "Render servers..."
 msgid "Film changed"
 msgstr "Film is veranderd"
 
-#: src/tools/dcpomatic_batch.cc:145
-msgid "Free, open-source DCP generation from almost anything."
-msgstr "Vrij, open-bron DCP creatie van zowat om het even wat."
-
-#: src/tools/dcpomatic.cc:624
-msgid "Hints..."
-msgstr "Tips"
+#: src/tools/dcpomatic.cc:637
+msgid "Hints...\tCtrl-H"
+msgstr "Tips...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:619
-msgid "Make &KDMs..."
-msgstr "Maak &KDMs..."
+#: src/tools/dcpomatic.cc:632
+msgid "Make &KDMs...\tCtrl-K"
+msgstr "Maak &KDMs...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:587
-msgid "New..."
-msgstr "Nieuw..."
+#: src/tools/dcpomatic.cc:600
+msgid "New...\tCtrl-N"
+msgstr "Nieuw...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:621
+#: src/tools/dcpomatic.cc:634
 msgid "S&how DCP"
 msgstr "S&hoe DCP"
 
@@ -181,19 +180,19 @@ msgstr "S&hoe DCP"
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Bewaar veranderingen naar film \"%s\" voor afsluiten?"
 
-#: src/tools/dcpomatic.cc:615
+#: src/tools/dcpomatic.cc:628
 msgid "Scale to fit &height"
 msgstr "Scaal naar &height"
 
-#: src/tools/dcpomatic.cc:614
+#: src/tools/dcpomatic.cc:627
 msgid "Scale to fit &width"
 msgstr "Schaal naar &width"
 
-#: src/tools/dcpomatic.cc:314 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Kies een film om te openen"
 
-#: src/tools/dcpomatic.cc:377
+#: src/tools/dcpomatic.cc:385
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -202,26 +201,26 @@ msgstr ""
 "De DCP voor deze film neemt ongeveer %.1f Gb in beslag, er is echter maar "
 "%.1f Gb beschikbaar.  Wilt u toch doorgaan?"
 
-#: src/tools/dcpomatic.cc:847
+#: src/tools/dcpomatic.cc:870
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "De verbinding met de DCP-o-matic download server is niet beschikbaar."
 
-#: src/tools/dcpomatic.cc:288
+#: src/tools/dcpomatic.cc:296
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "De map %1 bestaat al en is niet leeg. Wilt u deze toch gebruiken?"
 
-#: src/tools/dcpomatic.cc:842
+#: src/tools/dcpomatic.cc:865
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Er is geen nieuwere versie van DCP-o-matic beschikbaar."
 
-#: src/tools/dcpomatic.cc:501 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Er zijn nog niet afgeronde projecten, weet u zeker dat u wilt afsluiten?"
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:243
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -229,14 +228,27 @@ msgstr ""
 "Deze film is gemaakt met een oude versie van DCP-o-matic en opent mogelijk "
 "niet goed in de huidige versie.  Controleer alle instellingen zorgvuldig."
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Niet afgemaakte projecten"
 
-#: src/tools/dcpomatic.cc:323 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 "U hebt geen map geselecteerd. Zorg ervoor dat er een map geselecteerd is "
 "voordat u op Openen klikt."
+
+#~ msgid "&Save"
+#~ msgstr "&Opslaan"
+
+#~ msgid ""
+#~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
+#~ "Laursen"
+#~ msgstr ""
+#~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
+#~ "Laursen"
+
+#~ msgid "Free, open-source DCP generation from almost anything."
+#~ msgstr "Vrij, open-bron DCP creatie van zowat om het even wat."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 645acce71..50bf29c9f 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:298
+#: src/tools/dcpomatic.cc:306
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 
@@ -25,67 +25,70 @@ msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:644
+#: src/tools/dcpomatic.cc:652
 msgid "&Content"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:642
+#: src/tools/dcpomatic.cc:650
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:606
+#: src/tools/dcpomatic.cc:614
 msgid "&Exit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:640 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:645
+#: src/tools/dcpomatic.cc:653
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:623
-msgid "&Make DCP"
-msgstr "&Skapa DCP"
+#: src/tools/dcpomatic.cc:631
+#, fuzzy
+msgid "&Make DCP\tCtrl-M"
+msgstr "&Skapa DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:593
-msgid "&Open..."
-msgstr "&Öppna"
+#: src/tools/dcpomatic.cc:601
+#, fuzzy
+msgid "&Open...\tCtrl-O"
+msgstr "&Öppna...\tCtrl-O"
 
-#: src/tools/dcpomatic.cc:612 src/tools/dcpomatic.cc:615
-msgid "&Preferences..."
-msgstr "&Inställningar"
+#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#, fuzzy
+msgid "&Preferences...\tCtrl-P"
+msgstr "&Inställningar...\tCtrl-P"
 
-#: src/tools/dcpomatic.cc:597
+#: src/tools/dcpomatic.cc:605
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dcpomatic.cc:608 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:595
-msgid "&Save"
-msgstr "&Spara"
+#: src/tools/dcpomatic.cc:603
+msgid "&Save\tCtrl-S"
+msgstr ""
 
-#: src/tools/dcpomatic.cc:625
+#: src/tools/dcpomatic.cc:633
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:646
+#: src/tools/dcpomatic.cc:654
 msgid "&Tools"
 msgstr "&Verktyg"
 
-#: src/tools/dcpomatic.cc:637 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:635
+#: src/tools/dcpomatic.cc:643
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
@@ -93,50 +96,50 @@ msgstr "Om DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:813
+#: src/tools/dcpomatic.cc:821
 #, c-format
 msgid ""
 "An exception occurred (%s).  Please report this problem to the DCP-o-matic "
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:815 src/tools/dcpomatic.cc:824
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:410
+#: src/tools/dcpomatic.cc:418
 msgid "An unknown exeception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:406
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:639
 msgid "Check for updates"
 msgstr "Leta efter uppdateringar"
 
-#: src/tools/dcpomatic.cc:752 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:249 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:456
+#: src/tools/dcpomatic.cc:464
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kunde inte visa DCP (kunde inte köra konqueror)"
 
-#: src/tools/dcpomatic.cc:449
+#: src/tools/dcpomatic.cc:457
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kunde inte visa DCP (kunde inte köra nautilus)"
 
-#: src/tools/dcpomatic.cc:269 src/tools/dcpomatic.cc:707
-#: src/tools/dcpomatic.cc:743
+#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
+#: src/tools/dcpomatic.cc:751
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -144,7 +147,7 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:630
+#: src/tools/dcpomatic.cc:638
 msgid "Encoding servers..."
 msgstr "Kodningsservrar..."
 
@@ -152,19 +155,19 @@ msgstr "Kodningsservrar..."
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dcpomatic.cc:629
-msgid "Hints..."
-msgstr "Råd..."
+#: src/tools/dcpomatic.cc:637
+msgid "Hints...\tCtrl-H"
+msgstr "Råd...\tCtrl-H"
 
-#: src/tools/dcpomatic.cc:624
-msgid "Make &KDMs..."
-msgstr "Skapa &KDM:er..."
+#: src/tools/dcpomatic.cc:632
+msgid "Make &KDMs...\tCtrl-K"
+msgstr "Skapa &KDM:er...\tCtrl-K"
 
-#: src/tools/dcpomatic.cc:592
-msgid "New..."
-msgstr "Ny..."
+#: src/tools/dcpomatic.cc:600
+msgid "New...\tCtrl-N"
+msgstr "Ny...\tCtrl-N"
 
-#: src/tools/dcpomatic.cc:626
+#: src/tools/dcpomatic.cc:634
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
@@ -173,19 +176,19 @@ msgstr "&Visa DCP"
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:620
+#: src/tools/dcpomatic.cc:628
 msgid "Scale to fit &height"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:619
+#: src/tools/dcpomatic.cc:627
 msgid "Scale to fit &width"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:314 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic.cc:377
+#: src/tools/dcpomatic.cc:385
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -194,11 +197,11 @@ msgstr ""
 "DCP:n för denna film kommer att uppta ungefär %.1f Gb, och disken du "
 "använder har bara %.1f Gb ledigt. Vill du fortsätta ändå?"
 
-#: src/tools/dcpomatic.cc:862
+#: src/tools/dcpomatic.cc:870
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
 
-#: src/tools/dcpomatic.cc:288
+#: src/tools/dcpomatic.cc:296
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -206,25 +209,25 @@ msgstr ""
 "Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
 "den?"
 
-#: src/tools/dcpomatic.cc:857
+#: src/tools/dcpomatic.cc:865
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Det finns inga nya versioner av DCP-o-matic tillgängligt."
 
-#: src/tools/dcpomatic.cc:501 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Det finns oasvlutade jobb; är du säker på att du vill avsluta?"
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:243
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
 msgid "Unfinished jobs"
 msgstr "Oavslutade jobb"
 
-#: src/tools/dcpomatic.cc:323 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -232,6 +235,9 @@ msgstr ""
 "Du har inte valt en folder. Se till att välja en folder innan du klickar på "
 "Öppna."
 
+#~ msgid "&Save"
+#~ msgstr "&Spara"
+
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"
diff --git a/src/wx/audio_plot.cc b/src/wx/audio_plot.cc
index c4e5d992f..641ddd503 100644
--- a/src/wx/audio_plot.cc
+++ b/src/wx/audio_plot.cc
@@ -159,7 +159,7 @@ AudioPlot::paint ()
 		gc->DrawText (std_to_wx (String::compose ("%1dB", i)), 0, y - (db_label_height / 2));
 	}
 
-	gc->SetPen (*wxLIGHT_GREY_PEN);
+	gc->SetPen (wxPen (wxColour (200, 200, 200)));
 	gc->StrokePath (grid);
 
 	gc->DrawText (_("Time"), data_width, metrics.height - metrics.y_origin + db_label_height / 2);
@@ -171,7 +171,7 @@ AudioPlot::paint ()
 				plot_peak (p, c, metrics);
 			}
 			wxColour const col = _colours[c];
-			gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID));
+			gc->SetPen (wxPen (wxColour (col.Red(), col.Green(), col.Blue(), col.Alpha() / 2), 1, wxPENSTYLE_SOLID));
 			gc->StrokePath (p);
 		}
 	}
@@ -183,7 +183,7 @@ AudioPlot::paint ()
 				plot_rms (p, c, metrics);
 			}
 			wxColour const col = _colours[c];
-			gc->SetPen (*wxThePenList->FindOrCreatePen (col, 1, wxPENSTYLE_SOLID));
+			gc->SetPen (wxPen (col, 1, wxPENSTYLE_SOLID));
 			gc->StrokePath (p);
 		}
 	}
@@ -192,7 +192,7 @@ AudioPlot::paint ()
 	axes.MoveToPoint (metrics.db_label_width, 0);
 	axes.AddLineToPoint (metrics.db_label_width, metrics.height - metrics.y_origin);
 	axes.AddLineToPoint (metrics.db_label_width + data_width, metrics.height - metrics.y_origin);
-	gc->SetPen (*wxBLACK_PEN);
+	gc->SetPen (wxPen (wxColour (0, 0, 0)));
 	gc->StrokePath (axes);
 
 	delete gc;
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index ced2d5e20..324f266cc 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-07-13 03:08+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
-#: src/wx/subtitle_panel.cc:66
+#: src/wx/subtitle_panel.cc:66 src/wx/subtitle_panel.cc:75
 msgid "%"
 msgstr "%"
 
@@ -29,11 +29,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:666
+#: src/wx/config_dialog.cc:664
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(Passwort wird im Klartext gespeichert!)"
 
-#: src/wx/config_dialog.cc:98
+#: src/wx/config_dialog.cc:104
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(Programm zum Ändern der Sprache neu starten)"
 
@@ -133,11 +133,11 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:799
 msgid "Allow any DCP frame rate"
 msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
 
-#: src/wx/about_dialog.cc:110
+#: src/wx/about_dialog.cc:111
 msgid "Artwork by"
 msgstr "Grafik von"
 
@@ -169,7 +169,7 @@ msgstr ""
 "Der Ton von Kanal %d wird wird an den DCP Kanal %d mit %.1fdB Pegel "
 "weitergegeben."
 
-#: src/wx/config_dialog.cc:685
+#: src/wx/config_dialog.cc:683
 msgid "BCC address"
 msgstr "BCC: Adresse"
 
@@ -202,7 +202,7 @@ msgstr "Aber ich nutze gegenwärtig Faderstellung"
 msgid "C"
 msgstr "C"
 
-#: src/wx/config_dialog.cc:681
+#: src/wx/config_dialog.cc:679
 msgid "CC address"
 msgstr "CC: Adresse"
 
@@ -247,11 +247,11 @@ msgstr "Kanal Verstärkung (+/-)"
 msgid "Channels"
 msgstr "Kanäle"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:120
 msgid "Check for testing updates as well as stable ones"
 msgstr "Zeige bei Updateprüfung auch Test-Versionen an"
 
-#: src/wx/config_dialog.cc:110
+#: src/wx/config_dialog.cc:116
 msgid "Check for updates on startup"
 msgstr "Beim Start auf Updates überprüfen."
 
@@ -259,11 +259,11 @@ msgstr "Beim Start auf Updates überprüfen."
 msgid "Choose a file"
 msgstr "Datei auswählen"
 
-#: src/wx/film_editor.cc:797
+#: src/wx/film_editor.cc:810
 msgid "Choose a file or files"
 msgstr "Eine oder mehrere Dateien auswählen"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:820
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
 msgid "Choose a folder"
 msgstr "Ordner wählen"
 
@@ -271,7 +271,7 @@ msgstr "Ordner wählen"
 msgid "Cinema"
 msgstr "Kino"
 
-#: src/wx/config_dialog.cc:496
+#: src/wx/config_dialog.cc:498
 msgid "Colour Conversions"
 msgstr "Farbumwandlungen"
 
@@ -280,7 +280,7 @@ msgstr "Farbumwandlungen"
 msgid "Colour conversion"
 msgstr "Farbumwandlung"
 
-#: src/wx/config_dialog.cc:817
+#: src/wx/config_dialog.cc:819
 msgid "Config|Timing"
 msgstr "Timing"
 
@@ -354,7 +354,7 @@ msgstr "Eigene"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:118
+#: src/wx/film_editor.cc:129
 msgid "DCP Name"
 msgstr "DCP Name"
 
@@ -371,43 +371,43 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic Ton - %s"
 
-#: src/wx/config_dialog.cc:266
+#: src/wx/config_dialog.cc:270
 msgid "Default ISDCF name details"
 msgstr "Standard ISDCF Name Details"
 
-#: src/wx/config_dialog.cc:283
+#: src/wx/config_dialog.cc:287
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standard JPEG2000 Datenrate"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:296
 msgid "Default audio delay"
 msgstr "Standard Ton Verzögerung (+/-)"
 
-#: src/wx/config_dialog.cc:274
+#: src/wx/config_dialog.cc:278
 msgid "Default container"
 msgstr "Standard Container"
 
-#: src/wx/config_dialog.cc:278
+#: src/wx/config_dialog.cc:282
 msgid "Default content type"
 msgstr "Standard Inhalt Typ"
 
-#: src/wx/config_dialog.cc:258
+#: src/wx/config_dialog.cc:262
 msgid "Default directory for new films"
 msgstr "Standard Ordner für neue Projekte"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:254
 msgid "Default duration of still images"
 msgstr "Standard Länge für Standbilder"
 
-#: src/wx/config_dialog.cc:300
+#: src/wx/config_dialog.cc:304
 msgid "Default issuer"
 msgstr "Standard 'issuer' (DCI)"
 
-#: src/wx/config_dialog.cc:270
+#: src/wx/config_dialog.cc:274
 msgid "Default scale to"
 msgstr ""
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:235
 msgid "Defaults"
 msgstr "Vorgaben"
 
@@ -415,7 +415,7 @@ msgstr "Vorgaben"
 msgid "Delay"
 msgstr "Verzögerung (+/-)"
 
-#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:79
+#: src/wx/film_editor.cc:125 src/wx/job_manager_view.cc:79
 msgid "Details..."
 msgstr "Details..."
 
@@ -462,7 +462,7 @@ msgstr "Kino bearbeiten..."
 msgid "Edit Screen..."
 msgstr "Saal bearbeiten..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:271
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:66
 msgid "Edit..."
@@ -480,7 +480,7 @@ msgstr "Encoding Server"
 msgid "Encrypted"
 msgstr "Verschlüsselt (->für KDM Erstellung)"
 
-#: src/wx/config_dialog.cc:814
+#: src/wx/config_dialog.cc:817
 msgid "Errors"
 msgstr "Fehler"
 
@@ -532,7 +532,7 @@ msgstr ""
 msgid "From"
 msgstr "Von"
 
-#: src/wx/config_dialog.cc:677
+#: src/wx/config_dialog.cc:675
 msgid "From address"
 msgstr "Absenderadresse"
 
@@ -561,7 +561,7 @@ msgstr "Abschwächung des Kanals %d im DCP Kanal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:809
+#: src/wx/config_dialog.cc:813
 msgid "General"
 msgstr "Allgemein"
 
@@ -589,11 +589,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:562
+#: src/wx/config_dialog.cc:560
 msgid "IP address"
 msgstr "IP Adresse"
 
-#: src/wx/config_dialog.cc:454
+#: src/wx/config_dialog.cc:456
 msgid "IP address / host name"
 msgstr "IP Adresse / Host Name"
 
@@ -617,7 +617,7 @@ msgstr "JPEG2000 Datenrate"
 msgid "Join"
 msgstr "Verbinden"
 
-#: src/wx/config_dialog.cc:629
+#: src/wx/config_dialog.cc:627
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -657,23 +657,27 @@ msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
 msgid "Load from file..."
 msgstr "Lade aus Datei..."
 
-#: src/wx/config_dialog.cc:808
+#: src/wx/config_dialog.cc:807
 msgid "Log"
 msgstr "Log"
 
+#: src/wx/config_dialog.cc:804
+msgid "Log:"
+msgstr ""
+
 #: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "SL"
 
-#: src/wx/film_editor.cc:771
+#: src/wx/film_editor.cc:784
 msgid "MISSING: "
 msgstr "FEHLT:"
 
-#: src/wx/config_dialog.cc:662
+#: src/wx/config_dialog.cc:660
 msgid "Mail password"
 msgstr "Mail Passwort"
 
-#: src/wx/config_dialog.cc:658
+#: src/wx/config_dialog.cc:656
 msgid "Mail user name"
 msgstr "Mail/SMTP Server Benutzername/Login"
 
@@ -689,11 +693,11 @@ msgstr "Zielhelligkeit (z.B. '4fL' für 3D)"
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:796
+#: src/wx/config_dialog.cc:791
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximale JPEG2000 Datenrate (Vorsicht!)"
 
-#: src/wx/config_dialog.cc:287 src/wx/config_dialog.cc:800
+#: src/wx/config_dialog.cc:291 src/wx/config_dialog.cc:795
 #: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -737,7 +741,7 @@ msgstr "Aus"
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:654
+#: src/wx/config_dialog.cc:652
 msgid "Outgoing mail server"
 msgstr "Ausgehender/SMTP Mail Server"
 
@@ -758,7 +762,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:574
+#: src/wx/config_dialog.cc:572
 msgid "Password"
 msgstr "Passwort"
 
@@ -835,7 +839,7 @@ msgstr "Inhalt wiederholen"
 msgid "Repeat..."
 msgstr "Wiederhole..."
 
-#: src/wx/config_dialog.cc:692
+#: src/wx/config_dialog.cc:690
 msgid "Reset to default text"
 msgstr "Auf Standardtext zurücksetzen"
 
@@ -863,10 +867,6 @@ msgstr "SR"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Scale"
-msgstr "Größe"
-
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Skaliere auf"
@@ -912,7 +912,7 @@ msgstr "Server Hersteller"
 msgid "Server serial number"
 msgstr "Server Seriennummer"
 
-#: src/wx/config_dialog.cc:434
+#: src/wx/config_dialog.cc:438
 msgid "Servers"
 msgstr "Encoding Server"
 
@@ -920,7 +920,7 @@ msgstr "Encoding Server"
 msgid "Set"
 msgstr "Setzen"
 
-#: src/wx/config_dialog.cc:86
+#: src/wx/config_dialog.cc:92
 msgid "Set language"
 msgstr "Sprache setzen"
 
@@ -948,7 +948,7 @@ msgstr "Stabile Version"
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:79
 msgid "Stream"
 msgstr "Spur"
 
@@ -956,7 +956,7 @@ msgstr "Spur"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (z.B. TCF)"
 
-#: src/wx/config_dialog.cc:673
+#: src/wx/config_dialog.cc:671
 msgid "Subject"
 msgstr ""
 
@@ -968,7 +968,7 @@ msgstr "Untertitel Sprache (z.B. EN)"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:160
+#: src/wx/about_dialog.cc:164
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
@@ -976,7 +976,7 @@ msgstr "Unterstützt durch"
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:566
+#: src/wx/config_dialog.cc:564
 msgid "Target path"
 msgstr "Zielpfad"
 
@@ -992,7 +992,7 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:205
+#: src/wx/about_dialog.cc:209
 msgid "Tested by"
 msgstr "Getestet von"
 
@@ -1022,7 +1022,7 @@ msgstr "Dies ist keine gültige CPL Datei"
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:111
 msgid "Threads to use for encoding on this host"
 msgstr "Auf diesem Rechner zu benutzende CPU-Threads"
 
@@ -1046,7 +1046,7 @@ msgstr "Trimmen"
 msgid "Top crop"
 msgstr "Oben beschneiden"
 
-#: src/wx/about_dialog.cc:106
+#: src/wx/about_dialog.cc:107
 msgid "Translated by"
 msgstr "Übersetzt von"
 
@@ -1082,11 +1082,11 @@ msgstr "Nach oben"
 msgid "Update"
 msgstr "Update"
 
-#: src/wx/film_editor.cc:128
+#: src/wx/film_editor.cc:123
 msgid "Use ISDCF name"
 msgstr "ISDCF Name benutzen"
 
-#: src/wx/config_dialog.cc:450
+#: src/wx/config_dialog.cc:452
 msgid "Use all servers"
 msgstr "Alle verfügbaren Server im Subnetz benutzen"
 
@@ -1098,7 +1098,7 @@ msgstr "Beste benutzen"
 msgid "Use preset"
 msgstr "Preset benutzen"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:568
 msgid "User name"
 msgstr "Benutzer Name"
 
@@ -1114,7 +1114,7 @@ msgstr "Bild"
 msgid "Video frame rate"
 msgstr "Bildwiederholrate"
 
-#: src/wx/config_dialog.cc:811
+#: src/wx/config_dialog.cc:815
 msgid "Warnings"
 msgstr "Warnungen"
 
@@ -1134,10 +1134,20 @@ msgstr "Geschrieben von"
 msgid "X Offset"
 msgstr "Horizontale Verschiebung"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "X Scale"
+msgstr "Größe"
+
 #: src/wx/subtitle_panel.cc:53
 msgid "Y Offset"
 msgstr "Vertikale Verschiebung"
 
+#: src/wx/subtitle_panel.cc:71
+#, fuzzy
+msgid "Y Scale"
+msgstr "Größe"
+
 #: src/wx/hints_dialog.cc:121
 #, 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:296
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:300
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:254
+#: src/wx/config_dialog.cc:258
 msgid "s"
 msgstr "s"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 9ba3bb26f..3d99cd3da 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+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"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.4\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
-#: src/wx/subtitle_panel.cc:66
+#: src/wx/subtitle_panel.cc:66 src/wx/subtitle_panel.cc:75
 msgid "%"
 msgstr "%"
 
@@ -28,11 +28,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:666
+#: src/wx/config_dialog.cc:664
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(claves guardadas como texto plano en el disco)"
 
-#: src/wx/config_dialog.cc:98
+#: src/wx/config_dialog.cc:104
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 
@@ -134,12 +134,12 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:799
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "Velocidad de imagen"
 
-#: src/wx/about_dialog.cc:110
+#: src/wx/about_dialog.cc:111
 msgid "Artwork by"
 msgstr "Grafismo de"
 
@@ -168,7 +168,7 @@ msgid ""
 "%.1fdB."
 msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB."
 
-#: src/wx/config_dialog.cc:685
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "Dirección IP"
@@ -202,7 +202,7 @@ msgstr "pero tengo que usar el fader a"
 msgid "C"
 msgstr "C"
 
-#: src/wx/config_dialog.cc:681
+#: src/wx/config_dialog.cc:679
 #, fuzzy
 msgid "CC address"
 msgstr "Dirección IP"
@@ -249,11 +249,11 @@ msgstr "Ganancia del canal"
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:120
 msgid "Check for testing updates as well as stable ones"
 msgstr "Buscar actualizaciones de prueba y estables"
 
-#: src/wx/config_dialog.cc:110
+#: src/wx/config_dialog.cc:116
 msgid "Check for updates on startup"
 msgstr "Buscar actualizaciones al iniciar"
 
@@ -261,11 +261,11 @@ msgstr "Buscar actualizaciones al iniciar"
 msgid "Choose a file"
 msgstr "Elige un fichero"
 
-#: src/wx/film_editor.cc:797
+#: src/wx/film_editor.cc:810
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:820
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
 msgid "Choose a folder"
 msgstr "Elige una carpeta"
 
@@ -273,7 +273,7 @@ msgstr "Elige una carpeta"
 msgid "Cinema"
 msgstr "Cine"
 
-#: src/wx/config_dialog.cc:496
+#: src/wx/config_dialog.cc:498
 msgid "Colour Conversions"
 msgstr "Conversiones de color"
 
@@ -282,7 +282,7 @@ msgstr "Conversiones de color"
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
-#: src/wx/config_dialog.cc:817
+#: src/wx/config_dialog.cc:819
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Tiempo"
@@ -357,7 +357,7 @@ msgstr "Personalizado"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:118
+#: src/wx/film_editor.cc:129
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
@@ -374,44 +374,44 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:266
+#: src/wx/config_dialog.cc:270
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:283
+#: src/wx/config_dialog.cc:287
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 por defecto"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:296
 msgid "Default audio delay"
 msgstr "Retardo de audio por defecto"
 
-#: src/wx/config_dialog.cc:274
+#: src/wx/config_dialog.cc:278
 msgid "Default container"
 msgstr "Contenedor por defecto"
 
-#: src/wx/config_dialog.cc:278
+#: src/wx/config_dialog.cc:282
 msgid "Default content type"
 msgstr "Tipo de contenido por defecto"
 
-#: src/wx/config_dialog.cc:258
+#: src/wx/config_dialog.cc:262
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:254
 msgid "Default duration of still images"
 msgstr "Duración por defecto de las imágenes fijas"
 
-#: src/wx/config_dialog.cc:300
+#: src/wx/config_dialog.cc:304
 msgid "Default issuer"
 msgstr "Emisor por defecto"
 
-#: src/wx/config_dialog.cc:270
+#: src/wx/config_dialog.cc:274
 msgid "Default scale to"
 msgstr ""
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:235
 msgid "Defaults"
 msgstr "Por defecto"
 
@@ -420,7 +420,7 @@ msgstr "Por defecto"
 msgid "Delay"
 msgstr "Retardo del audio"
 
-#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:79
+#: src/wx/film_editor.cc:125 src/wx/job_manager_view.cc:79
 msgid "Details..."
 msgstr "Detalles..."
 
@@ -467,7 +467,7 @@ msgstr "Editar cine..."
 msgid "Edit Screen..."
 msgstr "Editar pantalla..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:271
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:66
 msgid "Edit..."
@@ -485,7 +485,7 @@ msgstr "Servidores de codificación"
 msgid "Encrypted"
 msgstr "Encriptado"
 
-#: src/wx/config_dialog.cc:814
+#: src/wx/config_dialog.cc:817
 msgid "Errors"
 msgstr ""
 
@@ -536,7 +536,7 @@ msgstr ""
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:677
+#: src/wx/config_dialog.cc:675
 #, fuzzy
 msgid "From address"
 msgstr "Dirección IP"
@@ -566,7 +566,7 @@ msgstr "Ganancia del canal %d en el canal %d del DCP"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:809
+#: src/wx/config_dialog.cc:813
 msgid "General"
 msgstr ""
 
@@ -594,11 +594,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:562
+#: src/wx/config_dialog.cc:560
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/config_dialog.cc:454
+#: src/wx/config_dialog.cc:456
 msgid "IP address / host name"
 msgstr "Dirección IP / nombre"
 
@@ -623,7 +623,7 @@ msgstr "Ancho de banda JPEG2000"
 msgid "Join"
 msgstr "Unir"
 
-#: src/wx/config_dialog.cc:629
+#: src/wx/config_dialog.cc:627
 msgid "KDM Email"
 msgstr "Email KDM"
 
@@ -664,23 +664,27 @@ 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:808
+#: src/wx/config_dialog.cc:807
 msgid "Log"
 msgstr ""
 
+#: src/wx/config_dialog.cc:804
+msgid "Log:"
+msgstr ""
+
 #: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:771
+#: src/wx/film_editor.cc:784
 msgid "MISSING: "
 msgstr "FALTA:"
 
-#: src/wx/config_dialog.cc:662
+#: src/wx/config_dialog.cc:660
 msgid "Mail password"
 msgstr "Clave del correo"
 
-#: src/wx/config_dialog.cc:658
+#: src/wx/config_dialog.cc:656
 msgid "Mail user name"
 msgstr "Usuario del correo"
 
@@ -696,11 +700,11 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matriz"
 
-#: src/wx/config_dialog.cc:796
+#: src/wx/config_dialog.cc:791
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 máximo"
 
-#: src/wx/config_dialog.cc:287 src/wx/config_dialog.cc:800
+#: src/wx/config_dialog.cc:291 src/wx/config_dialog.cc:795
 #: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -744,7 +748,7 @@ msgstr "Off"
 msgid "Other"
 msgstr "Otros"
 
-#: src/wx/config_dialog.cc:654
+#: src/wx/config_dialog.cc:652
 msgid "Outgoing mail server"
 msgstr "Servidor de salida de correo"
 
@@ -766,7 +770,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:574
+#: src/wx/config_dialog.cc:572
 msgid "Password"
 msgstr "Clave"
 
@@ -843,7 +847,7 @@ msgstr "Repetir contenido"
 msgid "Repeat..."
 msgstr "Repetir..."
 
-#: src/wx/config_dialog.cc:692
+#: src/wx/config_dialog.cc:690
 msgid "Reset to default text"
 msgstr ""
 
@@ -871,11 +875,6 @@ 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"
@@ -924,7 +923,7 @@ msgstr "Número de serie del servidor"
 msgid "Server serial number"
 msgstr "Número de serie del servidor"
 
-#: src/wx/config_dialog.cc:434
+#: src/wx/config_dialog.cc:438
 msgid "Servers"
 msgstr "Servidores"
 
@@ -932,7 +931,7 @@ msgstr "Servidores"
 msgid "Set"
 msgstr "Seleccionar"
 
-#: src/wx/config_dialog.cc:86
+#: src/wx/config_dialog.cc:92
 msgid "Set language"
 msgstr "Seleccionar idioma"
 
@@ -960,7 +959,7 @@ msgstr "Versión estable"
 msgid "Standard"
 msgstr "Estandard"
 
-#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:79
 #, fuzzy
 msgid "Stream"
 msgstr "Flujo"
@@ -969,7 +968,7 @@ msgstr "Flujo"
 msgid "Studio (e.g. TCF)"
 msgstr "Estudio (ej. TCF)"
 
-#: src/wx/config_dialog.cc:673
+#: src/wx/config_dialog.cc:671
 msgid "Subject"
 msgstr ""
 
@@ -981,7 +980,7 @@ msgstr "Idioma del subtítulo (ej. EN)"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:160
+#: src/wx/about_dialog.cc:164
 msgid "Supported by"
 msgstr "Soportado por"
 
@@ -989,7 +988,7 @@ msgstr "Soportado por"
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:566
+#: src/wx/config_dialog.cc:564
 msgid "Target path"
 msgstr "Ruta"
 
@@ -1006,7 +1005,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:205
+#: src/wx/about_dialog.cc:209
 msgid "Tested by"
 msgstr "Comprobado por"
 
@@ -1035,7 +1034,7 @@ msgstr ""
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:111
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
@@ -1060,7 +1059,7 @@ msgstr "Tiempo"
 msgid "Top crop"
 msgstr "Recortar arriba"
 
-#: src/wx/about_dialog.cc:106
+#: src/wx/about_dialog.cc:107
 msgid "Translated by"
 msgstr "Traducido por"
 
@@ -1096,12 +1095,12 @@ msgstr "Subir"
 msgid "Update"
 msgstr "Actualizar"
 
-#: src/wx/film_editor.cc:128
+#: src/wx/film_editor.cc:123
 #, fuzzy
 msgid "Use ISDCF name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/config_dialog.cc:450
+#: src/wx/config_dialog.cc:452
 msgid "Use all servers"
 msgstr "Usar todos los servidores"
 
@@ -1113,7 +1112,7 @@ msgstr "Usar la mejor"
 msgid "Use preset"
 msgstr "Usar por defecto"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:568
 msgid "User name"
 msgstr "Nombre de usuario"
 
@@ -1129,7 +1128,7 @@ msgstr "Vídeo"
 msgid "Video frame rate"
 msgstr "Velocidad de imagen"
 
-#: src/wx/config_dialog.cc:811
+#: src/wx/config_dialog.cc:815
 msgid "Warnings"
 msgstr ""
 
@@ -1150,11 +1149,21 @@ msgstr "Escrito por"
 msgid "X Offset"
 msgstr "Desplazamiento en X"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "X Scale"
+msgstr "Escalador"
+
 #: src/wx/subtitle_panel.cc:53
 #, fuzzy
 msgid "Y Offset"
 msgstr "Desplazamiento en Y"
 
+#: src/wx/subtitle_panel.cc:71
+#, fuzzy
+msgid "Y Scale"
+msgstr "Escalador"
+
 #: src/wx/hints_dialog.cc:121
 #, c-format
 msgid ""
@@ -1207,11 +1216,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:296
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:300
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:254
+#: src/wx/config_dialog.cc:258
 msgid "s"
 msgstr "s"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index a5423c3cf..79c18feb2 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-07-14 11:27+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.6\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
-#: src/wx/subtitle_panel.cc:66
+#: src/wx/subtitle_panel.cc:66 src/wx/subtitle_panel.cc:75
 msgid "%"
 msgstr "%"
 
@@ -29,11 +29,11 @@ msgstr ""
 "(C) 2012-2014 par Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 "Laursen"
 
-#: src/wx/config_dialog.cc:666
+#: src/wx/config_dialog.cc:664
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(le mot de passe sera enregistré sur le disque dur au format texte)"
 
-#: src/wx/config_dialog.cc:98
+#: src/wx/config_dialog.cc:104
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(redémarrez DCP-o-matic pour appliquer le changement de langue)"
 
@@ -133,11 +133,11 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:799
 msgid "Allow any DCP frame rate"
 msgstr "Autoriser toutes cadences"
 
-#: src/wx/about_dialog.cc:110
+#: src/wx/about_dialog.cc:111
 msgid "Artwork by"
 msgstr "Thème par"
 
@@ -169,7 +169,7 @@ msgstr ""
 "Le son du canal audio %d sera transféré au canal %d du DCP avec un gain de "
 "%.1fdB."
 
-#: src/wx/config_dialog.cc:685
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "Adresse CC"
@@ -203,7 +203,7 @@ msgstr "Mais je dois mixer"
 msgid "C"
 msgstr "C"
 
-#: src/wx/config_dialog.cc:681
+#: src/wx/config_dialog.cc:679
 msgid "CC address"
 msgstr "Adresse CC"
 
@@ -248,11 +248,11 @@ msgstr "Gain Canal"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:120
 msgid "Check for testing updates as well as stable ones"
 msgstr "Recherche toutes mises à jour : test et stables."
 
-#: src/wx/config_dialog.cc:110
+#: src/wx/config_dialog.cc:116
 msgid "Check for updates on startup"
 msgstr "Recherche de mises à jour au démarrage."
 
@@ -260,11 +260,11 @@ msgstr "Recherche de mises à jour au démarrage."
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#: src/wx/film_editor.cc:797
+#: src/wx/film_editor.cc:810
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:820
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
@@ -272,7 +272,7 @@ msgstr "Choisissez un dossier"
 msgid "Cinema"
 msgstr "Cinéma"
 
-#: src/wx/config_dialog.cc:496
+#: src/wx/config_dialog.cc:498
 msgid "Colour Conversions"
 msgstr "Conversions Couleurs"
 
@@ -281,7 +281,7 @@ msgstr "Conversions Couleurs"
 msgid "Colour conversion"
 msgstr "Espace Couleurs"
 
-#: src/wx/config_dialog.cc:817
+#: src/wx/config_dialog.cc:819
 msgid "Config|Timing"
 msgstr "Temps"
 
@@ -355,7 +355,7 @@ msgstr "Personnalisé"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:118
+#: src/wx/film_editor.cc:129
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
@@ -372,43 +372,43 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:266
+#: src/wx/config_dialog.cc:270
 msgid "Default ISDCF name details"
 msgstr "Nom ISDCF par défaut"
 
-#: src/wx/config_dialog.cc:283
+#: src/wx/config_dialog.cc:287
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:296
 msgid "Default audio delay"
 msgstr "Délai audio par défaut"
 
-#: src/wx/config_dialog.cc:274
+#: src/wx/config_dialog.cc:278
 msgid "Default container"
 msgstr "Format par défaut"
 
-#: src/wx/config_dialog.cc:278
+#: src/wx/config_dialog.cc:282
 msgid "Default content type"
 msgstr "Catégorie par défaut"
 
-#: src/wx/config_dialog.cc:258
+#: src/wx/config_dialog.cc:262
 msgid "Default directory for new films"
 msgstr "Dossier par défaut pour les DCP"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:254
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/config_dialog.cc:300
+#: src/wx/config_dialog.cc:304
 msgid "Default issuer"
 msgstr "Labo par défaut"
 
-#: src/wx/config_dialog.cc:270
+#: src/wx/config_dialog.cc:274
 msgid "Default scale to"
 msgstr ""
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:235
 msgid "Defaults"
 msgstr "Par défaut"
 
@@ -416,7 +416,7 @@ msgstr "Par défaut"
 msgid "Delay"
 msgstr "Délai"
 
-#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:79
+#: src/wx/film_editor.cc:125 src/wx/job_manager_view.cc:79
 msgid "Details..."
 msgstr "Détails..."
 
@@ -463,7 +463,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:267
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:271
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:66
 msgid "Edit..."
@@ -481,7 +481,7 @@ msgstr "Serveurs Encodage"
 msgid "Encrypted"
 msgstr "Crypté"
 
-#: src/wx/config_dialog.cc:814
+#: src/wx/config_dialog.cc:817
 msgid "Errors"
 msgstr "Erreurs"
 
@@ -531,7 +531,7 @@ msgstr "Création de DCP libre et gratuit depuis presque tout."
 msgid "From"
 msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:677
+#: src/wx/config_dialog.cc:675
 msgid "From address"
 msgstr "Adresse source"
 
@@ -560,7 +560,7 @@ msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:809
+#: src/wx/config_dialog.cc:813
 msgid "General"
 msgstr "Général"
 
@@ -588,11 +588,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux lire avec une table de mixage"
 
-#: src/wx/config_dialog.cc:562
+#: src/wx/config_dialog.cc:560
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/config_dialog.cc:454
+#: src/wx/config_dialog.cc:456
 msgid "IP address / host name"
 msgstr "Adresse IP / Nom d'Hôte"
 
@@ -616,7 +616,7 @@ msgstr "Qualité JPEG2000"
 msgid "Join"
 msgstr "Ajouter"
 
-#: src/wx/config_dialog.cc:629
+#: src/wx/config_dialog.cc:627
 msgid "KDM Email"
 msgstr "e-mail KDM"
 
@@ -656,23 +656,27 @@ msgstr "Courbe gamma d'entrée linéaire pour les bas niveaux"
 msgid "Load from file..."
 msgstr "Chargement depuis fichier..."
 
-#: src/wx/config_dialog.cc:808
+#: src/wx/config_dialog.cc:807
 msgid "Log"
 msgstr "Rapport"
 
+#: src/wx/config_dialog.cc:804
+msgid "Log:"
+msgstr ""
+
 #: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Sr.G"
 
-#: src/wx/film_editor.cc:771
+#: src/wx/film_editor.cc:784
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
-#: src/wx/config_dialog.cc:662
+#: src/wx/config_dialog.cc:660
 msgid "Mail password"
 msgstr "Mot de passe Mail"
 
-#: src/wx/config_dialog.cc:658
+#: src/wx/config_dialog.cc:656
 msgid "Mail user name"
 msgstr "Nom Utilisateur Mail"
 
@@ -688,11 +692,11 @@ msgstr "Luminance masterisée (ex: 4fl)"
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:796
+#: src/wx/config_dialog.cc:791
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 Maxi"
 
-#: src/wx/config_dialog.cc:287 src/wx/config_dialog.cc:800
+#: src/wx/config_dialog.cc:291 src/wx/config_dialog.cc:795
 #: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -736,7 +740,7 @@ msgstr "Eteint"
 msgid "Other"
 msgstr "Autre"
 
-#: src/wx/config_dialog.cc:654
+#: src/wx/config_dialog.cc:652
 msgid "Outgoing mail server"
 msgstr "Serveurs de messagerie sortant"
 
@@ -757,7 +761,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:574
+#: src/wx/config_dialog.cc:572
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -834,7 +838,7 @@ msgstr "Répéter le contenu"
 msgid "Repeat..."
 msgstr "Répéter..."
 
-#: src/wx/config_dialog.cc:692
+#: src/wx/config_dialog.cc:690
 msgid "Reset to default text"
 msgstr "texte par défaut"
 
@@ -862,10 +866,6 @@ 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"
@@ -911,7 +911,7 @@ msgstr "Constructeur du serveur"
 msgid "Server serial number"
 msgstr "Numéro de Série du Serveur"
 
-#: src/wx/config_dialog.cc:434
+#: src/wx/config_dialog.cc:438
 msgid "Servers"
 msgstr "Serveurs"
 
@@ -919,7 +919,7 @@ msgstr "Serveurs"
 msgid "Set"
 msgstr "Sélection"
 
-#: src/wx/config_dialog.cc:86
+#: src/wx/config_dialog.cc:92
 msgid "Set language"
 msgstr "Sélectionnez la langue"
 
@@ -947,7 +947,7 @@ msgstr "Version Stable"
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:79
 msgid "Stream"
 msgstr "Flux"
 
@@ -955,7 +955,7 @@ msgstr "Flux"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/config_dialog.cc:673
+#: src/wx/config_dialog.cc:671
 msgid "Subject"
 msgstr ""
 
@@ -967,7 +967,7 @@ msgstr "Langue de sous-titres (ex. FR)"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:160
+#: src/wx/about_dialog.cc:164
 msgid "Supported by"
 msgstr "Soutenu par"
 
@@ -975,7 +975,7 @@ msgstr "Soutenu par"
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:566
+#: src/wx/config_dialog.cc:564
 msgid "Target path"
 msgstr "Chemin cible"
 
@@ -991,7 +991,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version test"
 
-#: src/wx/about_dialog.cc:205
+#: src/wx/about_dialog.cc:209
 msgid "Tested by"
 msgstr "Testé par"
 
@@ -1021,7 +1021,7 @@ msgstr "Ceci n'est pas un fichier CPL valide"
 msgid "Threads"
 msgstr "Processus"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:111
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
@@ -1045,7 +1045,7 @@ msgstr "Temps"
 msgid "Top crop"
 msgstr "Rogner en haut"
 
-#: src/wx/about_dialog.cc:106
+#: src/wx/about_dialog.cc:107
 msgid "Translated by"
 msgstr "Traduit par"
 
@@ -1081,11 +1081,11 @@ msgstr "Monter"
 msgid "Update"
 msgstr "Mise à jour"
 
-#: src/wx/film_editor.cc:128
+#: src/wx/film_editor.cc:123
 msgid "Use ISDCF name"
 msgstr "Utiliser le nom ISDCF"
 
-#: src/wx/config_dialog.cc:450
+#: src/wx/config_dialog.cc:452
 msgid "Use all servers"
 msgstr "Utiliser tous les serveurs"
 
@@ -1097,7 +1097,7 @@ msgstr "Automatique"
 msgid "Use preset"
 msgstr "Utiliser le préréglage"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:568
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
@@ -1113,7 +1113,7 @@ msgstr "Vidéo"
 msgid "Video frame rate"
 msgstr "Cadence vidéo"
 
-#: src/wx/config_dialog.cc:811
+#: src/wx/config_dialog.cc:815
 msgid "Warnings"
 msgstr "Avertissements"
 
@@ -1133,10 +1133,20 @@ msgstr "Développé par"
 msgid "X Offset"
 msgstr "Position horizontale"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "X Scale"
+msgstr "Mise à l'échelle"
+
 #: src/wx/subtitle_panel.cc:53
 msgid "Y Offset"
 msgstr "Position verticale"
 
+#: src/wx/subtitle_panel.cc:71
+#, fuzzy
+msgid "Y Scale"
+msgstr "Mise à l'échelle"
+
 #: src/wx/hints_dialog.cc:121
 #, c-format
 msgid ""
@@ -1189,11 +1199,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:296
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:300
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:254
+#: src/wx/config_dialog.cc:258
 msgid "s"
 msgstr "s"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 1d6d21120..569f49975 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.3\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
-#: src/wx/subtitle_panel.cc:66
+#: src/wx/subtitle_panel.cc:66 src/wx/subtitle_panel.cc:75
 msgid "%"
 msgstr "%"
 
@@ -27,11 +27,11 @@ msgid ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:666
+#: src/wx/config_dialog.cc:664
 msgid "(password will be stored on disk in plaintext)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:98
+#: src/wx/config_dialog.cc:104
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
@@ -132,12 +132,12 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:799
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "Frequenza fotogrammi video"
 
-#: src/wx/about_dialog.cc:110
+#: src/wx/about_dialog.cc:111
 msgid "Artwork by"
 msgstr ""
 
@@ -169,7 +169,7 @@ msgstr ""
 "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP con "
 "guadagno di %.1fdB."
 
-#: src/wx/config_dialog.cc:685
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "Indirizzo IP"
@@ -203,7 +203,7 @@ msgstr "Ma dovrò riprodurre con il fader a"
 msgid "C"
 msgstr "C"
 
-#: src/wx/config_dialog.cc:681
+#: src/wx/config_dialog.cc:679
 #, fuzzy
 msgid "CC address"
 msgstr "Indirizzo IP"
@@ -251,11 +251,11 @@ msgstr "Guadagno audio"
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:120
 msgid "Check for testing updates as well as stable ones"
 msgstr "Controlla per aggiornamenti test o stabili"
 
-#: src/wx/config_dialog.cc:110
+#: src/wx/config_dialog.cc:116
 msgid "Check for updates on startup"
 msgstr "Controlla gli aggiornamentio alla partenza"
 
@@ -263,11 +263,11 @@ msgstr "Controlla gli aggiornamentio alla partenza"
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: src/wx/film_editor.cc:797
+#: src/wx/film_editor.cc:810
 msgid "Choose a file or files"
 msgstr "Scegli uno o più file"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:820
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
 msgid "Choose a folder"
 msgstr "Scegli una cartella"
 
@@ -276,7 +276,7 @@ msgstr "Scegli una cartella"
 msgid "Cinema"
 msgstr "Aggiungi Cinema"
 
-#: src/wx/config_dialog.cc:496
+#: src/wx/config_dialog.cc:498
 #, fuzzy
 msgid "Colour Conversions"
 msgstr "Conversioni colore"
@@ -286,7 +286,7 @@ msgstr "Conversioni colore"
 msgid "Colour conversion"
 msgstr "Conversione colore"
 
-#: src/wx/config_dialog.cc:817
+#: src/wx/config_dialog.cc:819
 msgid "Config|Timing"
 msgstr ""
 
@@ -360,7 +360,7 @@ msgstr ""
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:118
+#: src/wx/film_editor.cc:129
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
@@ -377,46 +377,46 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:266
+#: src/wx/config_dialog.cc:270
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Dettagli del nome DCI predefinito"
 
-#: src/wx/config_dialog.cc:283
+#: src/wx/config_dialog.cc:287
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:296
 msgid "Default audio delay"
 msgstr "Ritardo audio predefinito"
 
-#: src/wx/config_dialog.cc:274
+#: src/wx/config_dialog.cc:278
 msgid "Default container"
 msgstr "Contenitore predefinito"
 
-#: src/wx/config_dialog.cc:278
+#: src/wx/config_dialog.cc:282
 msgid "Default content type"
 msgstr "Tipo sorgente predefinito"
 
-#: src/wx/config_dialog.cc:258
+#: src/wx/config_dialog.cc:262
 msgid "Default directory for new films"
 msgstr "Cartella predefinita per i nuovi films"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:254
 msgid "Default duration of still images"
 msgstr "Durata predefinita immagini statiche"
 
-#: src/wx/config_dialog.cc:300
+#: src/wx/config_dialog.cc:304
 #, fuzzy
 msgid "Default issuer"
 msgstr "Predefiniti"
 
-#: src/wx/config_dialog.cc:270
+#: src/wx/config_dialog.cc:274
 msgid "Default scale to"
 msgstr ""
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:235
 msgid "Defaults"
 msgstr "Predefiniti"
 
@@ -425,7 +425,7 @@ msgstr "Predefiniti"
 msgid "Delay"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:79
+#: src/wx/film_editor.cc:125 src/wx/job_manager_view.cc:79
 msgid "Details..."
 msgstr "Dettagli"
 
@@ -472,7 +472,7 @@ msgstr "Modifica Cinema..."
 msgid "Edit Screen..."
 msgstr "Modifica Schermo..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:271
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:66
 msgid "Edit..."
@@ -491,7 +491,7 @@ msgstr "Servers di codifica"
 msgid "Encrypted"
 msgstr "Criptato"
 
-#: src/wx/config_dialog.cc:814
+#: src/wx/config_dialog.cc:817
 msgid "Errors"
 msgstr ""
 
@@ -542,7 +542,7 @@ msgstr ""
 msgid "From"
 msgstr "Da"
 
-#: src/wx/config_dialog.cc:677
+#: src/wx/config_dialog.cc:675
 #, fuzzy
 msgid "From address"
 msgstr "Indirizzo IP"
@@ -572,7 +572,7 @@ msgstr "Guadagno per il canale sorgente %d nel canale DCP %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:809
+#: src/wx/config_dialog.cc:813
 msgid "General"
 msgstr ""
 
@@ -600,11 +600,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:562
+#: src/wx/config_dialog.cc:560
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/config_dialog.cc:454
+#: src/wx/config_dialog.cc:456
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Indirizzo IP"
@@ -630,7 +630,7 @@ msgstr "Banda passante JPEG2000"
 msgid "Join"
 msgstr ""
 
-#: src/wx/config_dialog.cc:629
+#: src/wx/config_dialog.cc:627
 msgid "KDM Email"
 msgstr ""
 
@@ -670,24 +670,28 @@ msgstr "Linearizza la curva del gamma in ingresso per piccoli valori"
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:808
+#: src/wx/config_dialog.cc:807
 msgid "Log"
 msgstr ""
 
+#: src/wx/config_dialog.cc:804
+msgid "Log:"
+msgstr ""
+
 #: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:771
+#: src/wx/film_editor.cc:784
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
-#: src/wx/config_dialog.cc:662
+#: src/wx/config_dialog.cc:660
 #, fuzzy
 msgid "Mail password"
 msgstr "Password del TMS"
 
-#: src/wx/config_dialog.cc:658
+#: src/wx/config_dialog.cc:656
 #, fuzzy
 msgid "Mail user name"
 msgstr "Nome utente del TMS"
@@ -704,12 +708,12 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:796
+#: src/wx/config_dialog.cc:791
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:287 src/wx/config_dialog.cc:800
+#: src/wx/config_dialog.cc:291 src/wx/config_dialog.cc:795
 #: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr ""
@@ -753,7 +757,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:654
+#: src/wx/config_dialog.cc:652
 msgid "Outgoing mail server"
 msgstr "Mail server posta in uscita"
 
@@ -775,7 +779,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:574
+#: src/wx/config_dialog.cc:572
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
@@ -853,7 +857,7 @@ msgstr "Ripeti il contenuto"
 msgid "Repeat..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:692
+#: src/wx/config_dialog.cc:690
 msgid "Reset to default text"
 msgstr ""
 
@@ -881,11 +885,6 @@ 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"
@@ -933,7 +932,7 @@ msgstr ""
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:434
+#: src/wx/config_dialog.cc:438
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
@@ -942,7 +941,7 @@ msgstr "Server"
 msgid "Set"
 msgstr ""
 
-#: src/wx/config_dialog.cc:86
+#: src/wx/config_dialog.cc:92
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
@@ -970,7 +969,7 @@ msgstr "Versione stabile"
 msgid "Standard"
 msgstr ""
 
-#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:79
 #, fuzzy
 msgid "Stream"
 msgstr "Traccia"
@@ -979,7 +978,7 @@ msgstr "Traccia"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (es. TCF)"
 
-#: src/wx/config_dialog.cc:673
+#: src/wx/config_dialog.cc:671
 msgid "Subject"
 msgstr ""
 
@@ -991,7 +990,7 @@ msgstr "Lingua dei Sottotitoli (es. FR)"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:160
+#: src/wx/about_dialog.cc:164
 msgid "Supported by"
 msgstr ""
 
@@ -999,7 +998,7 @@ msgstr ""
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:566
+#: src/wx/config_dialog.cc:564
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
@@ -1017,7 +1016,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:205
+#: src/wx/about_dialog.cc:209
 msgid "Tested by"
 msgstr ""
 
@@ -1046,7 +1045,7 @@ msgstr ""
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:111
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
@@ -1070,7 +1069,7 @@ msgstr ""
 msgid "Top crop"
 msgstr "Taglio in alto"
 
-#: src/wx/about_dialog.cc:106
+#: src/wx/about_dialog.cc:107
 msgid "Translated by"
 msgstr ""
 
@@ -1108,12 +1107,12 @@ msgstr "Su"
 msgid "Update"
 msgstr "Aggiorna"
 
-#: src/wx/film_editor.cc:128
+#: src/wx/film_editor.cc:123
 #, fuzzy
 msgid "Use ISDCF name"
 msgstr "Usa nome DCI"
 
-#: src/wx/config_dialog.cc:450
+#: src/wx/config_dialog.cc:452
 msgid "Use all servers"
 msgstr "Usa tutti i server"
 
@@ -1125,7 +1124,7 @@ msgstr "Usa la migliore"
 msgid "Use preset"
 msgstr "Usa predefinito"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:568
 msgid "User name"
 msgstr "Nome utente"
 
@@ -1141,7 +1140,7 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "Frequenza fotogrammi video"
 
-#: src/wx/config_dialog.cc:811
+#: src/wx/config_dialog.cc:815
 msgid "Warnings"
 msgstr ""
 
@@ -1161,10 +1160,20 @@ msgstr ""
 msgid "X Offset"
 msgstr "Spostamento X"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "X Scale"
+msgstr "Scaler"
+
 #: src/wx/subtitle_panel.cc:53
 msgid "Y Offset"
 msgstr "Spostamento Y"
 
+#: src/wx/subtitle_panel.cc:71
+#, fuzzy
+msgid "Y Scale"
+msgstr "Scaler"
+
 #: src/wx/hints_dialog.cc:121
 #, c-format
 msgid ""
@@ -1218,11 +1227,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:296
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:300
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:254
+#: src/wx/config_dialog.cc:258
 msgid "s"
 msgstr "s"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 1855a87c8..3df5b839d 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-08-31 17:20+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-09-04 20:17+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
-#: src/wx/subtitle_panel.cc:66
+#: src/wx/subtitle_panel.cc:66 src/wx/subtitle_panel.cc:75
 msgid "%"
 msgstr "%"
 
@@ -29,11 +29,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:682
+#: src/wx/config_dialog.cc:664
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(wachtwoord wordt opgeslagen op disk in leesbare tekst)"
 
-#: src/wx/config_dialog.cc:98
+#: src/wx/config_dialog.cc:104
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(herstart DCP-o-matic voor taal wijziging)"
 
@@ -141,11 +141,11 @@ msgstr ""
 "beeld zullen komen. U kan best de DCP's container instellen in Scope "
 "(2.39:1) in de \"DCP\"tab."
 
-#: src/wx/config_dialog.cc:820
+#: src/wx/config_dialog.cc:799
 msgid "Allow any DCP frame rate"
 msgstr "Sta om het welke frame rate toe in DCP"
 
-#: src/wx/about_dialog.cc:110
+#: src/wx/about_dialog.cc:111
 msgid "Artwork by"
 msgstr "Artwork door"
 
@@ -178,7 +178,7 @@ msgstr ""
 "Audio wordt doorgestuurd van content kanaal %d naar DCP kanaal %d met gain "
 "%1fdB."
 
-#: src/wx/config_dialog.cc:701
+#: src/wx/config_dialog.cc:683
 msgid "BCC address"
 msgstr "BCC adres"
 
@@ -211,7 +211,7 @@ msgstr "Maak ik gebruik een fader"
 msgid "C"
 msgstr "C"
 
-#: src/wx/config_dialog.cc:697
+#: src/wx/config_dialog.cc:679
 msgid "CC address"
 msgstr "CC adres"
 
@@ -239,8 +239,8 @@ msgstr "Afbreken"
 msgid "Certificate"
 msgstr "certificaat"
 
-#: src/wx/dolby_certificate_dialog.cc:156
-#: src/wx/doremi_certificate_dialog.cc:92
+#: src/wx/dolby_certificate_dialog.cc:191
+#: src/wx/doremi_certificate_dialog.cc:103
 msgid "Certificate downloaded"
 msgstr "Certificaat gedownload"
 
@@ -256,11 +256,11 @@ msgstr "Kanaal versterking"
 msgid "Channels"
 msgstr "Kanalen"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:120
 msgid "Check for testing updates as well as stable ones"
 msgstr "Selecteer voor Test updates en Stabiele versies "
 
-#: src/wx/config_dialog.cc:110
+#: src/wx/config_dialog.cc:116
 msgid "Check for updates on startup"
 msgstr "Selecteer voor updates controle bij startup"
 
@@ -268,19 +268,19 @@ msgstr "Selecteer voor updates controle bij startup"
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
-#: src/wx/film_editor.cc:795
+#: src/wx/film_editor.cc:810
 msgid "Choose a file or files"
 msgstr "Kies bestand(en)"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:818
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
 msgid "Choose a folder"
 msgstr "Kies map"
 
-#: src/wx/dolby_certificate_dialog.cc:42
+#: src/wx/dolby_certificate_dialog.cc:43
 msgid "Cinema"
 msgstr "Bioscoop"
 
-#: src/wx/config_dialog.cc:512
+#: src/wx/config_dialog.cc:498
 msgid "Colour Conversions"
 msgstr "Colour Conversions"
 
@@ -289,7 +289,7 @@ msgstr "Colour Conversions"
 msgid "Colour conversion"
 msgstr "Colour conversion"
 
-#: src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:819
 msgid "Config|Timing"
 msgstr "Configureer|Timing"
 
@@ -342,7 +342,7 @@ msgstr "Kan geen DCP maken: %s"
 msgid "Could not read certificate file (%s)"
 msgstr "Onleesbaar certificaat (%s)"
 
-#: src/wx/dolby_certificate_dialog.cc:38
+#: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
 msgstr "Land"
 
@@ -363,7 +363,7 @@ msgstr "aangepast"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:118
+#: src/wx/film_editor.cc:129
 msgid "DCP Name"
 msgstr "DCP naam"
 
@@ -380,47 +380,43 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:266
+#: src/wx/config_dialog.cc:270
 msgid "Default ISDCF name details"
 msgstr "Standaard ISDCF naam details"
 
-#: src/wx/config_dialog.cc:283
+#: src/wx/config_dialog.cc:287
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standaard JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:296
 msgid "Default audio delay"
 msgstr "Standaard audio delay"
 
-#: src/wx/config_dialog.cc:274
+#: src/wx/config_dialog.cc:278
 msgid "Default container"
 msgstr "Standaard container"
 
-#: src/wx/config_dialog.cc:278
+#: src/wx/config_dialog.cc:282
 msgid "Default content type"
 msgstr "Standaard content type"
 
-#: src/wx/config_dialog.cc:304
-msgid "Default creator"
-msgstr "Standaard maker"
-
-#: src/wx/config_dialog.cc:258
+#: src/wx/config_dialog.cc:262
 msgid "Default directory for new films"
 msgstr "Standaard map voor nieuwe films"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:254
 msgid "Default duration of still images"
 msgstr "Standaard lengte van stills"
 
-#: src/wx/config_dialog.cc:300
+#: src/wx/config_dialog.cc:304
 msgid "Default issuer"
 msgstr "Standaard uitgever"
 
-#: src/wx/config_dialog.cc:270
+#: src/wx/config_dialog.cc:274
 msgid "Default scale to"
 msgstr "Standaard schaal naar"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:235
 msgid "Defaults"
 msgstr "Standaard instellingen"
 
@@ -428,7 +424,7 @@ msgstr "Standaard instellingen"
 msgid "Delay"
 msgstr "Vertraging"
 
-#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:79
+#: src/wx/film_editor.cc:125 src/wx/job_manager_view.cc:79
 msgid "Details..."
 msgstr "Details..."
 
@@ -446,7 +442,7 @@ msgstr "Dolby"
 msgid "Doremi"
 msgstr "Doremi"
 
-#: src/wx/doremi_certificate_dialog.cc:49
+#: src/wx/doremi_certificate_dialog.cc:50
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi serial numbers moeten bestaan uit 6 digits"
 
@@ -462,8 +458,8 @@ msgstr "Download"
 msgid "Download certificate"
 msgstr "Download certificaat"
 
-#: src/wx/dolby_certificate_dialog.cc:131
-#: src/wx/doremi_certificate_dialog.cc:53
+#: src/wx/dolby_certificate_dialog.cc:157
+#: src/wx/doremi_certificate_dialog.cc:54
 msgid "Downloading certificate"
 msgstr "Downloading certificaat"
 
@@ -475,7 +471,7 @@ msgstr "Edit Bioscoop"
 msgid "Edit Screen..."
 msgstr "Edit scherm"
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:271
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:66
 msgid "Edit..."
@@ -493,7 +489,7 @@ msgstr "Encoding Servers"
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: src/wx/config_dialog.cc:830
+#: src/wx/config_dialog.cc:817
 msgid "Errors"
 msgstr "Fouten"
 
@@ -501,8 +497,9 @@ msgstr "Fouten"
 msgid "Facility (e.g. DLA)"
 msgstr "faciliteit (e.g. DLA)"
 
-#: src/wx/dolby_certificate_dialog.cc:75 src/wx/dolby_certificate_dialog.cc:90
-#: src/wx/dolby_certificate_dialog.cc:105
+#: src/wx/dolby_certificate_dialog.cc:76
+#: src/wx/dolby_certificate_dialog.cc:100
+#: src/wx/dolby_certificate_dialog.cc:123
 msgid "Fetching..."
 msgstr "Ophalen..."
 
@@ -542,7 +539,7 @@ msgstr "Gratis, open-source DCP samensteller voor bijna alles."
 msgid "From"
 msgstr "Van"
 
-#: src/wx/config_dialog.cc:693
+#: src/wx/config_dialog.cc:675
 msgid "From address"
 msgstr "Van adres"
 
@@ -571,7 +568,7 @@ msgstr "Gain voor content kanaal %d in DCP kanaal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:825
+#: src/wx/config_dialog.cc:813
 msgid "General"
 msgstr "Algemeen"
 
@@ -599,11 +596,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Ik wil dit afspelen met fader"
 
-#: src/wx/config_dialog.cc:578
+#: src/wx/config_dialog.cc:560
 msgid "IP address"
 msgstr "IP adres"
 
-#: src/wx/config_dialog.cc:470
+#: src/wx/config_dialog.cc:456
 msgid "IP address / host name"
 msgstr "IP adres / host naam"
 
@@ -627,7 +624,7 @@ msgstr "JPEG2000 bandbreedte"
 msgid "Join"
 msgstr "Samenvoegen"
 
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:627
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -667,23 +664,27 @@ msgstr "Linearise input gamma curve for low values"
 msgid "Load from file..."
 msgstr "Laad van bestand..."
 
-#: src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:807
 msgid "Log"
 msgstr "Log"
 
+#: src/wx/config_dialog.cc:804
+msgid "Log:"
+msgstr ""
+
 #: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:769
+#: src/wx/film_editor.cc:784
 msgid "MISSING: "
 msgstr "ONTBREEKT:"
 
-#: src/wx/config_dialog.cc:678
+#: src/wx/config_dialog.cc:660
 msgid "Mail password"
 msgstr "Mail wachtwoord"
 
-#: src/wx/config_dialog.cc:674
+#: src/wx/config_dialog.cc:656
 msgid "Mail user name"
 msgstr "Mail gebruikersnaam"
 
@@ -699,11 +700,11 @@ msgstr "Gemasterde helderheid (bv. 4fl)"
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:791
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximum JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:287 src/wx/config_dialog.cc:816
+#: src/wx/config_dialog.cc:291 src/wx/config_dialog.cc:795
 #: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -716,7 +717,7 @@ msgstr "Meedere content geselecteerd"
 msgid "My Documents"
 msgstr "Mijn documenten"
 
-#: src/wx/cinema_dialog.cc:28 src/wx/config_dialog.cc:528
+#: 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"
@@ -749,7 +750,7 @@ msgstr "Uit"
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:670
+#: src/wx/config_dialog.cc:652
 msgid "Outgoing mail server"
 msgstr "Uitgaande mail server"
 
@@ -770,7 +771,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:590
+#: src/wx/config_dialog.cc:572
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -847,7 +848,7 @@ msgstr "Herhaal content"
 msgid "Repeat..."
 msgstr "Herhaal..."
 
-#: src/wx/config_dialog.cc:708
+#: src/wx/config_dialog.cc:690
 msgid "Reset to default text"
 msgstr "Herinstellen oorspronkelijke tekst"
 
@@ -875,10 +876,6 @@ msgstr "Rs"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/subtitle_panel.cc:62
-msgid "Scale"
-msgstr "Schaal"
-
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
 msgstr "Schaal tot"
@@ -908,7 +905,7 @@ msgstr "Selecteer Certificaat bestand"
 msgid "Send by email"
 msgstr "Stuur per Email"
 
-#: src/wx/dolby_certificate_dialog.cc:46
+#: src/wx/dolby_certificate_dialog.cc:47
 msgid "Serial number"
 msgstr "Serie nummer"
 
@@ -920,11 +917,11 @@ msgstr "Server"
 msgid "Server manufacturer"
 msgstr "Server fabrikant"
 
-#: src/wx/doremi_certificate_dialog.cc:36
+#: src/wx/doremi_certificate_dialog.cc:37
 msgid "Server serial number"
 msgstr "Server serie nummer"
 
-#: src/wx/config_dialog.cc:450
+#: src/wx/config_dialog.cc:438
 msgid "Servers"
 msgstr "Servers"
 
@@ -932,7 +929,7 @@ msgstr "Servers"
 msgid "Set"
 msgstr "Instellen"
 
-#: src/wx/config_dialog.cc:86
+#: src/wx/config_dialog.cc:92
 msgid "Set language"
 msgstr "Taal Instellen"
 
@@ -960,7 +957,7 @@ msgstr "Stabiele versie"
 msgid "Standard"
 msgstr "Standaard"
 
-#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:79
 msgid "Stream"
 msgstr "Stroom"
 
@@ -968,7 +965,7 @@ msgstr "Stroom"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (e.g. TCF)"
 
-#: src/wx/config_dialog.cc:689
+#: src/wx/config_dialog.cc:671
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -980,15 +977,15 @@ msgstr "Ondertitel Taal (vb  NL)"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:158
+#: src/wx/about_dialog.cc:164
 msgid "Supported by"
 msgstr "Ondersteund door"
 
-#: src/wx/config_dialog.cc:558
+#: src/wx/config_dialog.cc:542
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:582
+#: src/wx/config_dialog.cc:564
 msgid "Target path"
 msgstr "Doel pad"
 
@@ -1004,7 +1001,7 @@ msgstr "Grondgebied (vb NL)"
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:203
+#: src/wx/about_dialog.cc:209
 msgid "Tested by"
 msgstr "Getest door"
 
@@ -1034,7 +1031,7 @@ msgstr "Dit is geen geldig CPL bestand"
 msgid "Threads"
 msgstr "CPU belasting"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:111
 msgid "Threads to use for encoding on this host"
 msgstr "CPU cores beschikbaar voor encoding op deze host"
 
@@ -1058,7 +1055,7 @@ msgstr "Timing|Timing"
 msgid "Top crop"
 msgstr "Top crop"
 
-#: src/wx/about_dialog.cc:106
+#: src/wx/about_dialog.cc:107
 msgid "Translated by"
 msgstr "Vertaald door"
 
@@ -1074,7 +1071,7 @@ msgstr "Trim vanaf begin"
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/dolby_certificate_dialog.cc:147
+#: src/wx/dolby_certificate_dialog.cc:182
 msgid "Unexpected certificate filename form"
 msgstr "Onverwachte certificaat bestandsnaam vorm"
 
@@ -1094,11 +1091,11 @@ msgstr "Omhoog"
 msgid "Update"
 msgstr "Update"
 
-#: src/wx/film_editor.cc:128
+#: src/wx/film_editor.cc:123
 msgid "Use ISDCF name"
 msgstr "Gebruik ISDCF naam"
 
-#: src/wx/config_dialog.cc:466
+#: src/wx/config_dialog.cc:452
 msgid "Use all servers"
 msgstr "Gebruik alle servers"
 
@@ -1110,7 +1107,7 @@ msgstr "Gebruik de beste"
 msgid "Use preset"
 msgstr "Gebruik preset"
 
-#: src/wx/config_dialog.cc:586
+#: src/wx/config_dialog.cc:568
 msgid "User name"
 msgstr "Gebruikersnaam"
 
@@ -1126,7 +1123,7 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "Video frame rate"
 
-#: src/wx/config_dialog.cc:827
+#: src/wx/config_dialog.cc:815
 msgid "Warnings"
 msgstr "Waarschuwingen"
 
@@ -1146,10 +1143,20 @@ msgstr "Geschreven door"
 msgid "X Offset"
 msgstr "X offset"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "X Scale"
+msgstr "Schaal"
+
 #: src/wx/subtitle_panel.cc:53
 msgid "Y Offset"
 msgstr "Y offset"
 
+#: src/wx/subtitle_panel.cc:71
+#, fuzzy
+msgid "Y Scale"
+msgstr "Schaal"
+
 #: src/wx/hints_dialog.cc:121
 #, c-format
 msgid ""
@@ -1201,11 +1208,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:296
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:300
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:254
+#: src/wx/config_dialog.cc:258
 msgid "s"
 msgstr "s"
 
@@ -1221,6 +1228,9 @@ msgstr "tijden"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Default creator"
+#~ msgstr "Standaard maker"
+
 #~ msgid "Audio Gain"
 #~ msgstr "Audio Gain"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 47e8b538d..7a75403ab 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-09-08 23:05+0100\n"
+"POT-Creation-Date: 2014-10-03 22:31+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.3\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
-#: src/wx/subtitle_panel.cc:66
+#: src/wx/subtitle_panel.cc:66 src/wx/subtitle_panel.cc:75
 msgid "%"
 msgstr "%"
 
@@ -28,11 +28,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:666
+#: src/wx/config_dialog.cc:664
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(lösenord sparas på disk i klartext)"
 
-#: src/wx/config_dialog.cc:98
+#: src/wx/config_dialog.cc:104
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
@@ -134,12 +134,12 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:804
+#: src/wx/config_dialog.cc:799
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "bildhastighet"
 
-#: src/wx/about_dialog.cc:110
+#: src/wx/about_dialog.cc:111
 msgid "Artwork by"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgstr ""
 "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d med "
 "förstärkning %.1fdB."
 
-#: src/wx/config_dialog.cc:685
+#: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
 msgstr "IP-adress"
@@ -206,7 +206,7 @@ msgstr "Men jag måste använda mixervolym"
 msgid "C"
 msgstr "C"
 
-#: src/wx/config_dialog.cc:681
+#: src/wx/config_dialog.cc:679
 #, fuzzy
 msgid "CC address"
 msgstr "IP-adress"
@@ -255,11 +255,11 @@ msgstr "Kanalförstärkning"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:120
 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:110
+#: src/wx/config_dialog.cc:116
 msgid "Check for updates on startup"
 msgstr "Sök efter uppdateringar vid start"
 
@@ -267,11 +267,11 @@ msgstr "Sök efter uppdateringar vid start"
 msgid "Choose a file"
 msgstr "Välj en fil"
 
-#: src/wx/film_editor.cc:797
+#: src/wx/film_editor.cc:810
 msgid "Choose a file or files"
 msgstr "Välj en fil eller filer"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:820
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
 msgid "Choose a folder"
 msgstr "Välj en folder"
 
@@ -280,7 +280,7 @@ msgstr "Välj en folder"
 msgid "Cinema"
 msgstr "Lägg till Cinema..."
 
-#: src/wx/config_dialog.cc:496
+#: src/wx/config_dialog.cc:498
 #, fuzzy
 msgid "Colour Conversions"
 msgstr "Färgkonverteringar"
@@ -291,7 +291,7 @@ msgid "Colour conversion"
 msgstr "Färgkonvertering"
 
 # Svengelska
-#: src/wx/config_dialog.cc:817
+#: src/wx/config_dialog.cc:819
 #, fuzzy
 msgid "Config|Timing"
 msgstr "Tajming"
@@ -367,7 +367,7 @@ msgstr "Special"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:118
+#: src/wx/film_editor.cc:129
 msgid "DCP Name"
 msgstr "DCP-namn"
 
@@ -384,45 +384,45 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:266
+#: src/wx/config_dialog.cc:270
 #, fuzzy
 msgid "Default ISDCF name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:283
+#: src/wx/config_dialog.cc:287
 msgid "Default JPEG2000 bandwidth"
 msgstr "Förvald JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:292
+#: src/wx/config_dialog.cc:296
 msgid "Default audio delay"
 msgstr "Förvald audiofördröjning"
 
-#: src/wx/config_dialog.cc:274
+#: src/wx/config_dialog.cc:278
 msgid "Default container"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:278
+#: src/wx/config_dialog.cc:282
 msgid "Default content type"
 msgstr "Förvald innehållstyp"
 
-#: src/wx/config_dialog.cc:258
+#: src/wx/config_dialog.cc:262
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:254
 msgid "Default duration of still images"
 msgstr "Förvald varaktighet på stillbilder"
 
-#: src/wx/config_dialog.cc:300
+#: src/wx/config_dialog.cc:304
 #, fuzzy
 msgid "Default issuer"
 msgstr "Standardval"
 
-#: src/wx/config_dialog.cc:270
+#: src/wx/config_dialog.cc:274
 msgid "Default scale to"
 msgstr ""
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:235
 msgid "Defaults"
 msgstr "Standardval"
 
@@ -431,7 +431,7 @@ msgstr "Standardval"
 msgid "Delay"
 msgstr "Audio Fördröjning"
 
-#: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:79
+#: src/wx/film_editor.cc:125 src/wx/job_manager_view.cc:79
 msgid "Details..."
 msgstr "Detaljer..."
 
@@ -479,7 +479,7 @@ msgstr "Redigera Cinema..."
 msgid "Edit Screen..."
 msgstr "Redigera Skärm..."
 
-#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:267
+#: src/wx/audio_mapping_view.cc:135 src/wx/config_dialog.cc:271
 #: src/wx/video_panel.cc:155 src/wx/video_panel.cc:172
 #: src/wx/editable_list.h:66
 msgid "Edit..."
@@ -497,7 +497,7 @@ msgstr "Kodningsservrar"
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: src/wx/config_dialog.cc:814
+#: src/wx/config_dialog.cc:817
 msgid "Errors"
 msgstr ""
 
@@ -549,7 +549,7 @@ msgstr "Fri, öppen-källkods DCP-generering från nästan vad som helst."
 msgid "From"
 msgstr "Avsändare"
 
-#: src/wx/config_dialog.cc:677
+#: src/wx/config_dialog.cc:675
 #, fuzzy
 msgid "From address"
 msgstr "IP-adress"
@@ -579,7 +579,7 @@ msgstr "Förstärkning för innehållskanal %d i DCP-kanal %d"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/config_dialog.cc:809
+#: src/wx/config_dialog.cc:813
 msgid "General"
 msgstr ""
 
@@ -607,11 +607,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:562
+#: src/wx/config_dialog.cc:560
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/config_dialog.cc:454
+#: src/wx/config_dialog.cc:456
 msgid "IP address / host name"
 msgstr "IP-adress / datornamn"
 
@@ -636,7 +636,7 @@ msgstr "JPEG2000-bandbredd"
 msgid "Join"
 msgstr "Anslut"
 
-#: src/wx/config_dialog.cc:629
+#: src/wx/config_dialog.cc:627
 #, fuzzy
 msgid "KDM Email"
 msgstr "KDM mejl"
@@ -680,23 +680,27 @@ msgstr "Linjärisera indatas gammakurva för låga värden"
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:808
+#: src/wx/config_dialog.cc:807
 msgid "Log"
 msgstr ""
 
+#: src/wx/config_dialog.cc:804
+msgid "Log:"
+msgstr ""
+
 #: src/wx/audio_mapping_view.cc:293
 msgid "Ls"
 msgstr "Vs"
 
-#: src/wx/film_editor.cc:771
+#: src/wx/film_editor.cc:784
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
-#: src/wx/config_dialog.cc:662
+#: src/wx/config_dialog.cc:660
 msgid "Mail password"
 msgstr "Mejl-lösenord"
 
-#: src/wx/config_dialog.cc:658
+#: src/wx/config_dialog.cc:656
 msgid "Mail user name"
 msgstr "Mejl-användarnamn"
 
@@ -712,12 +716,12 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matris"
 
-#: src/wx/config_dialog.cc:796
+#: src/wx/config_dialog.cc:791
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "JPEG2000-bandbredd"
 
-#: src/wx/config_dialog.cc:287 src/wx/config_dialog.cc:800
+#: src/wx/config_dialog.cc:291 src/wx/config_dialog.cc:795
 #: src/wx/film_editor.cc:185
 msgid "Mbit/s"
 msgstr ""
@@ -764,7 +768,7 @@ msgstr "Av"
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:654
+#: src/wx/config_dialog.cc:652
 msgid "Outgoing mail server"
 msgstr "Utgående mejlserver"
 
@@ -786,7 +790,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:574
+#: src/wx/config_dialog.cc:572
 msgid "Password"
 msgstr "Lösenord"
 
@@ -864,7 +868,7 @@ msgstr "Repetera Innehåll"
 msgid "Repeat..."
 msgstr "Upprepa..."
 
-#: src/wx/config_dialog.cc:692
+#: src/wx/config_dialog.cc:690
 msgid "Reset to default text"
 msgstr ""
 
@@ -892,11 +896,6 @@ 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"
@@ -944,7 +943,7 @@ msgstr ""
 msgid "Server serial number"
 msgstr ""
 
-#: src/wx/config_dialog.cc:434
+#: src/wx/config_dialog.cc:438
 #, fuzzy
 msgid "Servers"
 msgstr "Server"
@@ -953,7 +952,7 @@ msgstr "Server"
 msgid "Set"
 msgstr "Sätt"
 
-#: src/wx/config_dialog.cc:86
+#: src/wx/config_dialog.cc:92
 msgid "Set language"
 msgstr "Välj språk"
 
@@ -982,7 +981,7 @@ msgstr "Stabil version"
 msgid "Standard"
 msgstr "Standard"
 
-#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
+#: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:79
 #, fuzzy
 msgid "Stream"
 msgstr "Audioström"
@@ -991,7 +990,7 @@ msgstr "Audioström"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/config_dialog.cc:673
+#: src/wx/config_dialog.cc:671
 msgid "Subject"
 msgstr ""
 
@@ -1003,7 +1002,7 @@ msgstr "Undertextspråk (ex. SV)"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:160
+#: src/wx/about_dialog.cc:164
 msgid "Supported by"
 msgstr "Stöd från"
 
@@ -1011,7 +1010,7 @@ msgstr "Stöd från"
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:566
+#: src/wx/config_dialog.cc:564
 msgid "Target path"
 msgstr "Målsökväg"
 
@@ -1028,7 +1027,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:205
+#: src/wx/about_dialog.cc:209
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"
@@ -1058,7 +1057,7 @@ msgstr ""
 msgid "Threads"
 msgstr "Trådar"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:111
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
@@ -1084,7 +1083,7 @@ msgstr "Tajming"
 msgid "Top crop"
 msgstr "Övre beskärning"
 
-#: src/wx/about_dialog.cc:106
+#: src/wx/about_dialog.cc:107
 msgid "Translated by"
 msgstr "Översatt av"
 
@@ -1123,12 +1122,12 @@ msgstr "Upp"
 msgid "Update"
 msgstr "Uppdatera"
 
-#: src/wx/film_editor.cc:128
+#: src/wx/film_editor.cc:123
 #, fuzzy
 msgid "Use ISDCF name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/config_dialog.cc:450
+#: src/wx/config_dialog.cc:452
 msgid "Use all servers"
 msgstr "Använd alla servrar"
 
@@ -1140,7 +1139,7 @@ msgstr "Använd bästa"
 msgid "Use preset"
 msgstr "Använd förhandsinställning"
 
-#: src/wx/config_dialog.cc:570
+#: src/wx/config_dialog.cc:568
 msgid "User name"
 msgstr "Användarnamn"
 
@@ -1156,7 +1155,7 @@ msgstr "Video"
 msgid "Video frame rate"
 msgstr "bildhastighet"
 
-#: src/wx/config_dialog.cc:811
+#: src/wx/config_dialog.cc:815
 msgid "Warnings"
 msgstr ""
 
@@ -1177,11 +1176,21 @@ msgstr "Skriven av"
 msgid "X Offset"
 msgstr "Undertext Förskjutning"
 
+#: src/wx/subtitle_panel.cc:62
+#, fuzzy
+msgid "X Scale"
+msgstr "Omskalare"
+
 #: src/wx/subtitle_panel.cc:53
 #, fuzzy
 msgid "Y Offset"
 msgstr "Undertext Förskjutning"
 
+#: src/wx/subtitle_panel.cc:71
+#, fuzzy
+msgid "Y Scale"
+msgstr "Omskalare"
+
 #: src/wx/hints_dialog.cc:121
 #, c-format
 msgid ""
@@ -1233,11 +1242,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:296
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:300
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:254
+#: src/wx/config_dialog.cc:258
 msgid "s"
 msgstr "s"