Merge master.

26 files changed, 1565 insertions, 901 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 1c34619b4..454b03e3a 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -66,7 +66,7 @@ Config::Config ()
 	, _default_j2k_bandwidth (200000000)
 	, _default_audio_delay (0)
 	, _kdm_email (
-		"Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nThe KDMs are valid from $START_TIME until $END_TIME.\n\nBest regards,\nDCP-o-matic"
+		_("Dear Projectionist\n\nPlease find attached KDMs for $CPL_NAME.\n\nThe KDMs are valid from $START_TIME until $END_TIME.\n\nBest regards,\nDCP-o-matic")
 		)
 {
 	_allowed_dcp_frame_rates.push_back (24);
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 746b4f509..57b3f93b2 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -288,3 +288,13 @@ fopen_boost (boost::filesystem::path p, string t)
         return fopen (p.c_str(), t.c_str ());
 #endif
 }
+
+int
+dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
+{
+#ifdef DCPOMATIC_WINDOWS
+	return _fseeki64 (stream, offset, whence);
+#else	
+	return fseek (stream, offset, whence);
+#endif	
+}
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 931e7d890..7e032e5a1 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -34,3 +34,4 @@ extern boost::filesystem::path openssl_path ();
 extern boost::filesystem::path app_contents ();
 #endif
 extern FILE * fopen_boost (boost::filesystem::path, std::string);
+extern int dcpomatic_fseek (FILE *, int64_t, int);
diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc
index dae0ddbe8..a2b3e5d3b 100644
--- a/src/lib/ffmpeg_decoder.cc
+++ b/src/lib/ffmpeg_decoder.cc
@@ -561,7 +561,7 @@ FFmpegDecoder::decode_subtitle_packet ()
 	/* Subtitle PTS in seconds (within the source, not taking into account any of the
 	   source that we may have chopped off for the DCP)
 	*/
-	double const packet_time = static_cast<double> (sub.pts) / AV_TIME_BASE;
+	double const packet_time = (static_cast<double> (sub.pts ) / AV_TIME_BASE) + _video_pts_offset;
 	
 	/* hence start time for this sub */
 	ContentTime const from = (packet_time + (double (sub.start_display_time) / 1e3)) * TIME_HZ;
@@ -572,21 +572,27 @@ FFmpegDecoder::decode_subtitle_packet ()
 	if (rect->type != SUBTITLE_BITMAP) {
 		throw DecodeError (_("non-bitmap subtitles not yet supported"));
 	}
-	
+
+	/* Note RGBA is expressed little-endian, so the first byte in the word is R, second
+	   G, third B, fourth A.
+	*/
 	shared_ptr<Image> image (new Image (PIX_FMT_RGBA, libdcp::Size (rect->w, rect->h), true));
 
 	/* Start of the first line in the subtitle */
 	uint8_t* sub_p = rect->pict.data[0];
-	/* sub_p looks up into a RGB palette which is here */
+	/* sub_p looks up into a BGRA palette which is here
+	   (i.e. first byte B, second G, third R, fourth A)
+	*/
 	uint32_t const * palette = (uint32_t *) rect->pict.data[1];
 	/* Start of the output data */
 	uint32_t* out_p = (uint32_t *) image->data()[0];
-	
+
 	for (int y = 0; y < rect->h; ++y) {
 		uint8_t* sub_line_p = sub_p;
 		uint32_t* out_line_p = out_p;
 		for (int x = 0; x < rect->w; ++x) {
-			*out_line_p++ = palette[*sub_line_p++];
+			uint32_t const p = palette[*sub_line_p++];
+			*out_line_p++ = ((p & 0xff) << 16) | (p & 0xff00) | ((p & 0xff0000) >> 16) | (p & 0xff000000);
 		}
 		sub_p += rect->pict.linesize[0];
 		out_p += image->stride()[0] / sizeof (uint32_t);
diff --git a/src/lib/file_group.cc b/src/lib/file_group.cc
index dfe336b8f..9d042554c 100644
--- a/src/lib/file_group.cc
+++ b/src/lib/file_group.cc
@@ -100,7 +100,11 @@ FileGroup::seek (int64_t pos, int whence) const
 		for (size_t i = 0; i < _current_path; ++i) {
 			full_pos += boost::filesystem::file_size (_paths[i]);
 		}
+#ifdef DCPOMATIC_WINDOWS
+		full_pos += _ftelli64 (_current_file);
+#else		
 		full_pos += ftell (_current_file);
+#endif		
 		full_pos += pos;
 		break;
 	case SEEK_END:
@@ -125,7 +129,7 @@ FileGroup::seek (int64_t pos, int whence) const
 	}
 
 	ensure_open_path (i);
-	fseek (_current_file, sub_pos, SEEK_SET);
+	dcpomatic_fseek (_current_file, sub_pos, SEEK_SET);
 	return full_pos;
 }
 
diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 2d150583a..17064fd45 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -41,36 +41,10 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	, _image_content (content)
 	, _video_length (0)
 {
-	list<unsigned int> frames;
-	size_t const N = content->number_of_paths ();
-
-	for (size_t i = 0; i < N; ++i) {
-		boost::filesystem::path const p = content->path (i);
-		try {
-			frames.push_back (lexical_cast<int> (p.stem().string()));
-		} catch (bad_lexical_cast &) {
-			/* We couldn't turn that filename into a number; never mind */
-		}
-		
-		if (!_video_size) {
-			using namespace MagickCore;
-			Magick::Image* image = new Magick::Image (p.string());
-			_video_size = libdcp::Size (image->columns(), image->rows());
-			delete image;
-		}
-	
-		job->set_progress (float (i) / N);
-	}
-
-	frames.sort ();
-	
-	if (N > 1 && frames.front() != 0 && frames.front() != 1) {
-		throw StringError (String::compose (_("first frame in moving image directory is number %1"), frames.front ()));
-	}
-
-	if (N > 1 && frames.back() != frames.size() && frames.back() != (frames.size() - 1)) {
-		throw StringError (String::compose (_("there are %1 images in the directory but the last one is number %2"), frames.size(), frames.back ()));
-	}
+	using namespace MagickCore;
+	Magick::Image* image = new Magick::Image (content->path(0).string());
+	_video_size = libdcp::Size (image->columns(), image->rows());
+	delete image;
 
 	if (content->still ()) {
 		_video_length = Config::instance()->default_still_length() * video_frame_rate();
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 5c76947bf..2eacedf57 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-31 11:04+0000\n"
-"PO-Revision-Date: 2014-01-03 14:27+0100\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
+"PO-Revision-Date: 2014-01-05 23:06+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: de\n"
 
 #: src/lib/sndfile_content.cc:60
 msgid "%1 [audio]"
@@ -237,6 +237,26 @@ msgstr "De-Blocking"
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
+#: src/lib/config.cc:69
+msgid ""
+"Dear Projectionist\n"
+"\n"
+"Please find attached KDMs for $CPL_NAME.\n"
+"\n"
+"The KDMs are valid from $START_TIME until $END_TIME.\n"
+"\n"
+"Best regards,\n"
+"DCP-o-matic"
+msgstr ""
+"Sehr geehrter Vorführer,\n"
+"\n"
+"Anbei finden Sie den KDM für den Film $CPL_NAME.\n"
+"\n"
+"Der Schlüssel ist vom $START_TIME bis zum $END_TIME gültig.\n"
+"\n"
+"Mit freundlichen Grüßen,\n"
+"DCP-o-matic"
+
 #: src/lib/filter.cc:74
 msgid "Deringing filter"
 msgstr "De-Ringer"
@@ -621,6 +641,22 @@ msgstr "SSH Session kann nicht gestartet werden"
 msgid "could not write to file %1 (%2)"
 msgstr "Datei %1 kann nicht geschrieben werden (%2)"
 
+#: src/lib/util.cc:566
+msgid "error during async_accept (%1)"
+msgstr "error during async_accept (%1)"
+
+#: src/lib/util.cc:542
+msgid "error during async_connect (%1)"
+msgstr "error during async_connect (%1)"
+
+#: src/lib/util.cc:615
+msgid "error during async_read (%1)"
+msgstr "error during async_read (%1)"
+
+#: src/lib/util.cc:587
+msgid "error during async_write (%1)"
+msgstr "error during async_write (%1)"
+
 #: src/lib/image_examiner.cc:68
 msgid "first frame in moving image directory is number %1"
 msgstr "Erstes Bild im Bilderordner ist Nummer %1"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index e19f99ac1..42a5d9397 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-11-09 03:09-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -21,29 +21,20 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:170
+#: src/lib/ffmpeg_content.cc:202
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/moving_image_content.cc:58
-msgid "%1 [moving images]"
-msgstr ""
-
-#: src/lib/still_image_content.cc:52
-#, fuzzy
-msgid "%1 [still]"
-msgstr "imagen fija"
-
 #: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:237
 #, fuzzy
 msgid "%1 frames; %2 frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/video_content.cc:142
+#: src/lib/video_content.cc:200
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -112,7 +103,7 @@ msgstr "Cancelado"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "No se puede usar el formato de pixel %1 para %2"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:766
 msgid "Centre"
 msgstr "Centro"
 
@@ -120,32 +111,81 @@ msgstr "Centro"
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:398
+#: src/lib/writer.cc:401
 msgid "Computing audio digest"
 msgstr ""
 
-#: src/lib/moving_image_content.cc:84
+#: src/lib/image_content.cc:100
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:395
+#: src/lib/writer.cc:398
 msgid "Computing image digest"
 msgstr ""
 
-#: src/lib/util.cc:833
+#: src/lib/util.cc:796
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/scp_dcp_job.cc:109
+#: src/lib/audio_content.cc:82
+msgid "Content to be joined must have the same audio delay."
+msgstr ""
+
+#: src/lib/audio_content.cc:78
+msgid "Content to be joined must have the same audio gain."
+msgstr ""
+
+#: src/lib/video_content.cc:133
+msgid "Content to be joined must have the same colour conversion."
+msgstr ""
+
+#: src/lib/video_content.cc:125
+msgid "Content to be joined must have the same crop."
+msgstr ""
+
+#: src/lib/video_content.cc:113
+msgid "Content to be joined must have the same picture size."
+msgstr ""
+
+#: src/lib/video_content.cc:129
+msgid "Content to be joined must have the same ratio."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:65
+#, fuzzy
+msgid "Content to be joined must have the same subtitle offset."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:69
+msgid "Content to be joined must have the same subtitle scale."
+msgstr ""
+
+#: src/lib/video_content.cc:117
+msgid "Content to be joined must have the same video frame rate."
+msgstr ""
+
+#: src/lib/video_content.cc:121
+msgid "Content to be joined must have the same video frame type."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:107
+msgid "Content to be joined must use the same audio stream."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:103
+msgid "Content to be joined must use the same subtitle stream."
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:110
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:128
+#: src/lib/scp_dcp_job.cc:129
 msgid "Could not connect to server %1 (%2)"
 msgstr "No se pudo conectar al servidor %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:150
+#: src/lib/scp_dcp_job.cc:151
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
@@ -154,19 +194,19 @@ msgstr "No se pudo crear la carpeta remota %1 (%2)"
 msgid "Could not open %1"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:176
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
-#: src/lib/film.cc:943
+#: src/lib/film.cc:949
 msgid "Could not read DCP to make KDM for"
 msgstr "No se pudo leer el DCP para hacer el KDM"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:146
 msgid "Could not start SCP session (%1)"
 msgstr "No se pudo iniciar la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:189
+#: src/lib/scp_dcp_job.cc:190
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
@@ -174,12 +214,12 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:845
+#: src/lib/util.cc:808
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 
-#: src/lib/util.cc:836
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
@@ -203,6 +243,18 @@ msgstr "De-blocking"
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
+#: src/lib/config.cc:69
+msgid ""
+"Dear Projectionist\n"
+"\n"
+"Please find attached KDMs for $CPL_NAME.\n"
+"\n"
+"The KDMs are valid from $START_TIME until $END_TIME.\n"
+"\n"
+"Best regards,\n"
+"DCP-o-matic"
+msgstr ""
+
 #: src/lib/filter.cc:74
 msgid "Deringing filter"
 msgstr "Deringing filter"
@@ -212,16 +264,20 @@ msgstr "Deringing filter"
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:838
+#: src/lib/util.cc:801
 #, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
-#: src/lib/util.cc:840
+#: src/lib/util.cc:803
 #, fuzzy
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
+#: src/lib/send_kdm_email_job.cc:50
+msgid "Email KDMs for %1"
+msgstr ""
+
 #: src/lib/writer.cc:109
 msgid "Encoding image data"
 msgstr ""
@@ -234,11 +290,6 @@ msgstr "Error (%1)"
 msgid "Examine content"
 msgstr "Examinar contenido"
 
-#: src/lib/moving_image_content.cc:90
-#, fuzzy
-msgid "Examining content"
-msgstr "Examinar contenido"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Experimental horizontal deblocking filter 1"
@@ -255,7 +306,7 @@ msgstr "Desentrelazado FFMPEG"
 msgid "FIR low-pass deinterlacer"
 msgstr "Desentrelazado paso bajo FIR"
 
-#: src/lib/scp_dcp_job.cc:138
+#: src/lib/scp_dcp_job.cc:139
 msgid "Failed to authenticate with server (%1)"
 msgstr "Fallo al identificarse con el servidor (%1)"
 
@@ -315,15 +366,15 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:764
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:768
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:767
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -357,6 +408,14 @@ msgstr "Reducción de ruido"
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
+#: src/lib/content.cc:100
+msgid "Only the first piece of content to be joined can have a start trim."
+msgstr ""
+
+#: src/lib/content.cc:104
+msgid "Only the last piece of content to be joined can have an end trim."
+msgstr ""
+
 #: src/lib/filter.cc:91
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
@@ -373,20 +432,20 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:80 src/lib/config.cc:163
+#: src/lib/config.cc:81 src/lib/config.cc:165
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:765
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:769
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/scp_dcp_job.cc:133
+#: src/lib/scp_dcp_job.cc:134
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
@@ -430,7 +489,7 @@ msgstr ""
 "En el dispositivo donde se encuentra la película queda poco espacio. Libere "
 "espacio en el disco y pruebe de nuevo."
 
-#: src/lib/film.cc:370
+#: src/lib/film.cc:372
 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 "
@@ -456,7 +515,7 @@ msgstr "Transitional"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:276
+#: src/lib/ffmpeg_decoder.cc:278
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -476,7 +535,7 @@ msgstr "Vertical deblocking filter"
 msgid "Vertical deblocking filter A"
 msgstr "Vertical deblocking filter A"
 
-#: src/lib/scp_dcp_job.cc:101
+#: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
 msgstr "Esperando"
 
@@ -488,32 +547,41 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:276
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
-#: src/lib/film.cc:236
+#: src/lib/image_content.cc:68
+msgid "[moving images]"
+msgstr ""
+
+#: src/lib/image_content.cc:66
+#, fuzzy
+msgid "[still]"
+msgstr "imagen fija"
+
+#: src/lib/film.cc:237
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:583
+#: src/lib/util.cc:546
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
-#: src/lib/scp_dcp_job.cc:119
+#: src/lib/scp_dcp_job.cc:120
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:272
 #, fuzzy
 msgid "container"
 msgstr "contenido"
 
-#: src/lib/film.cc:279
+#: src/lib/film.cc:280
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: src/lib/scp_dcp_job.cc:168
+#: src/lib/scp_dcp_job.cc:169
 msgid "copying %1"
 msgstr "copiando %1"
 
@@ -522,19 +590,19 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/ffmpeg.cc:139
+#: src/lib/ffmpeg.cc:175
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
 
-#: src/lib/ffmpeg.cc:87
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg_decoder.cc:522
+#: src/lib/ffmpeg_decoder.cc:524
 msgid "could not find subtitle decoder"
 msgstr "no se pudo encontrar decodificador de subtítutlos"
 
-#: src/lib/ffmpeg.cc:118
+#: src/lib/ffmpeg.cc:154
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
@@ -548,11 +616,11 @@ msgstr "no se pudo abrir el fichero para lectura"
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/dcp_video_frame.cc:336
+#: src/lib/dcp_video_frame.cc:357
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/dcp_video_frame.cc:342
+#: src/lib/dcp_video_frame.cc:363
 #, fuzzy
 msgid "could not read encoded data"
 msgstr "no se encontró el decodificador de audio"
@@ -571,11 +639,11 @@ msgstr "no se pudo ejecutar el conversor de velocidad"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
-#: src/lib/scp_dcp_job.cc:86
+#: src/lib/scp_dcp_job.cc:87
 msgid "could not start SCP session (%1)"
 msgstr "no se pudo abrir la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:52
+#: src/lib/scp_dcp_job.cc:53
 msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
@@ -584,7 +652,23 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/moving_image_examiner.cc:82
+#: src/lib/util.cc:566
+msgid "error during async_accept (%1)"
+msgstr ""
+
+#: src/lib/util.cc:542
+msgid "error during async_connect (%1)"
+msgstr ""
+
+#: src/lib/util.cc:615
+msgid "error during async_read (%1)"
+msgstr ""
+
+#: src/lib/util.cc:587
+msgid "error during async_write (%1)"
+msgstr ""
+
+#: src/lib/image_examiner.cc:68
 msgid "first frame in moving image directory is number %1"
 msgstr ""
 "primera imagen en el directorio de imagen en movimiento es la número %1"
@@ -593,23 +677,23 @@ msgstr ""
 msgid "frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/util.cc:145
+#: src/lib/util.cc:148
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:142 src/lib/util.cc:147
+#: src/lib/util.cc:145 src/lib/util.cc:150
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:152
+#: src/lib/util.cc:155
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:154
+#: src/lib/util.cc:157
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:724
+#: src/lib/util.cc:687
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -617,45 +701,63 @@ msgstr "falta la clave %1 en el par clave-valor"
 msgid "missing required setting %1"
 msgstr "falta una configuración obligatoria %1"
 
-#: src/lib/ffmpeg_decoder.cc:554
+#: src/lib/image_content.cc:83
+msgid "moving"
+msgstr ""
+
+#: src/lib/ffmpeg_decoder.cc:556
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:236 src/lib/film.cc:283
+#: src/lib/film.cc:237 src/lib/film.cc:284
 msgid "name"
 msgstr "nombre"
 
-#: src/lib/ffmpeg_decoder.cc:569
+#: src/lib/ffmpeg_decoder.cc:571
 msgid "non-bitmap subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
-#: src/lib/moving_image_examiner.cc:78
-msgid "only %1 file(s) found in moving image directory"
-msgstr ""
-"solo el fichero(s) %1 se encuentra en el directorio de imagen en movimiento"
-
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
 #: src/lib/job.cc:309
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/config.cc:78 src/lib/video_content.cc:111
+#: src/lib/config.cc:79 src/lib/video_content.cc:169
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:79
+#: src/lib/config.cc:80
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:160
 msgid "seconds"
 msgstr "segundos"
 
-#: src/lib/moving_image_examiner.cc:86
+#: src/lib/image_content.cc:81
+#, fuzzy
+msgid "still"
+msgstr "imagen fija"
+
+#: src/lib/image_examiner.cc:72
 msgid "there are %1 images in the directory but the last one is number %2"
 msgstr "hay %1 imágenes en el directorio, la última es la %2"
 
+#: src/lib/ffmpeg_examiner.cc:169
+#, fuzzy
+msgid "unknown"
+msgstr "Error desconocido"
+
+#, fuzzy
+#~ msgid "Examining content"
+#~ msgstr "Examinar contenido"
+
+#~ msgid "only %1 file(s) found in moving image directory"
+#~ msgstr ""
+#~ "solo el fichero(s) %1 se encuentra en el directorio de imagen en "
+#~ "movimiento"
+
 #, fuzzy
 #~ msgid "Could not find DCP to make KDM for"
 #~ msgstr "no se encontró el decodificador de audio"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index ff7e1f94e..3e33e761a 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-11-25 19:37+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -21,27 +21,19 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr "%1 [audio]"
 
-#: src/lib/ffmpeg_content.cc:170
+#: src/lib/ffmpeg_content.cc:202
 msgid "%1 [movie]"
 msgstr "%1 [vidéo]"
 
-#: src/lib/moving_image_content.cc:58
-msgid "%1 [moving images]"
-msgstr "%1 [diaporama]"
-
-#: src/lib/still_image_content.cc:52
-msgid "%1 [still]"
-msgstr "%1 [fixe]"
-
 #: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 canaux, %2kHz, %3 samples"
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:237
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 images ; %2 images par seconde"
 
-#: src/lib/video_content.cc:142
+#: src/lib/video_content.cc:200
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -110,7 +102,7 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:766
 msgid "Centre"
 msgstr "Centre"
 
@@ -118,32 +110,80 @@ msgstr "Centre"
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:398
+#: src/lib/writer.cc:401
 msgid "Computing audio digest"
 msgstr ""
 
-#: src/lib/moving_image_content.cc:84
+#: src/lib/image_content.cc:100
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:395
+#: src/lib/writer.cc:398
 msgid "Computing image digest"
 msgstr ""
 
-#: src/lib/util.cc:833
+#: src/lib/util.cc:796
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "Le DCP et la source ont les mêmes cadences.\n"
 
-#: src/lib/scp_dcp_job.cc:109
+#: src/lib/audio_content.cc:82
+msgid "Content to be joined must have the same audio delay."
+msgstr ""
+
+#: src/lib/audio_content.cc:78
+msgid "Content to be joined must have the same audio gain."
+msgstr ""
+
+#: src/lib/video_content.cc:133
+msgid "Content to be joined must have the same colour conversion."
+msgstr ""
+
+#: src/lib/video_content.cc:125
+msgid "Content to be joined must have the same crop."
+msgstr ""
+
+#: src/lib/video_content.cc:113
+msgid "Content to be joined must have the same picture size."
+msgstr ""
+
+#: src/lib/video_content.cc:129
+msgid "Content to be joined must have the same ratio."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:65
+msgid "Content to be joined must have the same subtitle offset."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:69
+msgid "Content to be joined must have the same subtitle scale."
+msgstr ""
+
+#: src/lib/video_content.cc:117
+msgid "Content to be joined must have the same video frame rate."
+msgstr ""
+
+#: src/lib/video_content.cc:121
+msgid "Content to be joined must have the same video frame type."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:107
+msgid "Content to be joined must use the same audio stream."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:103
+msgid "Content to be joined must use the same subtitle stream."
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:110
 msgid "Copy DCP to TMS"
 msgstr "Copier le DCP dans le TMS"
 
-#: src/lib/scp_dcp_job.cc:128
+#: src/lib/scp_dcp_job.cc:129
 msgid "Could not connect to server %1 (%2)"
 msgstr "Connexion au serveur %1 (%2) impossible"
 
-#: src/lib/scp_dcp_job.cc:150
+#: src/lib/scp_dcp_job.cc:151
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
@@ -151,19 +191,19 @@ msgstr "Création du dossier distant %1 (%2) impossible"
 msgid "Could not open %1"
 msgstr "lecture du fichier %1 impossible"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:176
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
-#: src/lib/film.cc:943
+#: src/lib/film.cc:949
 msgid "Could not read DCP to make KDM for"
 msgstr "DCP illisible pour fabrication de KDM"
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:146
 msgid "Could not start SCP session (%1)"
 msgstr "Démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:189
+#: src/lib/scp_dcp_job.cc:190
 msgid "Could not write to remote file (%1)"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
@@ -171,12 +211,12 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Désentrelacement cubique interpolé"
 
-#: src/lib/util.cc:845
+#: src/lib/util.cc:808
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 
-#: src/lib/util.cc:836
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
@@ -198,6 +238,18 @@ msgstr "De-bloc"
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
+#: src/lib/config.cc:69
+msgid ""
+"Dear Projectionist\n"
+"\n"
+"Please find attached KDMs for $CPL_NAME.\n"
+"\n"
+"The KDMs are valid from $START_TIME until $END_TIME.\n"
+"\n"
+"Best regards,\n"
+"DCP-o-matic"
+msgstr ""
+
 #: src/lib/filter.cc:74
 msgid "Deringing filter"
 msgstr "Filtre anti bourdonnement"
@@ -207,16 +259,20 @@ msgstr "Filtre anti bourdonnement"
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:838
+#: src/lib/util.cc:801
 #, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
-#: src/lib/util.cc:840
+#: src/lib/util.cc:803
 #, fuzzy
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
+#: src/lib/send_kdm_email_job.cc:50
+msgid "Email KDMs for %1"
+msgstr ""
+
 #: src/lib/writer.cc:109
 msgid "Encoding image data"
 msgstr ""
@@ -229,11 +285,6 @@ msgstr "Erreur (%1)"
 msgid "Examine content"
 msgstr "Examen du contenu"
 
-#: src/lib/moving_image_content.cc:90
-#, fuzzy
-msgid "Examining content"
-msgstr "Examen du contenu"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Filtre dé-bloc horizontal 1"
@@ -250,7 +301,7 @@ msgstr "Désentrelaceur FFMPEG"
 msgid "FIR low-pass deinterlacer"
 msgstr "Désentrelaceur passe-bas FIR"
 
-#: src/lib/scp_dcp_job.cc:138
+#: src/lib/scp_dcp_job.cc:139
 msgid "Failed to authenticate with server (%1)"
 msgstr "L'authentification du serveur (%1) a échouée"
 
@@ -310,15 +361,15 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:764
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:768
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:767
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -352,6 +403,14 @@ msgstr "Réduction de bruit"
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
+#: src/lib/content.cc:100
+msgid "Only the first piece of content to be joined can have a start trim."
+msgstr ""
+
+#: src/lib/content.cc:104
+msgid "Only the last piece of content to be joined can have an end trim."
+msgstr ""
+
 #: src/lib/filter.cc:91
 msgid "Overcomplete wavelet denoiser"
 msgstr "Réduction de bruit par ondelettes"
@@ -368,19 +427,19 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:80 src/lib/config.cc:163
+#: src/lib/config.cc:81 src/lib/config.cc:165
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:765
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:769
 msgid "Right surround"
 msgstr "Arrière droite"
 
-#: src/lib/scp_dcp_job.cc:133
+#: src/lib/scp_dcp_job.cc:134
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
@@ -424,7 +483,7 @@ msgstr ""
 "Le disque contenant le film est plein. Libérez de l'espace et essayez à "
 "nouveau."
 
-#: src/lib/film.cc:370
+#: src/lib/film.cc:372
 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 "
@@ -450,7 +509,7 @@ msgstr "Transitional"
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/lib/ffmpeg_decoder.cc:276
+#: src/lib/ffmpeg_decoder.cc:278
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Échantillonnage audio (%1) inconnu"
 
@@ -470,7 +529,7 @@ msgstr "Filtre dé-bloc vertical"
 msgid "Vertical deblocking filter A"
 msgstr "Filtre dé-bloc vertical A"
 
-#: src/lib/scp_dcp_job.cc:101
+#: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
 msgstr "En cours"
 
@@ -482,31 +541,41 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:276
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
-#: src/lib/film.cc:236
+#: src/lib/image_content.cc:68
+#, fuzzy
+msgid "[moving images]"
+msgstr "%1 [diaporama]"
+
+#: src/lib/image_content.cc:66
+#, fuzzy
+msgid "[still]"
+msgstr "%1 [fixe]"
+
+#: src/lib/film.cc:237
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:583
+#: src/lib/util.cc:546
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
-#: src/lib/scp_dcp_job.cc:119
+#: src/lib/scp_dcp_job.cc:120
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:272
 msgid "container"
 msgstr "conteneur"
 
-#: src/lib/film.cc:279
+#: src/lib/film.cc:280
 msgid "content type"
 msgstr "type de contenu"
 
-#: src/lib/scp_dcp_job.cc:168
+#: src/lib/scp_dcp_job.cc:169
 msgid "copying %1"
 msgstr "copie de %1"
 
@@ -514,19 +583,19 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg.cc:139
+#: src/lib/ffmpeg.cc:175
 msgid "could not find audio decoder"
 msgstr "décodeur audio introuvable"
 
-#: src/lib/ffmpeg.cc:87
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:522
+#: src/lib/ffmpeg_decoder.cc:524
 msgid "could not find subtitle decoder"
 msgstr "décodeur de sous-titre introuvable"
 
-#: src/lib/ffmpeg.cc:118
+#: src/lib/ffmpeg.cc:154
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
@@ -538,11 +607,11 @@ msgstr "lecture du fichier audio impossible"
 msgid "could not open file %1"
 msgstr "lecture du fichier (%1) impossible"
 
-#: src/lib/dcp_video_frame.cc:336
+#: src/lib/dcp_video_frame.cc:357
 msgid "could not open file for reading"
 msgstr "lecture du fichier impossible"
 
-#: src/lib/dcp_video_frame.cc:342
+#: src/lib/dcp_video_frame.cc:363
 msgid "could not read encoded data"
 msgstr "lecture des données encodées impossible"
 
@@ -559,11 +628,11 @@ msgstr "conversion de la fréquence d'échantillonnage impossible"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "conversion de la fréquence d'échantillonnage impossible"
 
-#: src/lib/scp_dcp_job.cc:86
+#: src/lib/scp_dcp_job.cc:87
 msgid "could not start SCP session (%1)"
 msgstr "démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:52
+#: src/lib/scp_dcp_job.cc:53
 msgid "could not start SSH session"
 msgstr "démarrage de session SSH impossible"
 
@@ -571,7 +640,23 @@ msgstr "démarrage de session SSH impossible"
 msgid "could not write to file %1 (%2)"
 msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
-#: src/lib/moving_image_examiner.cc:82
+#: src/lib/util.cc:566
+msgid "error during async_accept (%1)"
+msgstr ""
+
+#: src/lib/util.cc:542
+msgid "error during async_connect (%1)"
+msgstr ""
+
+#: src/lib/util.cc:615
+msgid "error during async_read (%1)"
+msgstr ""
+
+#: src/lib/util.cc:587
+msgid "error during async_write (%1)"
+msgstr ""
+
+#: src/lib/image_examiner.cc:68
 msgid "first frame in moving image directory is number %1"
 msgstr "la première image dans le dossier est la numéro %1"
 
@@ -579,23 +664,23 @@ msgstr "la première image dans le dossier est la numéro %1"
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:145
+#: src/lib/util.cc:148
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:142 src/lib/util.cc:147
+#: src/lib/util.cc:145 src/lib/util.cc:150
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:152
+#: src/lib/util.cc:155
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:154
+#: src/lib/util.cc:157
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:724
+#: src/lib/util.cc:687
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -603,44 +688,61 @@ msgstr "clé %1 non sélectionnée"
 msgid "missing required setting %1"
 msgstr "paramètre %1 manquant"
 
-#: src/lib/ffmpeg_decoder.cc:554
+#: src/lib/image_content.cc:83
+msgid "moving"
+msgstr ""
+
+#: src/lib/ffmpeg_decoder.cc:556
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:236 src/lib/film.cc:283
+#: src/lib/film.cc:237 src/lib/film.cc:284
 msgid "name"
 msgstr "nom"
 
-#: src/lib/ffmpeg_decoder.cc:569
+#: src/lib/ffmpeg_decoder.cc:571
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sous-titres non-bitmap non supportés actuellement"
 
-#: src/lib/moving_image_examiner.cc:78
-msgid "only %1 file(s) found in moving image directory"
-msgstr "Seulement %1 fichier(s) trouvé(s) dans le dossier de diaporama"
-
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
 #: src/lib/job.cc:309
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/config.cc:78 src/lib/video_content.cc:111
+#: src/lib/config.cc:79 src/lib/video_content.cc:169
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:79
+#: src/lib/config.cc:80
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:160
 msgid "seconds"
 msgstr "secondes"
 
-#: src/lib/moving_image_examiner.cc:86
+#: src/lib/image_content.cc:81
+#, fuzzy
+msgid "still"
+msgstr "%1 [fixe]"
+
+#: src/lib/image_examiner.cc:72
 msgid "there are %1 images in the directory but the last one is number %2"
 msgstr "il y a %1 images dans le dossier mais la dernière est la numéro %2"
 
+#: src/lib/ffmpeg_examiner.cc:169
+#, fuzzy
+msgid "unknown"
+msgstr "Erreur inconnue"
+
+#, fuzzy
+#~ msgid "Examining content"
+#~ msgstr "Examen du contenu"
+
+#~ msgid "only %1 file(s) found in moving image directory"
+#~ msgstr "Seulement %1 fichier(s) trouvé(s) dans le dossier de diaporama"
+
 #~ msgid "Could not find DCP to make KDM for"
 #~ msgstr "DCP introuvable pour fabrication de KDM"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index d20c1be07..f4828103e 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-04-28 10:26+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -21,29 +21,20 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:170
+#: src/lib/ffmpeg_content.cc:202
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/moving_image_content.cc:58
-msgid "%1 [moving images]"
-msgstr ""
-
-#: src/lib/still_image_content.cc:52
-#, fuzzy
-msgid "%1 [still]"
-msgstr "ancora"
-
 #: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:237
 #, fuzzy
 msgid "%1 frames; %2 frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/video_content.cc:142
+#: src/lib/video_content.cc:200
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -112,7 +103,7 @@ msgstr "Cancellato"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:766
 msgid "Centre"
 msgstr "Centro"
 
@@ -120,32 +111,80 @@ msgstr "Centro"
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:398
+#: src/lib/writer.cc:401
 msgid "Computing audio digest"
 msgstr ""
 
-#: src/lib/moving_image_content.cc:84
+#: src/lib/image_content.cc:100
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:395
+#: src/lib/writer.cc:398
 msgid "Computing image digest"
 msgstr ""
 
-#: src/lib/util.cc:833
+#: src/lib/util.cc:796
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
-#: src/lib/scp_dcp_job.cc:109
+#: src/lib/audio_content.cc:82
+msgid "Content to be joined must have the same audio delay."
+msgstr ""
+
+#: src/lib/audio_content.cc:78
+msgid "Content to be joined must have the same audio gain."
+msgstr ""
+
+#: src/lib/video_content.cc:133
+msgid "Content to be joined must have the same colour conversion."
+msgstr ""
+
+#: src/lib/video_content.cc:125
+msgid "Content to be joined must have the same crop."
+msgstr ""
+
+#: src/lib/video_content.cc:113
+msgid "Content to be joined must have the same picture size."
+msgstr ""
+
+#: src/lib/video_content.cc:129
+msgid "Content to be joined must have the same ratio."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:65
+msgid "Content to be joined must have the same subtitle offset."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:69
+msgid "Content to be joined must have the same subtitle scale."
+msgstr ""
+
+#: src/lib/video_content.cc:117
+msgid "Content to be joined must have the same video frame rate."
+msgstr ""
+
+#: src/lib/video_content.cc:121
+msgid "Content to be joined must have the same video frame type."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:107
+msgid "Content to be joined must use the same audio stream."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:103
+msgid "Content to be joined must use the same subtitle stream."
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:110
 msgid "Copy DCP to TMS"
 msgstr "Copia del DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:128
+#: src/lib/scp_dcp_job.cc:129
 msgid "Could not connect to server %1 (%2)"
 msgstr "Non posso connetermi al server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:150
+#: src/lib/scp_dcp_job.cc:151
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
@@ -154,19 +193,19 @@ msgstr "Non posso creare la directory remota %1 (%2)"
 msgid "Could not open %1"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:176
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
-#: src/lib/film.cc:943
+#: src/lib/film.cc:949
 msgid "Could not read DCP to make KDM for"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:146
 msgid "Could not start SCP session (%1)"
 msgstr "Non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:189
+#: src/lib/scp_dcp_job.cc:190
 msgid "Could not write to remote file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
@@ -174,12 +213,12 @@ msgstr "Non posso scrivere il file remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Deinterlacciatore cubico interpolato"
 
-#: src/lib/util.cc:845
+#: src/lib/util.cc:808
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
 
-#: src/lib/util.cc:836
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
@@ -201,6 +240,18 @@ msgstr "Sbloccaggio"
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
+#: src/lib/config.cc:69
+msgid ""
+"Dear Projectionist\n"
+"\n"
+"Please find attached KDMs for $CPL_NAME.\n"
+"\n"
+"The KDMs are valid from $START_TIME until $END_TIME.\n"
+"\n"
+"Best regards,\n"
+"DCP-o-matic"
+msgstr ""
+
 #: src/lib/filter.cc:74
 msgid "Deringing filter"
 msgstr "Filtro deringing"
@@ -210,16 +261,20 @@ msgstr "Filtro deringing"
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:838
+#: src/lib/util.cc:801
 #, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
-#: src/lib/util.cc:840
+#: src/lib/util.cc:803
 #, fuzzy
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
+#: src/lib/send_kdm_email_job.cc:50
+msgid "Email KDMs for %1"
+msgstr ""
+
 #: src/lib/writer.cc:109
 msgid "Encoding image data"
 msgstr ""
@@ -232,11 +287,6 @@ msgstr "Errore (%1)"
 msgid "Examine content"
 msgstr "Esamino il contenuto"
 
-#: src/lib/moving_image_content.cc:90
-#, fuzzy
-msgid "Examining content"
-msgstr "Esamino il contenuto"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Filtro di sblocco sperimentale orizzontale 1"
@@ -253,7 +303,7 @@ msgstr "Deinterlacciatore FFMPEG"
 msgid "FIR low-pass deinterlacer"
 msgstr "Deinterlacciatore FIR low-pass"
 
-#: src/lib/scp_dcp_job.cc:138
+#: src/lib/scp_dcp_job.cc:139
 msgid "Failed to authenticate with server (%1)"
 msgstr "Autenticazione col server fallita (%1) "
 
@@ -313,15 +363,15 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:764
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:768
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:767
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -355,6 +405,14 @@ msgstr "Riduzione del rumore"
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito in %1)"
 
+#: src/lib/content.cc:100
+msgid "Only the first piece of content to be joined can have a start trim."
+msgstr ""
+
+#: src/lib/content.cc:104
+msgid "Only the last piece of content to be joined can have an end trim."
+msgstr ""
+
 #: src/lib/filter.cc:91
 msgid "Overcomplete wavelet denoiser"
 msgstr "Overcomplete wavelet denoiser"
@@ -371,20 +429,20 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:80 src/lib/config.cc:163
+#: src/lib/config.cc:81 src/lib/config.cc:165
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:765
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:769
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/scp_dcp_job.cc:133
+#: src/lib/scp_dcp_job.cc:134
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
@@ -428,7 +486,7 @@ msgstr ""
 "Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
 "altro spazio e riprovare."
 
-#: src/lib/film.cc:370
+#: src/lib/film.cc:372
 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 "
@@ -451,7 +509,7 @@ msgstr "Di transizione"
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: src/lib/ffmpeg_decoder.cc:276
+#: src/lib/ffmpeg_decoder.cc:278
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato di campionamento audio non riconosciuto (%1)"
 
@@ -471,7 +529,7 @@ msgstr "Filtro di sblocco verticale"
 msgid "Vertical deblocking filter A"
 msgstr "Filtro A di sblocco verticale"
 
-#: src/lib/scp_dcp_job.cc:101
+#: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
 msgstr "Aspetta"
 
@@ -483,32 +541,41 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:276
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
-#: src/lib/film.cc:236
+#: src/lib/image_content.cc:68
+msgid "[moving images]"
+msgstr ""
+
+#: src/lib/image_content.cc:66
+#, fuzzy
+msgid "[still]"
+msgstr "ancora"
+
+#: src/lib/film.cc:237
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:583
+#: src/lib/util.cc:546
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
-#: src/lib/scp_dcp_job.cc:119
+#: src/lib/scp_dcp_job.cc:120
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:272
 #, fuzzy
 msgid "container"
 msgstr "contenuto"
 
-#: src/lib/film.cc:279
+#: src/lib/film.cc:280
 msgid "content type"
 msgstr "tipo di contenuto"
 
-#: src/lib/scp_dcp_job.cc:168
+#: src/lib/scp_dcp_job.cc:169
 msgid "copying %1"
 msgstr "copia %1"
 
@@ -516,19 +583,19 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:139
+#: src/lib/ffmpeg.cc:175
 msgid "could not find audio decoder"
 msgstr "non riesco a trovare il decoder audio"
 
-#: src/lib/ffmpeg.cc:87
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg_decoder.cc:522
+#: src/lib/ffmpeg_decoder.cc:524
 msgid "could not find subtitle decoder"
 msgstr "non riesco a trovare il decoder dei sottotitoli"
 
-#: src/lib/ffmpeg.cc:118
+#: src/lib/ffmpeg.cc:154
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
@@ -541,11 +608,11 @@ msgstr "non riesco ad aprire il file per leggerlo"
 msgid "could not open file %1"
 msgstr "non riesco ad aprire %1"
 
-#: src/lib/dcp_video_frame.cc:336
+#: src/lib/dcp_video_frame.cc:357
 msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
-#: src/lib/dcp_video_frame.cc:342
+#: src/lib/dcp_video_frame.cc:363
 #, fuzzy
 msgid "could not read encoded data"
 msgstr "non riesco a trovare il decoder audio"
@@ -563,11 +630,11 @@ msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 
-#: src/lib/scp_dcp_job.cc:86
+#: src/lib/scp_dcp_job.cc:87
 msgid "could not start SCP session (%1)"
 msgstr "non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:52
+#: src/lib/scp_dcp_job.cc:53
 msgid "could not start SSH session"
 msgstr "non posso avviare la sessione SSH"
 
@@ -575,7 +642,23 @@ msgstr "non posso avviare la sessione SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "non posso scrivere il file (%1)"
 
-#: src/lib/moving_image_examiner.cc:82
+#: src/lib/util.cc:566
+msgid "error during async_accept (%1)"
+msgstr ""
+
+#: src/lib/util.cc:542
+msgid "error during async_connect (%1)"
+msgstr ""
+
+#: src/lib/util.cc:615
+msgid "error during async_read (%1)"
+msgstr ""
+
+#: src/lib/util.cc:587
+msgid "error during async_write (%1)"
+msgstr ""
+
+#: src/lib/image_examiner.cc:68
 msgid "first frame in moving image directory is number %1"
 msgstr ""
 
@@ -583,23 +666,23 @@ msgstr ""
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:145
+#: src/lib/util.cc:148
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:142 src/lib/util.cc:147
+#: src/lib/util.cc:145 src/lib/util.cc:150
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:152
+#: src/lib/util.cc:155
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:154
+#: src/lib/util.cc:157
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:724
+#: src/lib/util.cc:687
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -607,44 +690,58 @@ msgstr "persa la chiave %1 tra i valori chiave"
 msgid "missing required setting %1"
 msgstr "persa la regolazione richiesta %1"
 
-#: src/lib/ffmpeg_decoder.cc:554
+#: src/lib/image_content.cc:83
+msgid "moving"
+msgstr ""
+
+#: src/lib/ffmpeg_decoder.cc:556
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:236 src/lib/film.cc:283
+#: src/lib/film.cc:237 src/lib/film.cc:284
 msgid "name"
 msgstr "nome"
 
-#: src/lib/ffmpeg_decoder.cc:569
+#: src/lib/ffmpeg_decoder.cc:571
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sottotitoli non-bitmap non ancora supportati"
 
-#: src/lib/moving_image_examiner.cc:78
-msgid "only %1 file(s) found in moving image directory"
-msgstr ""
-
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
 #: src/lib/job.cc:309
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/config.cc:78 src/lib/video_content.cc:111
+#: src/lib/config.cc:79 src/lib/video_content.cc:169
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:79
+#: src/lib/config.cc:80
 msgid "sRGB non-linearised"
 msgstr ""
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:160
 msgid "seconds"
 msgstr "secondi"
 
-#: src/lib/moving_image_examiner.cc:86
+#: src/lib/image_content.cc:81
+#, fuzzy
+msgid "still"
+msgstr "ancora"
+
+#: src/lib/image_examiner.cc:72
 msgid "there are %1 images in the directory but the last one is number %2"
 msgstr ""
 
+#: src/lib/ffmpeg_examiner.cc:169
+#, fuzzy
+msgid "unknown"
+msgstr "Errore sconosciuto"
+
+#, fuzzy
+#~ msgid "Examining content"
+#~ msgstr "Esamino il contenuto"
+
 #, fuzzy
 #~ msgid "Could not find DCP to make KDM for"
 #~ msgstr "non riesco a trovare il decoder audio"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 1cf26ce35..fcd4564ba 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-04-10 15:35+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -21,29 +21,20 @@ msgstr ""
 msgid "%1 [audio]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:170
+#: src/lib/ffmpeg_content.cc:202
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/moving_image_content.cc:58
-msgid "%1 [moving images]"
-msgstr ""
-
-#: src/lib/still_image_content.cc:52
-#, fuzzy
-msgid "%1 [still]"
-msgstr "stillbild"
-
 #: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:205
+#: src/lib/ffmpeg_content.cc:237
 #, fuzzy
 msgid "%1 frames; %2 frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/video_content.cc:142
+#: src/lib/video_content.cc:200
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -112,7 +103,7 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:803
+#: src/lib/util.cc:766
 msgid "Centre"
 msgstr "Mitt"
 
@@ -120,32 +111,80 @@ msgstr "Mitt"
 msgid "Checking existing image data"
 msgstr ""
 
-#: src/lib/writer.cc:398
+#: src/lib/writer.cc:401
 msgid "Computing audio digest"
 msgstr ""
 
-#: src/lib/moving_image_content.cc:84
+#: src/lib/image_content.cc:100
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:395
+#: src/lib/writer.cc:398
 msgid "Computing image digest"
 msgstr ""
 
-#: src/lib/util.cc:833
+#: src/lib/util.cc:796
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "DCP och källa har samma bildfrekvens.\n"
 
-#: src/lib/scp_dcp_job.cc:109
+#: src/lib/audio_content.cc:82
+msgid "Content to be joined must have the same audio delay."
+msgstr ""
+
+#: src/lib/audio_content.cc:78
+msgid "Content to be joined must have the same audio gain."
+msgstr ""
+
+#: src/lib/video_content.cc:133
+msgid "Content to be joined must have the same colour conversion."
+msgstr ""
+
+#: src/lib/video_content.cc:125
+msgid "Content to be joined must have the same crop."
+msgstr ""
+
+#: src/lib/video_content.cc:113
+msgid "Content to be joined must have the same picture size."
+msgstr ""
+
+#: src/lib/video_content.cc:129
+msgid "Content to be joined must have the same ratio."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:65
+msgid "Content to be joined must have the same subtitle offset."
+msgstr ""
+
+#: src/lib/subtitle_content.cc:69
+msgid "Content to be joined must have the same subtitle scale."
+msgstr ""
+
+#: src/lib/video_content.cc:117
+msgid "Content to be joined must have the same video frame rate."
+msgstr ""
+
+#: src/lib/video_content.cc:121
+msgid "Content to be joined must have the same video frame type."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:107
+msgid "Content to be joined must use the same audio stream."
+msgstr ""
+
+#: src/lib/ffmpeg_content.cc:103
+msgid "Content to be joined must use the same subtitle stream."
+msgstr ""
+
+#: src/lib/scp_dcp_job.cc:110
 msgid "Copy DCP to TMS"
 msgstr "Kopiera DCP till TMS"
 
-#: src/lib/scp_dcp_job.cc:128
+#: src/lib/scp_dcp_job.cc:129
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kunde inte ansluta till server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:150
+#: src/lib/scp_dcp_job.cc:151
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 
@@ -154,19 +193,19 @@ msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 msgid "Could not open %1"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/scp_dcp_job.cc:175
+#: src/lib/scp_dcp_job.cc:176
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
-#: src/lib/film.cc:943
+#: src/lib/film.cc:949
 msgid "Could not read DCP to make KDM for"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:145
+#: src/lib/scp_dcp_job.cc:146
 msgid "Could not start SCP session (%1)"
 msgstr "Kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:189
+#: src/lib/scp_dcp_job.cc:190
 msgid "Could not write to remote file (%1)"
 msgstr "Kunde inte skriva till fjärrfil (%1)"
 
@@ -174,12 +213,12 @@ msgstr "Kunde inte skriva till fjärrfil (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Kubiskt interpolerande avflätare"
 
-#: src/lib/util.cc:845
+#: src/lib/util.cc:808
 #, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "DCP kommer att köras på %1%% av källans hastighet.\n"
 
-#: src/lib/util.cc:836
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
@@ -201,6 +240,18 @@ msgstr "Kantighetsutjämning"
 msgid "De-interlacing"
 msgstr "Avflätning"
 
+#: src/lib/config.cc:69
+msgid ""
+"Dear Projectionist\n"
+"\n"
+"Please find attached KDMs for $CPL_NAME.\n"
+"\n"
+"The KDMs are valid from $START_TIME until $END_TIME.\n"
+"\n"
+"Best regards,\n"
+"DCP-o-matic"
+msgstr ""
+
 #: src/lib/filter.cc:74
 msgid "Deringing filter"
 msgstr "Avringningsfilter"
@@ -210,16 +261,20 @@ msgstr "Avringningsfilter"
 msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:838
+#: src/lib/util.cc:801
 #, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Varje bild från källan kommer att användas två gånger i DCPn.\n"
 
-#: src/lib/util.cc:840
+#: src/lib/util.cc:803
 #, fuzzy
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "Varje bild från källan kommer att användas två gånger i DCPn.\n"
 
+#: src/lib/send_kdm_email_job.cc:50
+msgid "Email KDMs for %1"
+msgstr ""
+
 #: src/lib/writer.cc:109
 msgid "Encoding image data"
 msgstr ""
@@ -232,11 +287,6 @@ msgstr "Fel (%1)"
 msgid "Examine content"
 msgstr "Undersök innehållet"
 
-#: src/lib/moving_image_content.cc:90
-#, fuzzy
-msgid "Examining content"
-msgstr "Undersök innehållet"
-
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
 msgstr "Experimentellt filter för horisontal kantighetsutjämning 1"
@@ -253,7 +303,7 @@ msgstr "FFMPEG avflätare"
 msgid "FIR low-pass deinterlacer"
 msgstr "FIR lågpass-avflätare"
 
-#: src/lib/scp_dcp_job.cc:138
+#: src/lib/scp_dcp_job.cc:139
 msgid "Failed to authenticate with server (%1)"
 msgstr "Misslyckades att autentisera med server (%1)"
 
@@ -313,15 +363,15 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:801
+#: src/lib/util.cc:764
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:805
+#: src/lib/util.cc:768
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:804
+#: src/lib/util.cc:767
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -355,6 +405,14 @@ msgstr "Brusreducering"
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
+#: src/lib/content.cc:100
+msgid "Only the first piece of content to be joined can have a start trim."
+msgstr ""
+
+#: src/lib/content.cc:104
+msgid "Only the last piece of content to be joined can have an end trim."
+msgstr ""
+
 #: src/lib/filter.cc:91
 msgid "Overcomplete wavelet denoiser"
 msgstr "Överkomplett wavelet-brusreducering"
@@ -371,20 +429,20 @@ msgstr "Offentligt Servicemeddelande"
 msgid "Rating"
 msgstr "Klassificeringsklipp"
 
-#: src/lib/config.cc:80 src/lib/config.cc:163
+#: src/lib/config.cc:81 src/lib/config.cc:165
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:802
+#: src/lib/util.cc:765
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:806
+#: src/lib/util.cc:769
 msgid "Right surround"
 msgstr "Höger surround"
 
-#: src/lib/scp_dcp_job.cc:133
+#: src/lib/scp_dcp_job.cc:134
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
@@ -428,7 +486,7 @@ msgstr ""
 "Enheten som filmen lagras på har för lite ledigt utrymme. Frigör utrymme och "
 "försök igen."
 
-#: src/lib/film.cc:370
+#: src/lib/film.cc:372
 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 "
@@ -452,7 +510,7 @@ msgid "Unknown error"
 msgstr "Okänt fel"
 
 # Svengelska
-#: src/lib/ffmpeg_decoder.cc:276
+#: src/lib/ffmpeg_decoder.cc:278
 #, fuzzy
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt audio-sampelformat (%1)"
@@ -473,7 +531,7 @@ msgstr "Filter för vertikal kantighetsutjämning"
 msgid "Vertical deblocking filter A"
 msgstr "Filter för vertikal kantighetsutjämning A"
 
-#: src/lib/scp_dcp_job.cc:101
+#: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
 msgstr "Väntar"
 
@@ -486,34 +544,43 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:276
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
-#: src/lib/film.cc:236
+#: src/lib/image_content.cc:68
+msgid "[moving images]"
+msgstr ""
+
+#: src/lib/image_content.cc:66
+#, fuzzy
+msgid "[still]"
+msgstr "stillbild"
+
+#: src/lib/film.cc:237
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:583
+#: src/lib/util.cc:546
 #, fuzzy
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
-#: src/lib/scp_dcp_job.cc:119
+#: src/lib/scp_dcp_job.cc:120
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:272
 #, fuzzy
 msgid "container"
 msgstr "innehåll"
 
-#: src/lib/film.cc:279
+#: src/lib/film.cc:280
 msgid "content type"
 msgstr "innehållstyp"
 
-#: src/lib/scp_dcp_job.cc:168
+#: src/lib/scp_dcp_job.cc:169
 msgid "copying %1"
 msgstr "kopierar %1"
 
@@ -521,19 +588,19 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:139
+#: src/lib/ffmpeg.cc:175
 msgid "could not find audio decoder"
 msgstr "kunde inte hitta audio-avkodare"
 
-#: src/lib/ffmpeg.cc:87
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg_decoder.cc:522
+#: src/lib/ffmpeg_decoder.cc:524
 msgid "could not find subtitle decoder"
 msgstr "kunde inte hitta undertext-avkodare"
 
-#: src/lib/ffmpeg.cc:118
+#: src/lib/ffmpeg.cc:154
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
@@ -546,11 +613,11 @@ msgstr "kunde inte öppna fil för läsning"
 msgid "could not open file %1"
 msgstr "kunde inte öppna fil %1"
 
-#: src/lib/dcp_video_frame.cc:336
+#: src/lib/dcp_video_frame.cc:357
 msgid "could not open file for reading"
 msgstr "kunde inte öppna fil för läsning"
 
-#: src/lib/dcp_video_frame.cc:342
+#: src/lib/dcp_video_frame.cc:363
 #, fuzzy
 msgid "could not read encoded data"
 msgstr "kunde inte hitta audio-avkodare"
@@ -568,11 +635,11 @@ msgstr "kunde inte köra sampelhastighetskonverteraren"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "kunde inte köra sampelhastighetskonverteraren"
 
-#: src/lib/scp_dcp_job.cc:86
+#: src/lib/scp_dcp_job.cc:87
 msgid "could not start SCP session (%1)"
 msgstr "kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:52
+#: src/lib/scp_dcp_job.cc:53
 msgid "could not start SSH session"
 msgstr "kunde inte starta SSH-session"
 
@@ -580,7 +647,23 @@ msgstr "kunde inte starta SSH-session"
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/moving_image_examiner.cc:82
+#: src/lib/util.cc:566
+msgid "error during async_accept (%1)"
+msgstr ""
+
+#: src/lib/util.cc:542
+msgid "error during async_connect (%1)"
+msgstr ""
+
+#: src/lib/util.cc:615
+msgid "error during async_read (%1)"
+msgstr ""
+
+#: src/lib/util.cc:587
+msgid "error during async_write (%1)"
+msgstr ""
+
+#: src/lib/image_examiner.cc:68
 msgid "first frame in moving image directory is number %1"
 msgstr ""
 
@@ -588,23 +671,23 @@ msgstr ""
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:145
+#: src/lib/util.cc:148
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:142 src/lib/util.cc:147
+#: src/lib/util.cc:145 src/lib/util.cc:150
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:152
+#: src/lib/util.cc:155
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:154
+#: src/lib/util.cc:157
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:724
+#: src/lib/util.cc:687
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -612,44 +695,58 @@ msgstr "saknad nyckel %1 i nyckel-värde grupp"
 msgid "missing required setting %1"
 msgstr "saknad nödvändig inställning %1"
 
-#: src/lib/ffmpeg_decoder.cc:554
+#: src/lib/image_content.cc:83
+msgid "moving"
+msgstr ""
+
+#: src/lib/ffmpeg_decoder.cc:556
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:236 src/lib/film.cc:283
+#: src/lib/film.cc:237 src/lib/film.cc:284
 msgid "name"
 msgstr "namn"
 
-#: src/lib/ffmpeg_decoder.cc:569
+#: src/lib/ffmpeg_decoder.cc:571
 msgid "non-bitmap subtitles not yet supported"
 msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 
-#: src/lib/moving_image_examiner.cc:78
-msgid "only %1 file(s) found in moving image directory"
-msgstr ""
-
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
 #: src/lib/job.cc:309
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/config.cc:78 src/lib/video_content.cc:111
+#: src/lib/config.cc:79 src/lib/video_content.cc:169
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:79
+#: src/lib/config.cc:80
 msgid "sRGB non-linearised"
 msgstr ""
 
-#: src/lib/util.cc:157
+#: src/lib/util.cc:160
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/lib/moving_image_examiner.cc:86
+#: src/lib/image_content.cc:81
+#, fuzzy
+msgid "still"
+msgstr "stillbild"
+
+#: src/lib/image_examiner.cc:72
 msgid "there are %1 images in the directory but the last one is number %2"
 msgstr ""
 
+#: src/lib/ffmpeg_examiner.cc:169
+#, fuzzy
+msgid "unknown"
+msgstr "Okänt fel"
+
+#, fuzzy
+#~ msgid "Examining content"
+#~ msgstr "Undersök innehållet"
+
 #, fuzzy
 #~ msgid "Could not find DCP to make KDM for"
 #~ msgstr "kunde inte hitta audio-avkodare"
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 2b6dd766e..a7dac9013 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -350,6 +350,8 @@ dcpomatic_setup_gettext_i18n (string lang)
 		putenv (cmd);
 		snprintf (cmd, sizeof(cmd), "LANG=%s", lang.c_str ());
 		putenv (cmd);
+		snprintf (cmd, sizeof(cmd), "LC_ALL=%s", lang.c_str ());
+		putenv (cmd);
 	}
 
 	setlocale (LC_ALL, "");
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 414ea72eb..5fc848195 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -92,8 +92,11 @@ Writer::Writer (shared_ptr<const Film> f, weak_ptr<Job> j)
 	}
 	
 	_picture_asset_writer = _picture_asset->start_write (_first_nonexistant_frame > 0);
