Merge master.

13 files changed, 810 insertions, 364 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 ())) {