-	
-	_sound_asset.reset (new libdcp::SoundAsset (_film->dir (_film->dcp_name()), _film->audio_mxf_filename ()));
+
+	/* Write the sound asset into the film directory so that we leave the creation
+	   of the DCP directory until the last minute.
+	*/
+	_sound_asset.reset (new libdcp::SoundAsset (_film->dir ("."), _film->audio_mxf_filename ()));
 	_sound_asset->set_edit_rate (_film->video_frame_rate ());
 	_sound_asset->set_channels (_film->audio_channels ());
 	_sound_asset->set_sampling_rate (_film->audio_frame_rate ());
@@ -348,20 +351,19 @@ Writer::finish ()
 	_picture_asset->set_duration (frames);
 
 	/* Hard-link the video MXF into the DCP */
-
-	boost::filesystem::path from;
-	from /= _film->internal_video_mxf_dir();
-	from /= _film->internal_video_mxf_filename();
+	boost::filesystem::path video_from;
+	video_from /= _film->internal_video_mxf_dir();
+	video_from /= _film->internal_video_mxf_filename();
 	
-	boost::filesystem::path to;
-	to /= _film->dir (_film->dcp_name());
-	to /= _film->video_mxf_filename ();
+	boost::filesystem::path video_to;
+	video_to /= _film->dir (_film->dcp_name());
+	video_to /= _film->video_mxf_filename ();
 
 	boost::system::error_code ec;
-	boost::filesystem::create_hard_link (from, to, ec);
+	boost::filesystem::create_hard_link (video_from, video_to, ec);
 	if (ec) {
 		/* hard link failed; copy instead */
-		boost::filesystem::copy_file (from, to);
+		boost::filesystem::copy_file (video_from, video_to);
 		_film->log()->log ("Hard-link failed; fell back to copying");
 	}
 
@@ -369,6 +371,23 @@ Writer::finish ()
 
 	_picture_asset->set_directory (_film->dir (_film->dcp_name ()));
 	_picture_asset->set_file_name (_film->video_mxf_filename ());
+
+	/* Move the audio MXF into the DCP */
+	
+	boost::filesystem::path audio_from;
+	audio_from /= _film->dir (".");
+	audio_from /= _film->audio_mxf_filename ();
+
+	boost::filesystem::path audio_to;
+	audio_to /= _film->dir (_film->dcp_name ());
+	audio_to /= _film->audio_mxf_filename ();
+	
+	boost::filesystem::rename (audio_from, audio_to, ec);
+	if (ec) {
+		throw FileError (String::compose (_("could not move audio MXF into the DCP (%1)"), ec.value ()), audio_from);
+	}
+
+	_sound_asset->set_directory (_film->dir (_film->dcp_name ()));
 	_sound_asset->set_duration (frames);
 	
 	libdcp::DCP dcp (_film->dir (_film->dcp_name()));
@@ -448,11 +467,7 @@ Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
 	}
 	
 	/* Read the data from the MXF and hash it */
-#ifdef DCPOMATIC_WINDOWS
-	_fseeki64 (mxf, info.offset, SEEK_SET);
-#else	
-	fseek (mxf, info.offset, SEEK_SET);
-#endif	
+	dcpomatic_fseek (mxf, info.offset, SEEK_SET);
 	EncodedData data (info.size);
 	size_t const read = fread (data.data(), 1, data.size(), mxf);
 	if (read != static_cast<size_t> (data.size ())) {
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 8e44a405a..bdedf2695 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-31 11:04+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2014-01-02 13:17+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: de\n"
 
 #: src/tools/dcpomatic.cc:361
 msgid "%1 already exists as a file, so you cannot use it for a new film."
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 3854f3bf6..3a859935a 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-11-09 02:47-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,143 +17,143 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: src/tools/dcpomatic.cc:358
+#: src/tools/dcpomatic.cc:361
 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."
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:237
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:203
+#: src/tools/dcpomatic.cc:205
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:233
+#: src/tools/dcpomatic.cc:235
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:239
+#: src/tools/dcpomatic.cc:241
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:239
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:219
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:195
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
+#: src/tools/dcpomatic.cc:212 src/tools/dcpomatic.cc:215
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dcpomatic.cc:197
+#: src/tools/dcpomatic.cc:199
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dcpomatic.cc:205
+#: src/tools/dcpomatic.cc:207
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:195
+#: src/tools/dcpomatic.cc:197
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dcpomatic.cc:219
+#: src/tools/dcpomatic.cc:221
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:238
+#: src/tools/dcpomatic.cc:240
 msgid "&Tools"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:230
+#: src/tools/dcpomatic.cc:232
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:228
+#: src/tools/dcpomatic.cc:230
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:612
+#: src/tools/dcpomatic.cc:619
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:403
+#: src/tools/dcpomatic.cc:406
 #, 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:494
+#: src/tools/dcpomatic.cc:499
 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:487
+#: src/tools/dcpomatic.cc:492
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilus)"
 
-#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
-#: src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:332 src/tools/dcpomatic.cc:577
+#: src/tools/dcpomatic.cc:630
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:226
 msgid "Encoding Servers..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:86
+#: src/tools/dcpomatic.cc:88
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dcpomatic.cc:223
+#: src/tools/dcpomatic.cc:225
 msgid "Hints..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:218
+#: src/tools/dcpomatic.cc:220
 msgid "Make &KDMs..."
 msgstr "Crear &KDMs..."
 
-#: src/tools/dcpomatic.cc:192
+#: src/tools/dcpomatic.cc:194
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:222
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:87
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Guardar cambios de la película \"%s\" antes de cerrar?"
 
-#: src/tools/dcpomatic.cc:378
+#: src/tools/dcpomatic.cc:381
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:351
 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:534
+#: src/tools/dcpomatic.cc:539
 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:535
+#: src/tools/dcpomatic.cc:540
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
-#: src/tools/dcpomatic.cc:387
+#: src/tools/dcpomatic.cc:390
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 4be21e306..74e72d6aa 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-11-25 18:58+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,142 +17,142 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: src/tools/dcpomatic.cc:358
+#: src/tools/dcpomatic.cc:361
 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."
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:237
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:203
+#: src/tools/dcpomatic.cc:205
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:233
+#: src/tools/dcpomatic.cc:235
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:239
+#: src/tools/dcpomatic.cc:241
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:239
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:219
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:195
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
+#: src/tools/dcpomatic.cc:212 src/tools/dcpomatic.cc:215
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dcpomatic.cc:197
+#: src/tools/dcpomatic.cc:199
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dcpomatic.cc:205
+#: src/tools/dcpomatic.cc:207
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:195
+#: src/tools/dcpomatic.cc:197
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dcpomatic.cc:219
+#: src/tools/dcpomatic.cc:221
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dcpomatic.cc:238
+#: src/tools/dcpomatic.cc:240
 msgid "&Tools"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:230
+#: src/tools/dcpomatic.cc:232
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dcpomatic.cc:228
+#: src/tools/dcpomatic.cc:230
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:612
+#: src/tools/dcpomatic.cc:619
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:403
+#: src/tools/dcpomatic.cc:406
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:494
+#: src/tools/dcpomatic.cc:499
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
-#: src/tools/dcpomatic.cc:487
+#: src/tools/dcpomatic.cc:492
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
-#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
-#: src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:332 src/tools/dcpomatic.cc:577
+#: src/tools/dcpomatic.cc:630
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:226
 msgid "Encoding Servers..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:86
+#: src/tools/dcpomatic.cc:88
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dcpomatic.cc:223
+#: src/tools/dcpomatic.cc:225
 msgid "Hints..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:218
+#: src/tools/dcpomatic.cc:220
 msgid "Make &KDMs..."
 msgstr "Générer &KDMs..."
 
-#: src/tools/dcpomatic.cc:192
+#: src/tools/dcpomatic.cc:194
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:222
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:87
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:378
+#: src/tools/dcpomatic.cc:381
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:351
 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:534
+#: src/tools/dcpomatic.cc:539
 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:535
+#: src/tools/dcpomatic.cc:540
 msgid "Unfinished jobs"
 msgstr "Travaux incomplets"
 
-#: src/tools/dcpomatic.cc:387
+#: src/tools/dcpomatic.cc:390
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 7507e17a0..f01b0c9bd 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-04-28 10:31+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,142 +17,142 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dcpomatic.cc:358
+#: src/tools/dcpomatic.cc:361
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:237
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:203
+#: src/tools/dcpomatic.cc:205
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:233
+#: src/tools/dcpomatic.cc:235
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:239
+#: src/tools/dcpomatic.cc:241
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:239
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:219
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:195
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
+#: src/tools/dcpomatic.cc:212 src/tools/dcpomatic.cc:215
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dcpomatic.cc:197
+#: src/tools/dcpomatic.cc:199
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dcpomatic.cc:205
+#: src/tools/dcpomatic.cc:207
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:195
+#: src/tools/dcpomatic.cc:197
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dcpomatic.cc:219
+#: src/tools/dcpomatic.cc:221
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:238
+#: src/tools/dcpomatic.cc:240
 msgid "&Tools"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:230
+#: src/tools/dcpomatic.cc:232
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:228
+#: src/tools/dcpomatic.cc:230
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:612
+#: src/tools/dcpomatic.cc:619
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:403
+#: src/tools/dcpomatic.cc:406
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:494
+#: src/tools/dcpomatic.cc:499
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:487
+#: src/tools/dcpomatic.cc:492
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
-#: src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:332 src/tools/dcpomatic.cc:577
+#: src/tools/dcpomatic.cc:630
 #, fuzzy
 msgid "DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:226
 msgid "Encoding Servers..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:86
+#: src/tools/dcpomatic.cc:88
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dcpomatic.cc:223
+#: src/tools/dcpomatic.cc:225
 msgid "Hints..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:218
+#: src/tools/dcpomatic.cc:220
 msgid "Make &KDMs..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:192
+#: src/tools/dcpomatic.cc:194
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:222
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:87
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:378
+#: src/tools/dcpomatic.cc:381
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:351
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:534
+#: src/tools/dcpomatic.cc:539
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:540
 msgid "Unfinished jobs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:387
+#: src/tools/dcpomatic.cc:390
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 1ebcc2782..b5bc43572 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-04-09 10:12+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,141 +17,141 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dcpomatic.cc:358
+#: src/tools/dcpomatic.cc:361
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:235
+#: src/tools/dcpomatic.cc:237
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:203
+#: src/tools/dcpomatic.cc:205
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:233
+#: src/tools/dcpomatic.cc:235
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:239
+#: src/tools/dcpomatic.cc:241
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:239
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:219
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:195
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
+#: src/tools/dcpomatic.cc:212 src/tools/dcpomatic.cc:215
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dcpomatic.cc:197
+#: src/tools/dcpomatic.cc:199
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dcpomatic.cc:205
+#: src/tools/dcpomatic.cc:207
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:195
+#: src/tools/dcpomatic.cc:197
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dcpomatic.cc:219
+#: src/tools/dcpomatic.cc:221
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:238
+#: src/tools/dcpomatic.cc:240
 msgid "&Tools"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:230
+#: src/tools/dcpomatic.cc:232
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:228
+#: src/tools/dcpomatic.cc:230
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:612
+#: src/tools/dcpomatic.cc:619
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:403
+#: src/tools/dcpomatic.cc:406
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:494
+#: src/tools/dcpomatic.cc:499
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:487
+#: src/tools/dcpomatic.cc:492
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
-#: src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:332 src/tools/dcpomatic.cc:577
+#: src/tools/dcpomatic.cc:630
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:226
 msgid "Encoding Servers..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:86
+#: src/tools/dcpomatic.cc:88
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dcpomatic.cc:223
+#: src/tools/dcpomatic.cc:225
 msgid "Hints..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:218
+#: src/tools/dcpomatic.cc:220
 msgid "Make &KDMs..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:192
+#: src/tools/dcpomatic.cc:194
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:222
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:87
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:378
+#: src/tools/dcpomatic.cc:381
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic.cc:348
+#: src/tools/dcpomatic.cc:351
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:534
+#: src/tools/dcpomatic.cc:539
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:535
+#: src/tools/dcpomatic.cc:540
 msgid "Unfinished jobs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:387
+#: src/tools/dcpomatic.cc:390
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index e5cb5371c..45c423355 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -275,9 +275,9 @@ FilmEditor::make_content_panel ()
 		b->Add (_content_add_folder, 1, wxEXPAND | wxLEFT | wxRIGHT);
 		_content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
 		b->Add (_content_remove, 1, wxEXPAND | wxLEFT | wxRIGHT);
-		_content_earlier = new wxButton (_content_panel, wxID_UP);
+		_content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up"));
 		b->Add (_content_earlier, 1, wxEXPAND);
-		_content_later = new wxButton (_content_panel, wxID_DOWN);
+		_content_later = new wxButton (_content_panel, wxID_ANY, _("Down"));
 		b->Add (_content_later, 1, wxEXPAND);
 		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
 		b->Add (_content_timeline, 1, wxEXPAND | wxLEFT | wxRIGHT);
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 04d47f8d8..83d82ae62 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-31 11:04+0000\n"
-"PO-Revision-Date: 2014-01-03 13:51+0100\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
+"PO-Revision-Date: 2014-01-05 23:08+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: de\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 msgid "%"
@@ -24,15 +24,15 @@ msgstr "%"
 
 #: src/wx/about_dialog.cc:78
 msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:131
 msgid "(password will be stored on disk in plaintext)"
 msgstr "(Passwort wird in Klartext gespeichert)"
 
-#: src/wx/config_dialog.cc:107
+#: src/wx/config_dialog.cc:108
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(DCP-o-matic zum ändern der Sprache neu starten)"
 
@@ -88,6 +88,10 @@ msgstr "Datei(en) hinzufügen..."
 msgid "Add folder..."
 msgstr "Ordner hinzufügen..."
 
+#: src/wx/editable_list.h:61
+msgid "Add..."
+msgstr "Hinzufügen..."
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Ton"
@@ -214,7 +218,7 @@ msgstr "DCP konnte nicht erstellt werden: %s"
 msgid "Create in folder"
 msgstr "In Ordner erstellen"
 
-#: src/wx/config_dialog.cc:329
+#: src/wx/config_dialog.cc:332
 msgid "Creator"
 msgstr "Ersteller"
 
@@ -252,31 +256,31 @@ msgstr "DCP-o-matic Einstellungen"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic Ton - %s"
 
-#: src/wx/config_dialog.cc:201
+#: src/wx/config_dialog.cc:204
 msgid "Default DCI name details"
 msgstr "Standard DCI Name Details"
 
-#: src/wx/config_dialog.cc:214
+#: src/wx/config_dialog.cc:217
 msgid "Default JPEG2000 bandwidth"
 msgstr "Standard JPEG2000 Bandbreite"
 
-#: src/wx/config_dialog.cc:223
+#: src/wx/config_dialog.cc:226
 msgid "Default audio delay"
 msgstr "Standard Ton Delay"
 
-#: src/wx/config_dialog.cc:205
+#: src/wx/config_dialog.cc:208
 msgid "Default container"
 msgstr "Standard Container"
 
-#: src/wx/config_dialog.cc:209
+#: src/wx/config_dialog.cc:212
 msgid "Default content type"
 msgstr "Standard Inhalt Typ"
 
-#: src/wx/config_dialog.cc:193
+#: src/wx/config_dialog.cc:196
 msgid "Default directory for new films"
 msgstr "Standard Ordner für neue Filme"
 
-#: src/wx/config_dialog.cc:185
+#: src/wx/config_dialog.cc:188
 msgid "Default duration of still images"
 msgstr "Satndard Länge der Standbilder"
 
@@ -292,6 +296,10 @@ msgstr "Details..."
 msgid "Disk space required"
 msgstr "Festplattenplatz benötigt"
 
+#: src/wx/film_editor.cc:280
+msgid "Down"
+msgstr "Nach unten"
+
 #: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
 msgstr "Kino bearbeiten..."
@@ -300,8 +308,8 @@ msgstr "Kino bearbeiten..."
 msgid "Edit Screen..."
 msgstr "Saal bearbeiten..."
 
-#: src/wx/config_dialog.cc:202 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174
+#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
 msgid "Edit..."
 msgstr "Bearbeiten..."
 
@@ -357,7 +365,7 @@ msgstr "Kostenlose open-source DCP Erstellung von fast allem."
 msgid "From"
 msgstr "Von"
 
-#: src/wx/config_dialog.cc:134
+#: src/wx/config_dialog.cc:135
 msgid "From address for KDM emails"
 msgstr "Von Adresse für KDM Emails"
 
@@ -393,11 +401,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Ich möchte bei dieser Lautstärke spielen"
 
-#: src/wx/config_dialog.cc:286
+#: src/wx/config_dialog.cc:289
 msgid "IP address"
 msgstr "IP Adresse"
 
-#: src/wx/config_dialog.cc:358
+#: src/wx/config_dialog.cc:361
 msgid "IP address / host name"
 msgstr "IP Adresse / Host Name"
 
@@ -409,7 +417,7 @@ msgstr "Eingangs Gamma"
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/config_dialog.cc:325
+#: src/wx/config_dialog.cc:328
 msgid "Issuer"
 msgstr "Herausgeber"
 
@@ -449,7 +457,7 @@ msgstr "Linearisiere Eingangs Gamma für niedrige Werte"
 msgid "Ls"
 msgstr "SL"
 
-#: src/wx/config_dialog.cc:218 src/wx/film_editor.cc:180
+#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
 msgid "MBps"
 msgstr "MBps"
 
@@ -457,11 +465,11 @@ msgstr "MBps"
 msgid "MISSING: "
 msgstr "FEHLT:"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:127
 msgid "Mail password"
 msgstr "Mail Passwort"
 
-#: src/wx/config_dialog.cc:122
+#: src/wx/config_dialog.cc:123
 msgid "Mail user name"
 msgstr "Mail Benutzername"
 
@@ -489,7 +497,7 @@ msgstr "Mehrere Inhalte ausgewählt"
 msgid "My Documents"
 msgstr "Meine Dokumente"
 
-#: src/wx/config_dialog.cc:521 src/wx/film_editor.cc:111
+#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Name"
@@ -506,7 +514,7 @@ msgstr "Ohne Zerrung"
 msgid "None"
 msgstr "Kein"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:119
 msgid "Outgoing mail server"
 msgstr "Ausgehender Mail Server"
 
@@ -523,7 +531,7 @@ msgstr "Paket Typ (e.g. 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:298
+#: src/wx/config_dialog.cc:301
 msgid "Password"
 msgstr "Passwort"
 
@@ -564,6 +572,7 @@ msgid "Rating (e.g. 15)"
 msgstr "FSK (z.B. 12)"
 
 #: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
+#: src/wx/editable_list.h:65
 msgid "Remove"
 msgstr "Entfernen"
 
@@ -684,7 +693,7 @@ msgstr "Untertitel Spur"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:129
+#: src/wx/about_dialog.cc:131
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
@@ -692,7 +701,7 @@ msgstr "Unterstützt durch"
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:290
+#: src/wx/config_dialog.cc:293
 msgid "Target path"
 msgstr "Zielpfad"
 
@@ -718,7 +727,7 @@ msgstr "Keine Tipps: Alles sieht gut aus !"
 msgid "Threads"
 msgstr "Kerne"
 
-#: src/wx/config_dialog.cc:114
+#: src/wx/config_dialog.cc:115
 msgid "Threads to use for encoding on this host"
 msgstr "Auf diesem Host zu benutzende Kerne"
 
@@ -742,7 +751,7 @@ msgstr "Timing"
 msgid "Top crop"
 msgstr "Oben beschneiden"
 
-#: src/wx/about_dialog.cc:100
+#: src/wx/about_dialog.cc:101
 msgid "Translated by"
 msgstr "Übersetzt von"
 
@@ -762,11 +771,15 @@ msgstr "Typ"
 msgid "Until"
 msgstr "Bis"
 
+#: src/wx/film_editor.cc:278
+msgid "Up"
+msgstr "Nach oben"
+
 #: src/wx/film_editor.cc:126
 msgid "Use DCI name"
 msgstr "DCI Name benutzen"
 
-#: src/wx/config_dialog.cc:354
+#: src/wx/config_dialog.cc:357
 msgid "Use all servers"
 msgstr "Alle Server benutzen"
 
@@ -778,7 +791,7 @@ msgstr "Beste benutzen"
 msgid "Use preset"
 msgstr "Preset benutzen"
 
-#: src/wx/config_dialog.cc:294
+#: src/wx/config_dialog.cc:297
 msgid "User name"
 msgstr "Benutzer Name"
 
@@ -850,11 +863,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:227
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:189
+#: src/wx/config_dialog.cc:192
 msgid "s"
 msgstr "s"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index f8f36111c..7db715459 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-11-09 03:00-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -22,12 +22,17 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/about_dialog.cc:78
+#, fuzzy
 msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+
+#: src/wx/config_dialog.cc:131
+msgid "(password will be stored on disk in plaintext)"
 msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:108
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 
@@ -43,11 +48,11 @@ msgstr "1 canal"
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:215
+#: src/wx/film_editor.cc:218
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "3D"
 msgstr ""
 
@@ -55,7 +60,11 @@ msgstr ""
 msgid "3D left/right"
 msgstr "3D izquierda/derecha"
 
-#: src/wx/film_editor.cc:216
+#: src/wx/video_panel.cc:202
+msgid "3D top/bottom"
+msgstr ""
+
+#: src/wx/film_editor.cc:219
 msgid "4K"
 msgstr ""
 
@@ -72,14 +81,18 @@ msgstr "Añadir cine..."
 msgid "Add Screen..."
 msgstr "Añadir pantalla..."
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:272
 msgid "Add file(s)..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/film_editor.cc:270
+#: src/wx/film_editor.cc:274
 msgid "Add folder..."
 msgstr "Añadir carpeta..."
 
+#: src/wx/editable_list.h:61
+msgid "Add..."
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -101,7 +114,7 @@ msgstr "Idioma del audio (ej. ES)"
 msgid "Audio Stream"
 msgstr "Retardo del audio"
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:161
 #, fuzzy
 msgid "Audio channels"
 msgstr "canales"
@@ -115,7 +128,7 @@ msgstr "Configuración erronea para %s (%s)"
 msgid "Bottom crop"
 msgstr "Recortar abajo"
 
-#: src/wx/dir_picker_ctrl.cc:38
+#: src/wx/dir_picker_ctrl.cc:37
 msgid "Browse..."
 msgstr "Explorar..."
 
@@ -139,16 +152,16 @@ msgstr "Cancelar"
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/content_menu.cc:137
+#: src/wx/content_menu.cc:182
 #, fuzzy
 msgid "Choose a file"
 msgstr "Crear en carpeta"
 
-#: src/wx/film_editor.cc:737
+#: src/wx/film_editor.cc:767
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
 #, fuzzy
 msgid "Choose a folder"
 msgstr "Crear en carpeta"
@@ -158,20 +171,20 @@ msgstr "Crear en carpeta"
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
-#: src/wx/config_dialog.cc:63
+#: src/wx/config_dialog.cc:65
 msgid "Colour conversions"
 msgstr "Conversiones de color"
 
-#: src/wx/film_editor.cc:133
+#: src/wx/film_editor.cc:132
 #, fuzzy
 msgid "Container"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:138
+#: src/wx/film_editor.cc:137
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
@@ -180,7 +193,7 @@ msgstr "Tipo de contenido"
 msgid "Content channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:333
+#: src/wx/video_panel.cc:335
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Velocidad del contenido %.4f\n"
@@ -190,7 +203,7 @@ msgstr "Velocidad del contenido %.4f\n"
 msgid "Content version"
 msgstr "Tipo de contenido"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:293
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "El video es %dx%d (%.2f:1)\n"
@@ -199,7 +212,7 @@ msgstr "El video es %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
-#: src/wx/film_viewer.cc:336
+#: src/wx/film_viewer.cc:332
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -213,17 +226,17 @@ msgstr "No se pudo crear el DCP: %s"
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:332
 #, fuzzy
 msgid "Creator"
 msgstr "Crear en carpeta"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:305
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Recortado a %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:242
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -231,11 +244,11 @@ msgstr "Personalizado"
 msgid "DCI name"
 msgstr "Nombre DCI"
 
-#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:117
+#: src/wx/film_editor.cc:116
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
@@ -252,35 +265,44 @@ msgstr "Preferencias DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %1"
 
-#: src/wx/config_dialog.cc:141
+#: src/wx/config_dialog.cc:204
 msgid "Default DCI name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:154
+#: src/wx/config_dialog.cc:217
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/config_dialog.cc:145
+#: src/wx/config_dialog.cc:226
+#, fuzzy
+msgid "Default audio delay"
+msgstr "Tipo de contenido"
+
+#: src/wx/config_dialog.cc:208
 #, fuzzy
 msgid "Default container"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:149
+#: src/wx/config_dialog.cc:212
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:196
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:188
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
+#: src/wx/config_dialog.cc:61
+msgid "Defaults"
+msgstr ""
+
+#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detalles..."
 
@@ -288,6 +310,10 @@ msgstr "Detalles..."
 msgid "Disk space required"
 msgstr "Espacio requerido en disco"
 
+#: src/wx/film_editor.cc:280
+msgid "Down"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 #, fuzzy
 msgid "Edit Cinema..."
@@ -298,8 +324,8 @@ msgstr "Editar..."
 msgid "Edit Screen..."
 msgstr "Editar..."
 
-#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174
+#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
 msgid "Edit..."
 msgstr "Editar..."
 
@@ -308,12 +334,12 @@ msgstr "Editar..."
 msgid "Encoding Servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:63
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Servidores de codificación"
 
-#: src/wx/film_editor.cc:154
+#: src/wx/film_editor.cc:157
 msgid "Encrypted"
 msgstr ""
 
@@ -333,11 +359,11 @@ msgstr "Nombre de la película"
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/wx/content_menu.cc:49
+#: src/wx/content_menu.cc:52
 msgid "Find missing..."
 msgstr ""
 
-#: src/wx/film_editor.cc:144
+#: src/wx/film_editor.cc:143
 #, fuzzy
 msgid "Frame Rate"
 msgstr "Velocidad DCP"
@@ -359,10 +385,14 @@ msgstr ""
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:135
 msgid "From address for KDM emails"
 msgstr "Remitente para los emails de KDM"
 
+#: src/wx/timing_panel.cc:40
+msgid "Full length"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculadora de ganancia"
@@ -391,11 +421,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:289
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:361
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Dirección IP"
@@ -404,23 +434,27 @@ msgstr "Dirección IP"
 msgid "Input gamma"
 msgstr "Gamma de entrada"
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:222
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:328
 msgid "Issuer"
 msgstr "Emisor"
 
-#: src/wx/film_editor.cc:173
+#: src/wx/film_editor.cc:176
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/content_menu.cc:51
+msgid "Join"
+msgstr ""
+
+#: src/wx/config_dialog.cc:71
 msgid "KDM email"
 msgstr "Email KDM"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:290
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
 
@@ -432,10 +466,6 @@ msgstr ""
 msgid "Left crop"
 msgstr "Recorte izquierda"
 
-#: src/wx/timing_panel.cc:40
-msgid "Length"
-msgstr "Longitud"
-
 #: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr ""
@@ -449,14 +479,24 @@ msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
+#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/film_editor.cc:711
+#: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr ""
 
+#: src/wx/config_dialog.cc:127
+#, fuzzy
+msgid "Mail password"
+msgstr "Clave del TMS"
+
+#: src/wx/config_dialog.cc:123
+#, fuzzy
+msgid "Mail user name"
+msgstr "Usuario del TMS"
+
 #: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
 msgstr "Crear KDMs"
@@ -465,7 +505,7 @@ msgstr "Crear KDMs"
 msgid "Matrix"
 msgstr ""
 
-#: src/wx/config_dialog.cc:65
+#: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr ""
 
@@ -473,16 +513,16 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:281
 #, fuzzy
 msgid "Multiple content selected"
 msgstr "Tipo de contenido"
 
-#: src/wx/dir_picker_ctrl.cc:52
+#: src/wx/dir_picker_ctrl.cc:51
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
+#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nombre"
@@ -495,11 +535,11 @@ msgstr "Nueva película"
 msgid "No stretch"
 msgstr "Sin deformar"
 
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Ninguno"
 
-#: src/wx/config_dialog.cc:116
+#: src/wx/config_dialog.cc:119
 #, fuzzy
 msgid "Outgoing mail server"
 msgstr "Servidores de codificación"
@@ -512,12 +552,12 @@ msgstr "Gamma de salida"
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/video_panel.cc:326
+#: src/wx/video_panel.cc:328
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Completado con negro hasta %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:253
+#: src/wx/config_dialog.cc:301
 #, fuzzy
 msgid "Password"
 msgstr "Clave del TMS"
@@ -530,10 +570,14 @@ msgstr "Pausa"
 msgid "Peak"
 msgstr "Pico"
 
-#: src/wx/film_viewer.cc:64
+#: src/wx/film_viewer.cc:62
 msgid "Play"
 msgstr "Reproducir"
 
+#: src/wx/timing_panel.cc:49
+msgid "Play length"
+msgstr ""
+
 #: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
@@ -554,7 +598,8 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
+#: src/wx/editable_list.h:65
 msgid "Remove"
 msgstr "Quitar"
 
@@ -577,11 +622,11 @@ msgstr "Repetir"
 msgid "Repeat Content"
 msgstr "Seleccionar fichero de contenido"
 
-#: src/wx/content_menu.cc:48
+#: src/wx/content_menu.cc:50
 msgid "Repeat..."
 msgstr "Repetir..."
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:170
 msgid "Resolution"
 msgstr "Resolución"
 
@@ -598,7 +643,7 @@ msgstr "Recorte derecha"
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:221
 msgid "SMPTE"
 msgstr ""
 
@@ -607,12 +652,12 @@ msgstr ""
 msgid "Scale to"
 msgstr "Escalador"
 
-#: src/wx/video_panel.cc:318
+#: src/wx/video_panel.cc:320
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Redimensionado a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Scaler"
 msgstr "Escalador"
 
@@ -633,7 +678,7 @@ msgstr "Servidor"
 msgid "Set"
 msgstr "Seleccionar"
 
-#: src/wx/config_dialog.cc:95
+#: src/wx/config_dialog.cc:97
 msgid "Set language"
 msgstr "Seleccionar idioma"
 
@@ -641,6 +686,10 @@ msgstr "Seleccionar idioma"
 msgid "Show Audio..."
 msgstr "Mostrar audio..."
 
+#: src/wx/film_editor.cc:153
+msgid "Signed"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Suavizado"
@@ -649,7 +698,7 @@ msgstr "Suavizado"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:182
+#: src/wx/film_editor.cc:185
 msgid "Standard"
 msgstr "Estandard"
 
@@ -678,16 +727,16 @@ msgstr "Escala del subtítulo"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:128
+#: src/wx/about_dialog.cc:131
 msgid "Supported by"
 msgstr "Soportado por"
 
-#: src/wx/config_dialog.cc:67
+#: src/wx/config_dialog.cc:69
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:245
+#: src/wx/config_dialog.cc:293
 #, fuzzy
 msgid "Target path"
 msgstr "Ruta en el TMS"
@@ -696,7 +745,7 @@ msgstr "Ruta en el TMS"
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
-#: src/wx/content_menu.cc:178
+#: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -711,7 +760,7 @@ msgstr ""
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/wx/config_dialog.cc:112
+#: src/wx/config_dialog.cc:115
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
@@ -724,7 +773,7 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:282
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
@@ -736,7 +785,7 @@ msgstr ""
 msgid "Top crop"
 msgstr "Recortar arriba"
 
-#: src/wx/about_dialog.cc:100
+#: src/wx/about_dialog.cc:101
 msgid "Translated by"
 msgstr "Traducido por"
 
@@ -758,15 +807,19 @@ msgstr "Tipo"
 msgid "Until"
 msgstr "Hasta"
 
-#: src/wx/film_editor.cc:127
+#: src/wx/film_editor.cc:278
+msgid "Up"
+msgstr ""
+
+#: src/wx/film_editor.cc:126
 msgid "Use DCI name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:357
 msgid "Use all servers"
 msgstr ""
 
-#: src/wx/film_editor.cc:148
+#: src/wx/film_editor.cc:147
 msgid "Use best"
 msgstr "Usar la mejor"
 
@@ -775,7 +828,7 @@ msgstr "Usar la mejor"
 msgid "Use preset"
 msgstr "Usar la mejor"
 
-#: src/wx/config_dialog.cc:249
+#: src/wx/config_dialog.cc:297
 #, fuzzy
 msgid "User name"
 msgstr "Usar el nombre DCI"
@@ -799,8 +852,8 @@ msgstr "Escrito por"
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
-"You have %d files that look like they are VOB files from DVD.  You should "
-"coalesce them to ensure smooth joins between the files."
+"You have %d files that look like they are VOB files from DVD. You should "
+"join them to ensure smooth joins between the files."
 msgstr ""
 
 #: src/wx/hints_dialog.cc:76
@@ -840,11 +893,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:192
 msgid "s"
 msgstr "s"
 
@@ -861,6 +914,9 @@ msgstr ""
 msgid "video"
 msgstr "Vídeo"
 
+#~ msgid "Length"
+#~ msgstr "Longitud"
+
 #~ msgid "Threads to use"
 #~ msgstr "Hilos a utilizar"
 
@@ -941,8 +997,5 @@ msgstr "Vídeo"
 #~ msgid "TMS IP address"
 #~ msgstr "Dirección IP del TMS"
 
-#~ msgid "TMS user name"
-#~ msgstr "Usuario del TMS"
-
 #~ msgid "Original Size"
 #~ msgstr "Tamaño original"
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index c832641ca..4af528c15 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-11-25 19:28+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -22,12 +22,17 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/about_dialog.cc:78
+#, fuzzy
 msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr ""
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+
+#: src/wx/config_dialog.cc:131
+msgid "(password will be stored on disk in plaintext)"
 msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:108
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 "(redémarrez DCP-o-matic pour que les changements de langue prennent effet)"
@@ -44,11 +49,11 @@ msgstr "1 canal"
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:215
+#: src/wx/film_editor.cc:218
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "3D"
 msgstr ""
 
@@ -56,7 +61,11 @@ msgstr ""
 msgid "3D left/right"
 msgstr "3D gauche/droite"
 
-#: src/wx/film_editor.cc:216
+#: src/wx/video_panel.cc:202
+msgid "3D top/bottom"
+msgstr ""
+
+#: src/wx/film_editor.cc:219
 msgid "4K"
 msgstr ""
 
@@ -72,14 +81,18 @@ msgstr "Ajout cinéma"
 msgid "Add Screen..."
 msgstr "Ajout une salle"
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:272
 msgid "Add file(s)..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/film_editor.cc:270
+#: src/wx/film_editor.cc:274
 msgid "Add folder..."
 msgstr "Ajout dossier..."
 
+#: src/wx/editable_list.h:61
+msgid "Add..."
+msgstr "Ajouter..."
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -100,7 +113,7 @@ msgstr "Langue audio (ex. FR)"
 msgid "Audio Stream"
 msgstr "Flux audio"
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:161
 msgid "Audio channels"
 msgstr "Canaux audios"
 
@@ -113,7 +126,7 @@ msgstr "Mauvais paramètre pour %s (%s)"
 msgid "Bottom crop"
 msgstr "Découpe bas"
 
-#: src/wx/dir_picker_ctrl.cc:38
+#: src/wx/dir_picker_ctrl.cc:37
 msgid "Browse..."
 msgstr "Parcourir..."
 
@@ -137,16 +150,16 @@ msgstr "Annuler"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/content_menu.cc:137
+#: src/wx/content_menu.cc:182
 #, fuzzy
 msgid "Choose a file"
 msgstr "Choisissez un dossier"
 
-#: src/wx/film_editor.cc:737
+#: src/wx/film_editor.cc:767
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
@@ -155,19 +168,19 @@ msgstr "Choisissez un dossier"
 msgid "Colour conversion"
 msgstr "Conversion colorimétrique"
 
-#: src/wx/config_dialog.cc:63
+#: src/wx/config_dialog.cc:65
 msgid "Colour conversions"
 msgstr "Conversions colorimétriques"
 
-#: src/wx/film_editor.cc:133
+#: src/wx/film_editor.cc:132
 msgid "Container"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:138
+#: src/wx/film_editor.cc:137
 msgid "Content Type"
 msgstr "Type de Contenu"
 
@@ -175,7 +188,7 @@ msgstr "Type de Contenu"
 msgid "Content channel"
 msgstr "Contenu audio"
 
-#: src/wx/video_panel.cc:333
+#: src/wx/video_panel.cc:335
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Cadence du contenu %.4f\n"
@@ -184,7 +197,7 @@ msgstr "Cadence du contenu %.4f\n"
 msgid "Content version"
 msgstr "Version du contenu"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:293
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n"
@@ -193,7 +206,7 @@ msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr "Analyse du son impossible"
 
-#: src/wx/film_viewer.cc:336
+#: src/wx/film_viewer.cc:332
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -207,16 +220,16 @@ msgstr "Impossible de créer le DCP : %s"
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:332
 msgid "Creator"
 msgstr "Créateur"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:305
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Découpe de %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:242
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -224,11 +237,11 @@ msgstr "Personnalisé"
 msgid "DCI name"
 msgstr "Nom DCI"
 
-#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:117
+#: src/wx/film_editor.cc:116
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
@@ -245,31 +258,41 @@ msgstr "Préférences DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:141
+#: src/wx/config_dialog.cc:204
 msgid "Default DCI name details"
 msgstr "Détails du nom DCI par défaut"
 
-#: src/wx/config_dialog.cc:154
+#: src/wx/config_dialog.cc:217
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:145
+#: src/wx/config_dialog.cc:226
+#, fuzzy
+msgid "Default audio delay"
+msgstr "Type de contenu par défaut"
+
+#: src/wx/config_dialog.cc:208
 msgid "Default container"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:149
+#: src/wx/config_dialog.cc:212
 msgid "Default content type"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:196
 msgid "Default directory for new films"
 msgstr "Dossier par défaut des nouveaux films"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:188
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
+#: src/wx/config_dialog.cc:61
+#, fuzzy
+msgid "Defaults"
+msgstr "Format par défaut"
+
+#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Détails..."
 
@@ -277,6 +300,10 @@ msgstr "Détails..."
 msgid "Disk space required"
 msgstr "Espace disque requis"
 
+#: src/wx/film_editor.cc:280
+msgid "Down"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
 msgstr "Éditer le cinéma"
@@ -285,8 +312,8 @@ msgstr "Éditer le cinéma"
 msgid "Edit Screen..."
 msgstr "Éditer la salle"
 
-#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174
+#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
 msgid "Edit..."
 msgstr "Éditer..."
 
@@ -295,11 +322,11 @@ msgstr "Éditer..."
 msgid "Encoding Servers"
 msgstr "Serveurs d'encodage"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:63
 msgid "Encoding servers"
 msgstr "Serveurs d'encodage"
 
-#: src/wx/film_editor.cc:154
+#: src/wx/film_editor.cc:157
 msgid "Encrypted"
 msgstr ""
 
@@ -319,11 +346,11 @@ msgstr "Nom du Film"
 msgid "Filters"
 msgstr "Filtres"
 
-#: src/wx/content_menu.cc:49
+#: src/wx/content_menu.cc:52
 msgid "Find missing..."
 msgstr ""
 
-#: src/wx/film_editor.cc:144
+#: src/wx/film_editor.cc:143
 msgid "Frame Rate"
 msgstr "Cadence image"
 
@@ -343,10 +370,14 @@ msgstr "Création de DCP libre et gratuit depuis presque tout."
 msgid "From"
 msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:135
 msgid "From address for KDM emails"
 msgstr ""
 
+#: src/wx/timing_panel.cc:40
+msgid "Full length"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calculateur de gain"
@@ -375,11 +406,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:289
 msgid "IP address"
 msgstr "Adresse IP"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:361
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Adresse IP"
@@ -388,23 +419,27 @@ msgstr "Adresse IP"
 msgid "Input gamma"
 msgstr "Gamma d'entrée"
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:222
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:328
 msgid "Issuer"
 msgstr "Emetteur"
 
-#: src/wx/film_editor.cc:173
+#: src/wx/film_editor.cc:176
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/content_menu.cc:51
+msgid "Join"
+msgstr ""
+
+#: src/wx/config_dialog.cc:71
 msgid "KDM email"
 msgstr "e-mail des KDM"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:290
 msgid "Keep video in sequence"
 msgstr "Garder la vidéo en séquence"
 
@@ -416,10 +451,6 @@ msgstr "L"
 msgid "Left crop"
 msgstr "Découpe gauche"
 
-#: src/wx/timing_panel.cc:40
-msgid "Length"
-msgstr "Longueur / durée"
-
 #: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr "Lfe"
@@ -432,14 +463,24 @@ msgstr "Linéariser la courbe gamma d'entrée pour les bas niveaux"
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
+#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/film_editor.cc:711
+#: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr ""
 
+#: src/wx/config_dialog.cc:127
+#, fuzzy
+msgid "Mail password"
+msgstr "Mot de passe"
+
+#: src/wx/config_dialog.cc:123
+#, fuzzy
+msgid "Mail user name"
+msgstr "Nom d'utilisateur du TMS"
+
 #: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
 msgstr "Générer les KDMs"
@@ -448,7 +489,7 @@ msgstr "Générer les KDMs"
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:65
+#: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr "Métadonnées"
 
@@ -456,16 +497,16 @@ msgstr "Métadonnées"
 msgid "Miscellaneous"
 msgstr "Divers"
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:281
 #, fuzzy
 msgid "Multiple content selected"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/dir_picker_ctrl.cc:52
+#: src/wx/dir_picker_ctrl.cc:51
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
+#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nom"
@@ -478,11 +519,11 @@ msgstr "Nouveau Film"
 msgid "No stretch"
 msgstr "Pas d'étirement"
 
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Aucun"
 
-#: src/wx/config_dialog.cc:116
+#: src/wx/config_dialog.cc:119
 msgid "Outgoing mail server"
 msgstr "Serveurs de messagerie sortante"
 
@@ -494,12 +535,12 @@ msgstr "Gamma de sortie"
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/video_panel.cc:326
+#: src/wx/video_panel.cc:328
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:253
+#: src/wx/config_dialog.cc:301
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -511,10 +552,14 @@ msgstr "Pause"
 msgid "Peak"
 msgstr "Crête"
 
-#: src/wx/film_viewer.cc:64
+#: src/wx/film_viewer.cc:62
 msgid "Play"
 msgstr "Lecture"
 
+#: src/wx/timing_panel.cc:49
+msgid "Play length"
+msgstr ""
+
 #: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
@@ -535,7 +580,8 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Rating (ex. 15)"
 
-#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
+#: src/wx/editable_list.h:65
 msgid "Remove"
 msgstr "Supprimer"
 
@@ -555,11 +601,11 @@ msgstr "Répéter"
 msgid "Repeat Content"
 msgstr "Répéter le contenu"
 
-#: src/wx/content_menu.cc:48
+#: src/wx/content_menu.cc:50
 msgid "Repeat..."
 msgstr "Répéter..."
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:170
 msgid "Resolution"
 msgstr "Résolution"
 
@@ -575,7 +621,7 @@ msgstr "Découpe droite"
 msgid "Rs"
 msgstr "Rs"
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:221
 msgid "SMPTE"
 msgstr ""
 
@@ -583,12 +629,12 @@ msgstr ""
 msgid "Scale to"
 msgstr "Mise à l'échelle"
 
-#: src/wx/video_panel.cc:318
+#: src/wx/video_panel.cc:320
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Mis à l'échelle de %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Scaler"
 msgstr "Mise à l'échelle"
 
@@ -608,7 +654,7 @@ msgstr "Serveur"
 msgid "Set"
 msgstr "Sélection"
 
-#: src/wx/config_dialog.cc:95
+#: src/wx/config_dialog.cc:97
 msgid "Set language"
 msgstr "Selectionnez la langue"
 
@@ -616,6 +662,10 @@ msgstr "Selectionnez la langue"
 msgid "Show Audio..."
 msgstr "Analyser le son..."
 
+#: src/wx/film_editor.cc:153
+msgid "Signed"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Lissage"
@@ -624,7 +674,7 @@ msgstr "Lissage"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:182
+#: src/wx/film_editor.cc:185
 msgid "Standard"
 msgstr "Standard"
 
@@ -652,15 +702,15 @@ msgstr "Flux de sous-titre"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:128
+#: src/wx/about_dialog.cc:131
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:67
+#: src/wx/config_dialog.cc:69
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:245
+#: src/wx/config_dialog.cc:293
 msgid "Target path"
 msgstr "Chemin d'accès"
 
@@ -668,7 +718,7 @@ msgstr "Chemin d'accès"
 msgid "Territory (e.g. UK)"
 msgstr "Territoire (ex. FR)"
 
-#: src/wx/content_menu.cc:178
+#: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -683,7 +733,7 @@ msgstr ""
 msgid "Threads"
 msgstr "Processus"
 
-#: src/wx/config_dialog.cc:112
+#: src/wx/config_dialog.cc:115
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
@@ -695,7 +745,7 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:282
 msgid "Timeline..."
 msgstr "Timeline..."
 
@@ -707,7 +757,7 @@ msgstr ""
 msgid "Top crop"
 msgstr "Découpe haut"
 
-#: src/wx/about_dialog.cc:100
+#: src/wx/about_dialog.cc:101
 msgid "Translated by"
 msgstr "Traduit par"
 
@@ -727,15 +777,19 @@ msgstr "Type"
 msgid "Until"
 msgstr "Jusqu'au"
 
-#: src/wx/film_editor.cc:127
+#: src/wx/film_editor.cc:278
+msgid "Up"
+msgstr ""
+
+#: src/wx/film_editor.cc:126
 msgid "Use DCI name"
 msgstr "Utiliser le nom DCI"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:357
 msgid "Use all servers"
 msgstr ""
 
-#: src/wx/film_editor.cc:148
+#: src/wx/film_editor.cc:147
 msgid "Use best"
 msgstr "Automatique"
 
@@ -743,7 +797,7 @@ msgstr "Automatique"
 msgid "Use preset"
 msgstr "Utiliser le préréglage"
 
-#: src/wx/config_dialog.cc:249
+#: src/wx/config_dialog.cc:297
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
@@ -766,8 +820,8 @@ msgstr "Développé par"
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
-"You have %d files that look like they are VOB files from DVD.  You should "
-"coalesce them to ensure smooth joins between the files."
+"You have %d files that look like they are VOB files from DVD. You should "
+"join them to ensure smooth joins between the files."
 msgstr ""
 
 #: src/wx/hints_dialog.cc:76
@@ -806,11 +860,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:192
 msgid "s"
 msgstr "s"
 
@@ -826,15 +880,15 @@ msgstr ""
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Length"
+#~ msgstr "Longueur / durée"
+
 #~ msgid "Threads to use"
 #~ msgstr "Nombre de processus à utiliser"
 
 #~ msgid "Add"
 #~ msgstr "Ajouter"
 
-#~ msgid "Add..."
-#~ msgstr "Ajouter..."
-
 #~ msgid "Duration"
 #~ msgstr "Durée"
 
@@ -875,9 +929,6 @@ msgstr "vidéo"
 #~ msgid "DVD-o-matic Preferences"
 #~ msgstr "Préférences de DCP-o-matic"
 
-#~ msgid "Default format"
-#~ msgstr "Format par défaut"
-
 #~ msgid "End"
 #~ msgstr "Fin"
 
@@ -929,8 +980,5 @@ msgstr "vidéo"
 #~ msgid "TMS IP address"
 #~ msgstr "Adresse IP du TMS"
 
-#~ msgid "TMS user name"
-#~ msgstr "Nom d'utilisateur du TMS"
-
 #~ msgid "Original Size"
 #~ msgstr "Taille Originale"
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index d14ed4f88..bd7f5f136 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-04-28 10:27+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -23,10 +23,14 @@ msgstr "%"
 
 #: src/wx/about_dialog.cc:78
 msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:131
+msgid "(password will be stored on disk in plaintext)"
+msgstr ""
+
+#: src/wx/config_dialog.cc:108
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
@@ -42,11 +46,11 @@ msgstr "1 canale"
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:215
+#: src/wx/film_editor.cc:218
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "3D"
 msgstr ""
 
@@ -54,7 +58,11 @@ msgstr ""
 msgid "3D left/right"
 msgstr ""
 
-#: src/wx/film_editor.cc:216
+#: src/wx/video_panel.cc:202
+msgid "3D top/bottom"
+msgstr ""
+
+#: src/wx/film_editor.cc:219
 msgid "4K"
 msgstr ""
 
@@ -71,14 +79,18 @@ msgstr ""
 msgid "Add Screen..."
 msgstr ""
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:272
 msgid "Add file(s)..."
 msgstr ""
 
-#: src/wx/film_editor.cc:270
+#: src/wx/film_editor.cc:274
 msgid "Add folder..."
 msgstr ""
 
+#: src/wx/editable_list.h:61
+msgid "Add..."
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -100,7 +112,7 @@ msgstr "Lingua dell'audio (es. EN)"
 msgid "Audio Stream"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:161
 #, fuzzy
 msgid "Audio channels"
 msgstr "canali"
@@ -114,7 +126,7 @@ msgstr "Valore sbagliato per %s (%s)"
 msgid "Bottom crop"
 msgstr "Taglio in basso"
 
-#: src/wx/dir_picker_ctrl.cc:38
+#: src/wx/dir_picker_ctrl.cc:37
 msgid "Browse..."
 msgstr "Sfoglia..."
 
@@ -138,16 +150,16 @@ msgstr "Annulla"
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/content_menu.cc:137
+#: src/wx/content_menu.cc:182
 #, fuzzy
 msgid "Choose a file"
 msgstr "Crea nella cartella"
 
-#: src/wx/film_editor.cc:737
+#: src/wx/film_editor.cc:767
 msgid "Choose a file or files"
 msgstr ""
 
-#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
 #, fuzzy
 msgid "Choose a folder"
 msgstr "Crea nella cartella"
@@ -157,20 +169,20 @@ msgstr "Crea nella cartella"
 msgid "Colour conversion"
 msgstr ""
 
-#: src/wx/config_dialog.cc:63
+#: src/wx/config_dialog.cc:65
 msgid "Colour conversions"
 msgstr ""
 
-#: src/wx/film_editor.cc:133
+#: src/wx/film_editor.cc:132
 #, fuzzy
 msgid "Container"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:138
+#: src/wx/film_editor.cc:137
 msgid "Content Type"
 msgstr "Tipo di contenuto"
 
@@ -179,7 +191,7 @@ msgstr "Tipo di contenuto"
 msgid "Content channel"
 msgstr "1 canale"
 
-#: src/wx/video_panel.cc:333
+#: src/wx/video_panel.cc:335
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr ""
@@ -189,7 +201,7 @@ msgstr ""
 msgid "Content version"
 msgstr "Tipo di contenuto"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:293
 #, fuzzy, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Il video originale è %dx%d (%.2f:1)\n"
@@ -198,7 +210,7 @@ msgstr "Il video originale è %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr ""
 
-#: src/wx/film_viewer.cc:336
+#: src/wx/film_viewer.cc:332
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -212,17 +224,17 @@ msgstr "Non posso creare il DCP: %s"
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:332
 #, fuzzy
 msgid "Creator"
 msgstr "Crea nella cartella"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:305
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Tagliato da %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:242
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr ""
 
@@ -230,11 +242,11 @@ msgstr ""
 msgid "DCI name"
 msgstr "Nome del DCP"
 
-#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:117
+#: src/wx/film_editor.cc:116
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
@@ -251,35 +263,44 @@ msgstr "Preferenze DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:141
+#: src/wx/config_dialog.cc:204
 msgid "Default DCI name details"
 msgstr "Dettagli del nome di default DCI"
 
-#: src/wx/config_dialog.cc:154
+#: src/wx/config_dialog.cc:217
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:145
+#: src/wx/config_dialog.cc:226
+#, fuzzy
+msgid "Default audio delay"
+msgstr "Tipo di contenuto"
+
+#: src/wx/config_dialog.cc:208
 #, fuzzy
 msgid "Default container"
 msgstr "Tipo di contenuto"
 
-#: src/wx/config_dialog.cc:149
+#: src/wx/config_dialog.cc:212
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:196
 msgid "Default directory for new films"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:188
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
+#: src/wx/config_dialog.cc:61
+msgid "Defaults"
+msgstr ""
+
+#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Dettagli"
 
@@ -287,6 +308,10 @@ msgstr "Dettagli"
 msgid "Disk space required"
 msgstr "Spazio su disco rischiesto"
 
+#: src/wx/film_editor.cc:280
+msgid "Down"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 #, fuzzy
 msgid "Edit Cinema..."
@@ -297,8 +322,8 @@ msgstr "Modifica..."
 msgid "Edit Screen..."
 msgstr "Modifica..."
 
-#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174
+#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
 msgid "Edit..."
 msgstr "Modifica..."
 
@@ -307,12 +332,12 @@ msgstr "Modifica..."
 msgid "Encoding Servers"
 msgstr "Servers di codifica"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:63
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Servers di codifica"
 
-#: src/wx/film_editor.cc:154
+#: src/wx/film_editor.cc:157
 msgid "Encrypted"
 msgstr ""
 
@@ -332,11 +357,11 @@ msgstr "Nome del film"
 msgid "Filters"
 msgstr "Filtri"
 
-#: src/wx/content_menu.cc:49
+#: src/wx/content_menu.cc:52
 msgid "Find missing..."
 msgstr ""
 
-#: src/wx/film_editor.cc:144
+#: src/wx/film_editor.cc:143
 #, fuzzy
 msgid "Frame Rate"
 msgstr "Frequenza fotogrammi del DCP"
@@ -357,10 +382,14 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:135
 msgid "From address for KDM emails"
 msgstr ""
 
+#: src/wx/timing_panel.cc:40
+msgid "Full length"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Calcolatore del guadagno audio"
@@ -389,11 +418,11 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:241
+#: src/wx/config_dialog.cc:289
 msgid "IP address"
 msgstr "Indirizzo IP"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:361
 #, fuzzy
 msgid "IP address / host name"
 msgstr "Indirizzo IP"
@@ -402,23 +431,27 @@ msgstr "Indirizzo IP"
 msgid "Input gamma"
 msgstr ""
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:222
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:328
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:173
+#: src/wx/film_editor.cc:176
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/content_menu.cc:51
+msgid "Join"
+msgstr ""
+
+#: src/wx/config_dialog.cc:71
 msgid "KDM email"
 msgstr ""
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:290
 msgid "Keep video in sequence"
 msgstr ""
 
@@ -430,10 +463,6 @@ msgstr ""
 msgid "Left crop"
 msgstr "Taglio a sinistra"
 
-#: src/wx/timing_panel.cc:40
-msgid "Length"
-msgstr "Lunghezza"
-
 #: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr ""
@@ -447,14 +476,24 @@ msgstr ""
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
+#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/film_editor.cc:711
+#: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr ""
 
+#: src/wx/config_dialog.cc:127
+#, fuzzy
+msgid "Mail password"
+msgstr "Password del TMS"
+
+#: src/wx/config_dialog.cc:123
+#, fuzzy
+msgid "Mail user name"
+msgstr "Nome utente del TMS"
+
 #: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
 msgstr ""
@@ -463,7 +502,7 @@ msgstr ""
 msgid "Matrix"
 msgstr ""
 
-#: src/wx/config_dialog.cc:65
+#: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr ""
 
@@ -471,16 +510,16 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:281
 #, fuzzy
 msgid "Multiple content selected"
 msgstr "Tipo di contenuto"
 
-#: src/wx/dir_picker_ctrl.cc:52
+#: src/wx/dir_picker_ctrl.cc:51
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
+#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nome"
@@ -493,11 +532,11 @@ msgstr "Nuovo Film"
 msgid "No stretch"
 msgstr ""
 
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Nessuno"
 
-#: src/wx/config_dialog.cc:116
+#: src/wx/config_dialog.cc:119
 #, fuzzy
 msgid "Outgoing mail server"
 msgstr "Servers di codifica"
@@ -510,12 +549,12 @@ msgstr ""
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/video_panel.cc:326
+#: src/wx/video_panel.cc:328
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:253
+#: src/wx/config_dialog.cc:301
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
@@ -528,10 +567,14 @@ msgstr ""
 msgid "Peak"
 msgstr "Picco"
 
-#: src/wx/film_viewer.cc:64
+#: src/wx/film_viewer.cc:62
 msgid "Play"
 msgstr "Riproduci"
 
+#: src/wx/timing_panel.cc:49
+msgid "Play length"
+msgstr ""
+
 #: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
@@ -552,7 +595,8 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Classificazione (es. 15)"
 
-#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
+#: src/wx/editable_list.h:65
 msgid "Remove"
 msgstr "Rimuovi"
 
@@ -575,11 +619,11 @@ msgstr ""
 msgid "Repeat Content"
 msgstr "Seleziona il file con il contenuto"
 
-#: src/wx/content_menu.cc:48
+#: src/wx/content_menu.cc:50
 msgid "Repeat..."
 msgstr ""
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:170
 msgid "Resolution"
 msgstr ""
 
@@ -596,7 +640,7 @@ msgstr "Taglio a destra"
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:221
 msgid "SMPTE"
 msgstr ""
 
@@ -605,12 +649,12 @@ msgstr ""
 msgid "Scale to"
 msgstr "Scaler"
 
-#: src/wx/video_panel.cc:318
+#: src/wx/video_panel.cc:320
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Scalato a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Scaler"
 msgstr "Scaler"
 
@@ -631,7 +675,7 @@ msgstr "Server"
 msgid "Set"
 msgstr ""
 
-#: src/wx/config_dialog.cc:95
+#: src/wx/config_dialog.cc:97
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
@@ -639,6 +683,10 @@ msgstr "Seleziona la lingua"
 msgid "Show Audio..."
 msgstr "Mostra Audio..."
 
+#: src/wx/film_editor.cc:153
+msgid "Signed"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Levigatura"
@@ -647,7 +695,7 @@ msgstr "Levigatura"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:182
+#: src/wx/film_editor.cc:185
 msgid "Standard"
 msgstr ""
 
@@ -676,16 +724,16 @@ msgstr "Scala dei Sottotitoli"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:128
+#: src/wx/about_dialog.cc:131
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:67
+#: src/wx/config_dialog.cc:69
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:245
+#: src/wx/config_dialog.cc:293
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
@@ -694,7 +742,7 @@ msgstr "Percorso di destinazione del TMS"
 msgid "Territory (e.g. UK)"
 msgstr "Nazione (es. UK)"
 
-#: src/wx/content_menu.cc:178
+#: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -709,7 +757,7 @@ msgstr ""
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/config_dialog.cc:112
+#: src/wx/config_dialog.cc:115
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
@@ -722,7 +770,7 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Tempo"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:282
 msgid "Timeline..."
 msgstr ""
 
@@ -734,7 +782,7 @@ msgstr ""
 msgid "Top crop"
 msgstr "Taglio in alto"
 
-#: src/wx/about_dialog.cc:100
+#: src/wx/about_dialog.cc:101
 msgid "Translated by"
 msgstr ""
 
@@ -756,15 +804,19 @@ msgstr "Tipo"
 msgid "Until"
 msgstr ""
 
-#: src/wx/film_editor.cc:127
+#: src/wx/film_editor.cc:278
+msgid "Up"
+msgstr ""
+
+#: src/wx/film_editor.cc:126
 msgid "Use DCI name"
 msgstr "Usa nome DCI"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:357
 msgid "Use all servers"
 msgstr ""
 
-#: src/wx/film_editor.cc:148
+#: src/wx/film_editor.cc:147
 msgid "Use best"
 msgstr "Usa la migliore"
 
@@ -773,7 +825,7 @@ msgstr "Usa la migliore"
 msgid "Use preset"
 msgstr "Usa la migliore"
 
-#: src/wx/config_dialog.cc:249
+#: src/wx/config_dialog.cc:297
 #, fuzzy
 msgid "User name"
 msgstr "Usa nome DCI"
@@ -797,8 +849,8 @@ msgstr ""
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
-"You have %d files that look like they are VOB files from DVD.  You should "
-"coalesce them to ensure smooth joins between the files."
+"You have %d files that look like they are VOB files from DVD. You should "
+"join them to ensure smooth joins between the files."
 msgstr ""
 
 #: src/wx/hints_dialog.cc:76
@@ -838,11 +890,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:192
 msgid "s"
 msgstr "s"
 
@@ -859,6 +911,9 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Length"
+#~ msgstr "Lunghezza"
+
 #~ msgid "Threads to use"
 #~ msgstr "Threads da usare"
 
@@ -950,8 +1005,5 @@ msgstr "Video"
 #~ msgid "TMS IP address"
 #~ msgstr "Indirizzo IP del TMS"
 
-#~ msgid "TMS user name"
-#~ msgstr "Nome utente del TMS"
-
 #~ msgid "Original Size"
 #~ msgstr "Dimensione Originale"
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 748bb9946..23fed1074 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: 2013-11-26 22:26+0000\n"
+"POT-Creation-Date: 2014-01-05 18:00+0000\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -23,10 +23,14 @@ msgstr "%"
 
 #: src/wx/about_dialog.cc:78
 msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+"(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:105
+#: src/wx/config_dialog.cc:131
+msgid "(password will be stored on disk in plaintext)"
+msgstr ""
+
+#: src/wx/config_dialog.cc:108
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
@@ -42,11 +46,11 @@ msgstr "1 kanal"
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:215
+#: src/wx/film_editor.cc:218
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:163
+#: src/wx/film_editor.cc:166
 msgid "3D"
 msgstr ""
 
@@ -54,7 +58,11 @@ msgstr ""
 msgid "3D left/right"
 msgstr ""
 
-#: src/wx/film_editor.cc:216
+#: src/wx/video_panel.cc:202
+msgid "3D top/bottom"
+msgstr ""
+
+#: src/wx/film_editor.cc:219
 msgid "4K"
 msgstr ""
 
@@ -71,14 +79,18 @@ msgstr ""
 msgid "Add Screen..."
 msgstr ""
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:272
 msgid "Add file(s)..."
 msgstr ""
 
-#: src/wx/film_editor.cc:270
+#: src/wx/film_editor.cc:274
 msgid "Add folder..."
 msgstr ""
 
+#: src/wx/editable_list.h:61
+msgid "Add..."
+msgstr ""
+
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
@@ -100,7 +112,7 @@ msgstr "Audio Språk (ex. SV)"
 msgid "Audio Stream"
 msgstr "Audio Fördröjning"
 
-#: src/wx/film_editor.cc:158
+#: src/wx/film_editor.cc:161
 #, fuzzy
 msgid "Audio channels"
 msgstr "kanaler"
@@ -114,7 +126,7 @@ msgstr "Felaktig inställning för %s (%s)"
 msgid "Bottom crop"
 msgstr "Nedre beskärning"
 
-#: src/wx/dir_picker_ctrl.cc:38
+#: src/wx/dir_picker_ctrl.cc:37
 msgid "Browse..."
 msgstr "Bläddra..."
 
@@ -138,16 +150,16 @@ msgstr "Avbryt"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/content_menu.cc:137
+#: src/wx/content_menu.cc:182
 #, fuzzy
 msgid "Choose a file"
 msgstr "Skapa i katalog"
 
-#: src/wx/film_editor.cc:737
+#: src/wx/film_editor.cc:767
 msgid "Choose a file or files"
 msgstr ""
 
-#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:790
 #, fuzzy
 msgid "Choose a folder"
 msgstr "Skapa i katalog"
@@ -157,20 +169,20 @@ msgstr "Skapa i katalog"
 msgid "Colour conversion"
 msgstr ""
 
-#: src/wx/config_dialog.cc:63
+#: src/wx/config_dialog.cc:65
 msgid "Colour conversions"
 msgstr ""
 
-#: src/wx/film_editor.cc:133
+#: src/wx/film_editor.cc:132
 #, fuzzy
 msgid "Container"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:85
 msgid "Content"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:138
+#: src/wx/film_editor.cc:137
 msgid "Content Type"
 msgstr "Innehållstyp"
 
@@ -179,7 +191,7 @@ msgstr "Innehållstyp"
 msgid "Content channel"
 msgstr "1 kanal"
 
-#: src/wx/video_panel.cc:333
+#: src/wx/video_panel.cc:335
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr ""
@@ -189,7 +201,7 @@ msgstr ""
 msgid "Content version"
 msgstr "Innehållstyp"
 
-#: src/wx/video_panel.cc:291
+#: src/wx/video_panel.cc:293
 #, fuzzy, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Original-videon är %dx%d (%.2f:1)\n"
@@ -198,7 +210,7 @@ msgstr "Original-videon är %dx%d (%.2f:1)\n"
 msgid "Could not analyse audio."
 msgstr ""
 
-#: src/wx/film_viewer.cc:336
+#: src/wx/film_viewer.cc:332
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -212,17 +224,17 @@ msgstr "Kunde inte skapa DCP: %s"
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
-#: src/wx/config_dialog.cc:284
+#: src/wx/config_dialog.cc:332
 #, fuzzy
 msgid "Creator"
 msgstr "Skapa i katalog"
 
-#: src/wx/video_panel.cc:303
+#: src/wx/video_panel.cc:305
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beskuren till %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:242
+#: src/wx/video_panel.cc:244
 msgid "Custom"
 msgstr ""
 
@@ -230,11 +242,11 @@ msgstr ""
 msgid "DCI name"
 msgstr "DCI namn"
 
-#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
+#: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:117
+#: src/wx/film_editor.cc:116
 msgid "DCP Name"
 msgstr "DCP Namn"
 
@@ -251,35 +263,44 @@ msgstr "DCP-o-matic Inställningar"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:141
+#: src/wx/config_dialog.cc:204
 msgid "Default DCI name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:154
+#: src/wx/config_dialog.cc:217
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/config_dialog.cc:145
+#: src/wx/config_dialog.cc:226
+#, fuzzy
+msgid "Default audio delay"
+msgstr "Innehållstyp"
+
+#: src/wx/config_dialog.cc:208
 #, fuzzy
 msgid "Default container"
 msgstr "Innehållstyp"
 
-#: src/wx/config_dialog.cc:149
+#: src/wx/config_dialog.cc:212
 #, fuzzy
 msgid "Default content type"
 msgstr "Innehållstyp"
 
-#: src/wx/config_dialog.cc:133
+#: src/wx/config_dialog.cc:196
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:125
+#: src/wx/config_dialog.cc:188
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
+#: src/wx/config_dialog.cc:61
+msgid "Defaults"
+msgstr ""
+
+#: src/wx/film_editor.cc:128 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detaljer..."
 
@@ -287,6 +308,10 @@ msgstr "Detaljer..."
 msgid "Disk space required"
 msgstr "Diskutrymme som krävs"
 
+#: src/wx/film_editor.cc:280
+msgid "Down"
+msgstr ""
+
 #: src/wx/kdm_dialog.cc:68
 #, fuzzy
 msgid "Edit Cinema..."
@@ -297,8 +322,8 @@ msgstr "Redigera..."
 msgid "Edit Screen..."
 msgstr "Redigera..."
 
-#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
-#: src/wx/video_panel.cc:174
+#: src/wx/config_dialog.cc:205 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174 src/wx/editable_list.h:63
 msgid "Edit..."
 msgstr "Redigera..."
 
@@ -307,12 +332,12 @@ msgstr "Redigera..."
 msgid "Encoding Servers"
 msgstr "Kodningsservrar"
 
-#: src/wx/config_dialog.cc:61
+#: src/wx/config_dialog.cc:63
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Kodningsservrar"
 
-#: src/wx/film_editor.cc:154
+#: src/wx/film_editor.cc:157
 msgid "Encrypted"
 msgstr ""
 
@@ -332,11 +357,11 @@ msgstr "film namn"
 msgid "Filters"
 msgstr "Filter"
 
-#: src/wx/content_menu.cc:49
+#: src/wx/content_menu.cc:52
 msgid "Find missing..."
 msgstr ""
 
-#: src/wx/film_editor.cc:144
+#: src/wx/film_editor.cc:143
 #, fuzzy
 msgid "Frame Rate"
 msgstr "DCP bildhastighet"
@@ -357,10 +382,14 @@ msgstr ""
 msgid "From"
 msgstr ""
 
-#: src/wx/config_dialog.cc:120
+#: src/wx/config_dialog.cc:135
 msgid "From address for KDM emails"
 msgstr ""
 
+#: src/wx/timing_panel.cc:40
+msgid "Full length"
+msgstr ""
+
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
 msgstr "Volym Kalkylator"
@@ -389,11 +418,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:241
+#: src/wx/config_dialog.cc:289
 msgid "IP address"
 msgstr "IP-adress"
 
-#: src/wx/config_dialog.cc:313
+#: src/wx/config_dialog.cc:361
 #, fuzzy
 msgid "IP address / host name"
 msgstr "IP-adress"
@@ -402,23 +431,27 @@ msgstr "IP-adress"
 msgid "Input gamma"
 msgstr ""
 
-#: src/wx/film_editor.cc:219
+#: src/wx/film_editor.cc:222
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:280
+#: src/wx/config_dialog.cc:328
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:173
+#: src/wx/film_editor.cc:176
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/config_dialog.cc:69
+#: src/wx/content_menu.cc:51
+msgid "Join"
+msgstr ""
+
+#: src/wx/config_dialog.cc:71
 msgid "KDM email"
 msgstr ""
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:290
 msgid "Keep video in sequence"
 msgstr ""
 
@@ -430,10 +463,6 @@ msgstr ""
 msgid "Left crop"
 msgstr "Vänster beskärning"
 
-#: src/wx/timing_panel.cc:40
-msgid "Length"
-msgstr "Längd"
-
 #: src/wx/audio_mapping_view.cc:195
 msgid "Lfe"
 msgstr ""
@@ -447,14 +476,24 @@ msgstr ""
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
+#: src/wx/config_dialog.cc:221 src/wx/film_editor.cc:180
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/film_editor.cc:711
+#: src/wx/film_editor.cc:741
 msgid "MISSING: "
 msgstr ""
 
+#: src/wx/config_dialog.cc:127
+#, fuzzy
+msgid "Mail password"
+msgstr "TMS lösenord"
+
+#: src/wx/config_dialog.cc:123
+#, fuzzy
+msgid "Mail user name"
+msgstr "TMS användarnamn"
+
 #: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
 msgstr ""
@@ -463,7 +502,7 @@ msgstr ""
 msgid "Matrix"
 msgstr ""
 
-#: src/wx/config_dialog.cc:65
+#: src/wx/config_dialog.cc:67
 msgid "Metadata"
 msgstr ""
 
@@ -471,16 +510,16 @@ msgstr ""
 msgid "Miscellaneous"
 msgstr ""
 
-#: src/wx/video_panel.cc:279
+#: src/wx/video_panel.cc:281
 #, fuzzy
 msgid "Multiple content selected"
 msgstr "Innehållstyp"
 
-#: src/wx/dir_picker_ctrl.cc:52
+#: src/wx/dir_picker_ctrl.cc:51
 msgid "My Documents"
 msgstr "Mina Dokument"
 
-#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
+#: src/wx/config_dialog.cc:527 src/wx/film_editor.cc:111
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Namn"
@@ -493,11 +532,11 @@ msgstr "Ny Film"
 msgid "No stretch"
 msgstr ""
 
-#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:249
 msgid "None"
 msgstr "Inget"
 
-#: src/wx/config_dialog.cc:116
+#: src/wx/config_dialog.cc:119
 #, fuzzy
 msgid "Outgoing mail server"
 msgstr "Kodningsservrar"
@@ -510,12 +549,12 @@ msgstr ""
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/video_panel.cc:326
+#: src/wx/video_panel.cc:328
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
 
-#: src/wx/config_dialog.cc:253
+#: src/wx/config_dialog.cc:301
 #, fuzzy
 msgid "Password"
 msgstr "TMS lösenord"
@@ -528,10 +567,14 @@ msgstr ""
 msgid "Peak"
 msgstr "Topp"
 
-#: src/wx/film_viewer.cc:64
+#: src/wx/film_viewer.cc:62
 msgid "Play"
 msgstr "Spela"
 
+#: src/wx/timing_panel.cc:49
+msgid "Play length"
+msgstr ""
+
 #: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
@@ -552,7 +595,8 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Klassificering (ex. 15)"
 
-#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:276
+#: src/wx/editable_list.h:65
 msgid "Remove"
 msgstr "Ta bort"
 
@@ -575,11 +619,11 @@ msgstr ""
 msgid "Repeat Content"
 msgstr "Välj innehållsfil"
 
-#: src/wx/content_menu.cc:48
+#: src/wx/content_menu.cc:50
 msgid "Repeat..."
 msgstr ""
 
-#: src/wx/film_editor.cc:167
+#: src/wx/film_editor.cc:170
 msgid "Resolution"
 msgstr ""
 
@@ -596,7 +640,7 @@ msgstr "Höger beskärning"
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:218
+#: src/wx/film_editor.cc:221
 msgid "SMPTE"
 msgstr ""
 
@@ -605,12 +649,12 @@ msgstr ""
 msgid "Scale to"
 msgstr "Omskalare"
 
-#: src/wx/video_panel.cc:318
+#: src/wx/video_panel.cc:320
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skalad till %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:187
+#: src/wx/film_editor.cc:190
 msgid "Scaler"
 msgstr "Omskalare"
 
@@ -631,7 +675,7 @@ msgstr "Server"
 msgid "Set"
 msgstr ""
 
-#: src/wx/config_dialog.cc:95
+#: src/wx/config_dialog.cc:97
 msgid "Set language"
 msgstr "Välj språk"
 
@@ -639,6 +683,10 @@ msgstr "Välj språk"
 msgid "Show Audio..."
 msgstr "Visa Audio..."
 
+#: src/wx/film_editor.cc:153
+msgid "Signed"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
 msgstr "Utjämning"
@@ -647,7 +695,7 @@ msgstr "Utjämning"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:182
+#: src/wx/film_editor.cc:185
 msgid "Standard"
 msgstr ""
 
@@ -676,16 +724,16 @@ msgstr "Undertext Skalning"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:128
+#: src/wx/about_dialog.cc:131
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:67
+#: src/wx/config_dialog.cc:69
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:245
+#: src/wx/config_dialog.cc:293
 #, fuzzy
 msgid "Target path"
 msgstr "TMS målsökväg"
@@ -694,7 +742,7 @@ msgstr "TMS målsökväg"
 msgid "Territory (e.g. UK)"
 msgstr "Område (ex. SV)"
 
-#: src/wx/content_menu.cc:178
+#: src/wx/content_menu.cc:223
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
@@ -709,7 +757,7 @@ msgstr ""
 msgid "Threads"
 msgstr "Trådar"
 
-#: src/wx/config_dialog.cc:112
+#: src/wx/config_dialog.cc:115
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
@@ -722,7 +770,7 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tid"
 
-#: src/wx/film_editor.cc:278
+#: src/wx/film_editor.cc:282
 msgid "Timeline..."
 msgstr ""
 
@@ -734,7 +782,7 @@ msgstr ""
 msgid "Top crop"
 msgstr "Övre beskärning"
 
-#: src/wx/about_dialog.cc:100
+#: src/wx/about_dialog.cc:101
 msgid "Translated by"
 msgstr ""
 
@@ -756,15 +804,19 @@ msgstr "Typ"
 msgid "Until"
 msgstr ""
 
-#: src/wx/film_editor.cc:127
+#: src/wx/film_editor.cc:278
+msgid "Up"
+msgstr ""
+
+#: src/wx/film_editor.cc:126
 msgid "Use DCI name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/config_dialog.cc:309
+#: src/wx/config_dialog.cc:357
 msgid "Use all servers"
 msgstr ""
 
-#: src/wx/film_editor.cc:148
+#: src/wx/film_editor.cc:147
 msgid "Use best"
 msgstr "Använd bästa"
 
@@ -773,7 +825,7 @@ msgstr "Använd bästa"
 msgid "Use preset"
 msgstr "Använd bästa"
 
-#: src/wx/config_dialog.cc:249
+#: src/wx/config_dialog.cc:297
 #, fuzzy
 msgid "User name"
 msgstr "Använd DCI-namnet"
@@ -797,8 +849,8 @@ msgstr ""
 #: src/wx/hints_dialog.cc:90
 #, c-format
 msgid ""
-"You have %d files that look like they are VOB files from DVD.  You should "
-"coalesce them to ensure smooth joins between the files."
+"You have %d files that look like they are VOB files from DVD. You should "
+"join them to ensure smooth joins between the files."
 msgstr ""
 
 #: src/wx/hints_dialog.cc:76
@@ -838,11 +890,11 @@ msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:78
+#: src/wx/audio_panel.cc:78 src/wx/config_dialog.cc:230
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:129
+#: src/wx/config_dialog.cc:192
 msgid "s"
 msgstr "s"
 
@@ -859,6 +911,9 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Length"
+#~ msgstr "Längd"
+
 #~ msgid "Threads to use"
 #~ msgstr "Antal trådar att använda"
 
@@ -945,8 +1000,5 @@ msgstr "Video"
 #~ msgid "TMS IP address"
 #~ msgstr "TMS IP-adress"
 
-#~ msgid "TMS user name"
-#~ msgstr "TMS användarnamn"
-
 #~ msgid "Original Size"
 #~ msgstr "Ursprunglig Storlek"
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index a777b3e88..b439d13c4 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -335,7 +335,7 @@ VideoPanel::setup_description ()
 	d << wxString::Format (_("Content frame rate %.4f\n"), vcs->video_frame_rate ());
 	++lines;
 	FrameRateChange frc (vcs->video_frame_rate(), _editor->film()->video_frame_rate ());
-	d << frc.description << "\n";
+	d << std_to_wx (frc.description) << "\n";
 	++lines;
 
 	for (int i = lines; i < 6; ++i) {
diff --git a/src/wx/wscript b/src/wx/wscript
index 34047f3ac..dc8a07b99 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -82,7 +82,7 @@ def build(bld):
     i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'wx'), sources, 'libdcpomatic-wx')
+    i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h", 'libdcpomatic-wx')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')