Merge master.

29 files changed, 1503 insertions, 970 deletions

diff --git a/src/lib/audio_analysis.cc b/src/lib/audio_analysis.cc
index bc59bccca..1488f89fc 100644
--- a/src/lib/audio_analysis.cc
+++ b/src/lib/audio_analysis.cc
@@ -20,15 +20,14 @@
 #include <stdint.h>
 #include <cmath>
 #include <cassert>
-#include <fstream>
+#include <cstdio>
 #include <boost/filesystem.hpp>
 #include "audio_analysis.h"
+#include "cross.h"
 
 using std::ostream;
 using std::istream;
 using std::string;
-using std::ofstream;
-using std::ifstream;
 using std::vector;
 using std::cout;
 using std::max;
@@ -41,10 +40,10 @@ AudioPoint::AudioPoint ()
 	}
 }
 
-AudioPoint::AudioPoint (istream& s)
+AudioPoint::AudioPoint (FILE* f)
 {
 	for (int i = 0; i < COUNT; ++i) {
-		s >> _data[i];
+		fscanf (f, "%f", &_data[i]);
 	}
 }
 
@@ -70,10 +69,10 @@ AudioPoint::operator= (AudioPoint const & other)
 }
 
 void
-AudioPoint::write (ostream& s) const
+AudioPoint::write (FILE* f) const
 {
 	for (int i = 0; i < COUNT; ++i) {
-		s << _data[i] << "\n";
+		fprintf (f, "%f\n", _data[i]);
 	}
 }
 	
@@ -85,15 +84,15 @@ AudioAnalysis::AudioAnalysis (int channels)
 
 AudioAnalysis::AudioAnalysis (boost::filesystem::path filename)
 {
-	ifstream f (filename.string().c_str ());
+	FILE* f = fopen_boost (filename, "r");
 
 	int channels;
-	f >> channels;
+	fscanf (f, "%d", &channels);
 	_data.resize (channels);
 
 	for (int i = 0; i < channels; ++i) {
 		int points;
-		f >> points;
+		fscanf (f, "%d", &points);
 		for (int j = 0; j < points; ++j) {
 			_data[i].push_back (AudioPoint (f));
 		}
@@ -130,17 +129,19 @@ AudioAnalysis::points (int c) const
 void
 AudioAnalysis::write (boost::filesystem::path filename)
 {
-	string tmp = filename.string() + ".tmp";
+	boost::filesystem::path tmp = filename;
+	tmp.replace_extension (".tmp");
 
-	ofstream f (tmp.c_str ());
-	f << _data.size() << "\n";
+	FILE* f = fopen_boost (tmp, "w");
+
+	fprintf (f, "%ld\n", _data.size ());
 	for (vector<vector<AudioPoint> >::iterator i = _data.begin(); i != _data.end(); ++i) {
-		f << i->size () << "\n";
+		fprintf (f, "%ld\n", i->size ());
 		for (vector<AudioPoint>::iterator j = i->begin(); j != i->end(); ++j) {
 			j->write (f);
 		}
 	}
 
-	f.close ();
+	fclose (f);
 	boost::filesystem::rename (tmp, filename);
 }
diff --git a/src/lib/audio_analysis.h b/src/lib/audio_analysis.h
index cfc170c84..824472dda 100644
--- a/src/lib/audio_analysis.h
+++ b/src/lib/audio_analysis.h
@@ -20,7 +20,6 @@
 #ifndef DCPOMATIC_AUDIO_ANALYSIS_H
 #define DCPOMATIC_AUDIO_ANALYSIS_H
 
-#include <iostream>
 #include <vector>
 #include <list>
 #include <boost/filesystem.hpp>
@@ -35,11 +34,11 @@ public:
 	};
 
 	AudioPoint ();
-	AudioPoint (std::istream &);
+	AudioPoint (FILE *);
 	AudioPoint (AudioPoint const &);
 	AudioPoint& operator= (AudioPoint const &);
 
-	void write (std::ostream &) const;
+	void write (FILE *) const;
 	
 	float& operator[] (int t) {
 		return _data[t];
diff --git a/src/lib/config.cc b/src/lib/config.cc
index 4b6455f51..54b9168f2 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -41,7 +41,6 @@
 using std::vector;
 using std::ifstream;
 using std::string;
-using std::ofstream;
 using std::list;
 using std::max;
 using std::exception;
@@ -182,6 +181,7 @@ Config::read ()
 void
 Config::read_old_metadata ()
 {
+	/* XXX: this won't work with non-Latin filenames */
 	ifstream f (file(true).string().c_str ());
 	string line;
 
diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index 41051ee2e..7436dbf26 100644
--- a/src/lib/cross.cc
+++ b/src/lib/cross.cc
@@ -70,6 +70,9 @@ cpu_info ()
 	string info;
 	
 #ifdef DCPOMATIC_LINUX
+	/* This use of ifstream is ok; the filename can never
+	   be non-Latin
+	*/
 	ifstream f ("/proc/cpuinfo");
 	while (f.good ()) {
 		string l;
@@ -269,3 +272,19 @@ openssl_path ()
 #endif
 
 }
+
+/* Apparently there is no way to create an ofstream using a UTF-8
+   filename under Windows.  We are hence reduced to using fopen
+   with this wrapper.
+*/
+FILE *
+fopen_boost (boost::filesystem::path p, string t)
+{
+#ifdef DCPOMATIC_WINDOWS
+        wstring w (t.begin(), t.end());
+	/* c_str() here should give a UTF-16 string */
+        return _wfopen (p.c_str(), w.c_str ());
+#else
+        return fopen (p.c_str(), t.c_str ());
+#endif
+}
diff --git a/src/lib/cross.h b/src/lib/cross.h
index 1fe34edbe..931e7d890 100644
--- a/src/lib/cross.h
+++ b/src/lib/cross.h
@@ -33,3 +33,4 @@ extern boost::filesystem::path openssl_path ();
 #ifdef DCPOMATIC_OSX
 extern boost::filesystem::path app_contents ();
 #endif
+extern FILE * fopen_boost (boost::filesystem::path, std::string);
diff --git a/src/lib/dcp_video_frame.cc b/src/lib/dcp_video_frame.cc
index 25abd6f0d..679a0490e 100644
--- a/src/lib/dcp_video_frame.cc
+++ b/src/lib/dcp_video_frame.cc
@@ -59,12 +59,12 @@
 #include "scaler.h"
 #include "image.h"
 #include "log.h"
+#include "cross.h"
 
 #include "i18n.h"
 
 using std::string;
 using std::stringstream;
-using std::ofstream;
 using std::cout;
 using boost::shared_ptr;
 using boost::lexical_cast;
@@ -379,8 +379,9 @@ void
 EncodedData::write_info (shared_ptr<const Film> film, int frame, Eyes eyes, libdcp::FrameInfo fin) const
 {
 	boost::filesystem::path const info = film->info_path (frame, eyes);
-	ofstream h (info.string().c_str());
+	FILE* h = fopen_boost (info, "w");
 	fin.write (h);
+	fclose (h);
 }
 
 /** Send this data to a socket.
diff --git a/src/lib/film.cc b/src/lib/film.cc
index d53d61a63..71836f254 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -64,8 +64,6 @@ using std::multimap;
 using std::pair;
 using std::map;
 using std::vector;
-using std::ifstream;
-using std::ofstream;
 using std::setfill;
 using std::min;
 using std::make_pair;
diff --git a/src/lib/log.cc b/src/lib/log.cc
index 86de21bdd..9ddf460d4 100644
--- a/src/lib/log.cc
+++ b/src/lib/log.cc
@@ -21,9 +21,10 @@
  *  @brief A very simple logging class.
  */
 
-#include <fstream>
 #include <time.h>
+#include <cstdio>
 #include "log.h"
+#include "cross.h"
 
 #include "i18n.h"
 
@@ -102,7 +103,8 @@ FileLog::FileLog (boost::filesystem::path file)
 void
 FileLog::do_log (string m)
 {
-	ofstream f (_file.string().c_str(), fstream::app);
-	f << m << N_("\n");
+	FILE* f = fopen_boost (_file, "a");
+	fprintf (f, "%s\n", m.c_str ());
+	fclose (f);
 }
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 198f7fb4d..e19f99ac1 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-10-16 09:45+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+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"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: src/lib/sndfile_content.cc:59
+#: src/lib/sndfile_content.cc:60
 msgid "%1 [audio]"
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 msgid "%1 [still]"
 msgstr "imagen fija"
 
-#: src/lib/sndfile_content.cc:80
+#: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
@@ -43,7 +43,7 @@ msgstr ""
 msgid "%1 frames; %2 frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:142
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/job.cc:75
+#: src/lib/job.cc:74
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
@@ -104,7 +104,7 @@ msgstr "Bicúbico"
 msgid "Bilinear"
 msgstr "Bilineal"
 
-#: src/lib/job.cc:350
+#: src/lib/job.cc:316
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -112,11 +112,27 @@ 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:752
+#: src/lib/util.cc:803
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/util.cc:775
+#: src/lib/writer.cc:73
+msgid "Checking existing image data"
+msgstr ""
+
+#: src/lib/writer.cc:398
+msgid "Computing audio digest"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:84
+msgid "Computing digest"
+msgstr ""
+
+#: src/lib/writer.cc:395
+msgid "Computing image digest"
+msgstr ""
+
+#: src/lib/util.cc:833
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
@@ -133,12 +149,7 @@ msgstr "No se pudo conectar al servidor %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/film.cc:929
-#, fuzzy
-msgid "Could not find DCP to make KDM for"
-msgstr "no se encontró el decodificador de audio"
-
-#: src/lib/job.cc:95
+#: src/lib/job.cc:94
 #, fuzzy
 msgid "Could not open %1"
 msgstr "no se pudo abrir el fichero para lectura"
@@ -147,7 +158,7 @@ msgstr "no se pudo abrir el fichero para lectura"
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
-#: src/lib/film.cc:939
+#: src/lib/film.cc:943
 msgid "Could not read DCP to make KDM for"
 msgstr "No se pudo leer el DCP para hacer el KDM"
 
@@ -163,17 +174,17 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:845
 #, 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:778
+#: src/lib/util.cc:836
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
 
-#: src/lib/job.cc:96
+#: src/lib/job.cc:95
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -197,15 +208,25 @@ msgid "Deringing filter"
 msgstr "Deringing filter"
 
 #: src/lib/dolby_cp750.cc:27
-msgid "Dolby CP750"
+#, fuzzy
+msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:838
 #, 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/job.cc:348
+#: src/lib/util.cc:840
+#, 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/writer.cc:109
+msgid "Encoding image data"
+msgstr ""
+
+#: src/lib/job.cc:314
 msgid "Error (%1)"
 msgstr "Error (%1)"
 
@@ -213,6 +234,11 @@ 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"
@@ -273,7 +299,7 @@ msgstr "Horizontal deblocking filter"
 msgid "Horizontal deblocking filter A"
 msgstr "Horizontal deblocking filter A"
 
-#: src/lib/job.cc:109 src/lib/job.cc:118
+#: src/lib/job.cc:108 src/lib/job.cc:117
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -289,15 +315,15 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:750
+#: src/lib/util.cc:801
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:754
+#: src/lib/util.cc:805
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:753
+#: src/lib/util.cc:804
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -318,10 +344,6 @@ msgstr "Median deinterlacer"
 msgid "Misc"
 msgstr "Miscelánea"
 
-#: src/lib/film.cc:931
-msgid "More than one possible DCP to make KDM for"
-msgstr "Más de un DCP posible para crear el KDM"
-
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
@@ -331,7 +353,7 @@ msgstr "Motion compensating deinterlacer"
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:346
+#: src/lib/job.cc:312
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
@@ -351,16 +373,16 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/config.cc:74 src/lib/config.cc:143
+#: src/lib/config.cc:80 src/lib/config.cc:163
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:751
+#: src/lib/util.cc:802
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:755
+#: src/lib/util.cc:806
 msgid "Right surround"
 msgstr "Surround derecha"
 
@@ -400,7 +422,7 @@ msgstr "Temporal noise reducer"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:81
+#: src/lib/job.cc:80
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -408,7 +430,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:366
+#: src/lib/film.cc:370
 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 "
@@ -430,7 +452,7 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:117
+#: src/lib/job.cc:116
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -442,7 +464,7 @@ msgstr "Formato de audio desconocido (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Máscara de desenfoque Gaussiano"
 
-#: src/lib/colour_conversion.cc:141
+#: src/lib/colour_conversion.cc:145
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -466,15 +488,15 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:275
 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:232
+#: src/lib/film.cc:236
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:552
+#: src/lib/util.cc:583
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -482,12 +504,12 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:267
+#: src/lib/film.cc:271
 #, fuzzy
 msgid "container"
 msgstr "contenido"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:279
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -500,19 +522,19 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/ffmpeg.cc:128
+#: src/lib/ffmpeg.cc:139
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
 
-#: src/lib/ffmpeg.cc:76
+#: src/lib/ffmpeg.cc:87
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg_decoder.cc:521
+#: src/lib/ffmpeg_decoder.cc:522
 msgid "could not find subtitle decoder"
 msgstr "no se pudo encontrar decodificador de subtítutlos"
 
-#: src/lib/ffmpeg.cc:107
+#: src/lib/ffmpeg.cc:118
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
@@ -540,10 +562,15 @@ msgstr "no se encontró el decodificador de audio"
 msgid "could not read from file %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
+#: src/lib/resampler.cc:102
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
+#: src/lib/resampler.cc:83
+#, fuzzy
+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
 msgid "could not start SCP session (%1)"
 msgstr "no se pudo abrir la sesión SCP (%1)"
@@ -562,14 +589,10 @@ 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"
 
-#: src/lib/transcode_job.cc:95
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/transcode_job.cc:98
-msgid "hashing"
-msgstr "firmando"
-
 #: src/lib/util.cc:145
 msgid "hour"
 msgstr "hora"
@@ -586,7 +609,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:673
+#: src/lib/util.cc:724
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -594,15 +617,15 @@ 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:553
+#: src/lib/ffmpeg_decoder.cc:554
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:232 src/lib/film.cc:279
+#: src/lib/film.cc:236 src/lib/film.cc:283
 msgid "name"
 msgstr "nombre"
 
-#: src/lib/ffmpeg_decoder.cc:568
+#: src/lib/ffmpeg_decoder.cc:569
 msgid "non-bitmap subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
@@ -613,15 +636,15 @@ msgstr ""
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:343
+#: src/lib/job.cc:309
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/config.cc:72 src/lib/video_content.cc:109
+#: src/lib/config.cc:78 src/lib/video_content.cc:111
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:73
+#: src/lib/config.cc:79
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
@@ -634,6 +657,16 @@ 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"
 
 #, fuzzy
+#~ msgid "Could not find DCP to make KDM for"
+#~ msgstr "no se encontró el decodificador de audio"
+
+#~ msgid "More than one possible DCP to make KDM for"
+#~ msgstr "Más de un DCP posible para crear el KDM"
+
+#~ msgid "hashing"
+#~ msgstr "firmando"
+
+#, fuzzy
 #~ msgid "Sound file: %1"
 #~ msgstr "no se pudo abrir el fichero para lectura"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 6023f6377..ff7e1f94e 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,33 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 09:45+0100\n"
-"PO-Revision-Date: 2013-07-16 23:11+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
+"PO-Revision-Date: 2013-11-25 19:37+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/lib/sndfile_content.cc:59
+#: src/lib/sndfile_content.cc:60
 msgid "%1 [audio]"
-msgstr ""
+msgstr "%1 [audio]"
 
 #: src/lib/ffmpeg_content.cc:170
 msgid "%1 [movie]"
-msgstr ""
+msgstr "%1 [vidéo]"
 
 #: src/lib/moving_image_content.cc:58
 msgid "%1 [moving images]"
-msgstr ""
+msgstr "%1 [diaporama]"
 
 #: src/lib/still_image_content.cc:52
-#, fuzzy
 msgid "%1 [still]"
-msgstr "fixe"
+msgstr "%1 [fixe]"
 
-#: src/lib/sndfile_content.cc:80
+#: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr "%1 canaux, %2kHz, %3 samples"
 
@@ -41,7 +41,7 @@ msgstr "%1 canaux, %2kHz, %3 samples"
 msgid "%1 frames; %2 frames per second"
 msgstr "%1 images ; %2 images par seconde"
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:142
 msgid "%1x%2 pixels (%3:1)"
 msgstr "%1x%2 pixels (%3:1)"
 
@@ -81,7 +81,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Advertisement"
 
-#: src/lib/job.cc:75
+#: src/lib/job.cc:74
 msgid "An error occurred whilst handling the file %1."
 msgstr "Une erreur s'est produite lors du traitement du fichier %1."
 
@@ -102,7 +102,7 @@ msgstr "Bicubique"
 msgid "Bilinear"
 msgstr "Bilinéaire"
 
-#: src/lib/job.cc:350
+#: src/lib/job.cc:316
 msgid "Cancelled"
 msgstr "Annulé"
 
@@ -110,11 +110,27 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:752
+#: src/lib/util.cc:803
 msgid "Centre"
 msgstr "Centre"
 
-#: src/lib/util.cc:775
+#: src/lib/writer.cc:73
+msgid "Checking existing image data"
+msgstr ""
+
+#: src/lib/writer.cc:398
+msgid "Computing audio digest"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:84
+msgid "Computing digest"
+msgstr ""
+
+#: src/lib/writer.cc:395
+msgid "Computing image digest"
+msgstr ""
+
+#: src/lib/util.cc:833
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "Le DCP et la source ont les mêmes cadences.\n"
@@ -131,23 +147,17 @@ msgstr "Connexion au serveur %1 (%2) impossible"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
-#: src/lib/film.cc:929
-#, fuzzy
-msgid "Could not find DCP to make KDM for"
-msgstr "décodeur audio introuvable"
-
-#: src/lib/job.cc:95
-#, fuzzy
+#: src/lib/job.cc:94
 msgid "Could not open %1"
-msgstr "lecture du fichier (%1) impossible"
+msgstr "lecture du fichier %1 impossible"
 
 #: src/lib/scp_dcp_job.cc:175
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
-#: src/lib/film.cc:939
+#: src/lib/film.cc:943
 msgid "Could not read DCP to make KDM for"
-msgstr ""
+msgstr "DCP illisible pour fabrication de KDM"
 
 #: src/lib/scp_dcp_job.cc:145
 msgid "Could not start SCP session (%1)"
@@ -161,21 +171,21 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Désentrelacement cubique interpolé"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:845
 #, 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:778
+#: src/lib/util.cc:836
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
-#: src/lib/job.cc:96
+#: src/lib/job.cc:95
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
-msgstr ""
+msgstr "DCP-o-matic ne peut pas ouvrir le fichier %1"
 
 #: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
 #: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
@@ -193,15 +203,25 @@ msgid "Deringing filter"
 msgstr "Filtre anti bourdonnement"
 
 #: src/lib/dolby_cp750.cc:27
-msgid "Dolby CP750"
+#, fuzzy
+msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:838
 #, 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/job.cc:348
+#: src/lib/util.cc:840
+#, 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/writer.cc:109
+msgid "Encoding image data"
+msgstr ""
+
+#: src/lib/job.cc:314
 msgid "Error (%1)"
 msgstr "Erreur (%1)"
 
@@ -209,6 +229,11 @@ 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"
@@ -269,7 +294,7 @@ msgstr "Filtre dé-bloc horizontal"
 msgid "Horizontal deblocking filter A"
 msgstr "Filtre dé-bloc horizontal"
 
-#: src/lib/job.cc:109 src/lib/job.cc:118
+#: src/lib/job.cc:108 src/lib/job.cc:117
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -285,15 +310,15 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:750
+#: src/lib/util.cc:801
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:754
+#: src/lib/util.cc:805
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:753
+#: src/lib/util.cc:804
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -314,10 +339,6 @@ msgstr "Désentrelaceur médian"
 msgid "Misc"
 msgstr "Divers"
 
-#: src/lib/film.cc:931
-msgid "More than one possible DCP to make KDM for"
-msgstr ""
-
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
@@ -327,7 +348,7 @@ msgstr "Désentrelaceur par compensation de mouvement"
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
 
-#: src/lib/job.cc:346
+#: src/lib/job.cc:312
 msgid "OK (ran for %1)"
 msgstr "OK (processus %1)"
 
@@ -347,16 +368,15 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/config.cc:74 src/lib/config.cc:143
-#, fuzzy
+#: src/lib/config.cc:80 src/lib/config.cc:163
 msgid "Rec. 709"
-msgstr "Rec 709"
+msgstr "Rec. 709"
 
-#: src/lib/util.cc:751
+#: src/lib/util.cc:802
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:755
+#: src/lib/util.cc:806
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -396,7 +416,7 @@ msgstr "Réduction de bruit temporel"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:81
+#: src/lib/job.cc:80
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -404,7 +424,7 @@ msgstr ""
 "Le disque contenant le film est plein. Libérez de l'espace et essayez à "
 "nouveau."
 
-#: src/lib/film.cc:366
+#: src/lib/film.cc:370
 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 "
@@ -426,7 +446,7 @@ msgstr "Transcodage %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:117
+#: src/lib/job.cc:116
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
@@ -438,9 +458,9 @@ msgstr "Échantillonnage audio (%1) inconnu"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Adoucissement et flou Gaussien"
 
-#: src/lib/colour_conversion.cc:141
+#: src/lib/colour_conversion.cc:145
 msgid "Untitled"
-msgstr ""
+msgstr "Sans titre"
 
 #: src/lib/filter.cc:69
 msgid "Vertical deblocking filter"
@@ -462,15 +482,15 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:275
 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:232
+#: src/lib/film.cc:236
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:552
+#: src/lib/util.cc:583
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -478,12 +498,11 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:267
-#, fuzzy
+#: src/lib/film.cc:271
 msgid "container"
-msgstr "contenu"
+msgstr "conteneur"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:279
 msgid "content type"
 msgstr "type de contenu"
 
@@ -495,26 +514,25 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg.cc:128
+#: src/lib/ffmpeg.cc:139
 msgid "could not find audio decoder"
 msgstr "décodeur audio introuvable"
 
-#: src/lib/ffmpeg.cc:76
+#: src/lib/ffmpeg.cc:87
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:521
+#: src/lib/ffmpeg_decoder.cc:522
 msgid "could not find subtitle decoder"
 msgstr "décodeur de sous-titre introuvable"
 
-#: src/lib/ffmpeg.cc:107
+#: src/lib/ffmpeg.cc:118
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
 #: src/lib/sndfile_decoder.cc:45
-#, fuzzy
 msgid "could not open audio file for reading"
-msgstr "lecture du fichier impossible"
+msgstr "lecture du fichier audio impossible"
 
 #: src/lib/exceptions.cc:29
 msgid "could not open file %1"
@@ -525,18 +543,22 @@ msgid "could not open file for reading"
 msgstr "lecture du fichier impossible"
 
 #: src/lib/dcp_video_frame.cc:342
-#, fuzzy
 msgid "could not read encoded data"
-msgstr "décodeur audio introuvable"
+msgstr "lecture des données encodées impossible"
 
 #: src/lib/exceptions.cc:42
 msgid "could not read from file %1 (%2)"
 msgstr "lecture du fichier impossible %1 (%2)"
 
-#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
+#: src/lib/resampler.cc:102
 msgid "could not run sample-rate converter"
 msgstr "conversion de la fréquence d'échantillonnage impossible"
 
+#: src/lib/resampler.cc:83
+#, fuzzy
+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
 msgid "could not start SCP session (%1)"
 msgstr "démarrage de session SCP (%1) impossible"
@@ -551,16 +573,12 @@ msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
 #: src/lib/moving_image_examiner.cc:82
 msgid "first frame in moving image directory is number %1"
-msgstr ""
+msgstr "la première image dans le dossier est la numéro %1"
 
-#: src/lib/transcode_job.cc:95
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/transcode_job.cc:98
-msgid "hashing"
-msgstr ""
-
 #: src/lib/util.cc:145
 msgid "hour"
 msgstr "heure"
@@ -577,7 +595,7 @@ msgstr "minute"
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:673
+#: src/lib/util.cc:724
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -585,35 +603,35 @@ msgstr "clé %1 non sélectionnée"
 msgid "missing required setting %1"
 msgstr "paramètre %1 manquant"
 
-#: src/lib/ffmpeg_decoder.cc:553
+#: src/lib/ffmpeg_decoder.cc:554
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:232 src/lib/film.cc:279
+#: src/lib/film.cc:236 src/lib/film.cc:283
 msgid "name"
 msgstr "nom"
 
-#: src/lib/ffmpeg_decoder.cc:568
+#: src/lib/ffmpeg_decoder.cc:569
 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 ""
+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:343
+#: src/lib/job.cc:309
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/config.cc:72 src/lib/video_content.cc:109
+#: src/lib/config.cc:78 src/lib/video_content.cc:111
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:73
+#: src/lib/config.cc:79
 msgid "sRGB non-linearised"
-msgstr ""
+msgstr "sRGB non linéarisé"
 
 #: src/lib/util.cc:157
 msgid "seconds"
@@ -621,7 +639,16 @@ msgstr "secondes"
 
 #: src/lib/moving_image_examiner.cc:86
 msgid "there are %1 images in the directory but the last one is number %2"
-msgstr ""
+msgstr "il y a %1 images dans le dossier mais la dernière est la numéro %2"
+
+#~ msgid "Could not find DCP to make KDM for"
+#~ msgstr "DCP introuvable pour fabrication de KDM"
+
+#~ msgid "More than one possible DCP to make KDM for"
+#~ msgstr "Il y a plusieurs DCP pour lesquels faire la KDM"
+
+#~ msgid "hashing"
+#~ msgstr "calcul du hash"
 
 #~ msgid "Image: %1"
 #~ msgstr "Image : %1"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 3b458ca19..d20c1be07 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-10-16 09:45+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
 "PO-Revision-Date: 2013-04-28 10:26+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/sndfile_content.cc:59
+#: src/lib/sndfile_content.cc:60
 msgid "%1 [audio]"
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 msgid "%1 [still]"
 msgstr "ancora"
 
-#: src/lib/sndfile_content.cc:80
+#: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
@@ -43,7 +43,7 @@ msgstr ""
 msgid "%1 frames; %2 frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:142
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Pubblicità"
 
-#: src/lib/job.cc:75
+#: src/lib/job.cc:74
 msgid "An error occurred whilst handling the file %1."
 msgstr "Errore durante l'elaborazione del file %1."
 
@@ -104,7 +104,7 @@ msgstr "Bicubica"
 msgid "Bilinear"
 msgstr "Bilineare"
 
-#: src/lib/job.cc:350
+#: src/lib/job.cc:316
 msgid "Cancelled"
 msgstr "Cancellato"
 
@@ -112,11 +112,27 @@ 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:752
+#: src/lib/util.cc:803
 msgid "Centre"
 msgstr "Centro"
 
-#: src/lib/util.cc:775
+#: src/lib/writer.cc:73
+msgid "Checking existing image data"
+msgstr ""
+
+#: src/lib/writer.cc:398
+msgid "Computing audio digest"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:84
+msgid "Computing digest"
+msgstr ""
+
+#: src/lib/writer.cc:395
+msgid "Computing image digest"
+msgstr ""
+
+#: src/lib/util.cc:833
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
@@ -133,12 +149,7 @@ msgstr "Non posso connetermi al server %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
-#: src/lib/film.cc:929
-#, fuzzy
-msgid "Could not find DCP to make KDM for"
-msgstr "non riesco a trovare il decoder audio"
-
-#: src/lib/job.cc:95
+#: src/lib/job.cc:94
 #, fuzzy
 msgid "Could not open %1"
 msgstr "non riesco ad aprire %1"
@@ -147,7 +158,7 @@ msgstr "non riesco ad aprire %1"
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
-#: src/lib/film.cc:939
+#: src/lib/film.cc:943
 msgid "Could not read DCP to make KDM for"
 msgstr ""
 
@@ -163,17 +174,17 @@ msgstr "Non posso scrivere il file remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Deinterlacciatore cubico interpolato"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:845
 #, 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:778
+#: src/lib/util.cc:836
 #, fuzzy
 msgid "DCP will use every other frame of the content.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
 
-#: src/lib/job.cc:96
+#: src/lib/job.cc:95
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -195,15 +206,25 @@ msgid "Deringing filter"
 msgstr "Filtro deringing"
 
 #: src/lib/dolby_cp750.cc:27
-msgid "Dolby CP750"
+#, fuzzy
+msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:838
 #, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
-#: src/lib/job.cc:348
+#: src/lib/util.cc:840
+#, 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/writer.cc:109
+msgid "Encoding image data"
+msgstr ""
+
+#: src/lib/job.cc:314
 msgid "Error (%1)"
 msgstr "Errore (%1)"
 
@@ -211,6 +232,11 @@ 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"
@@ -271,7 +297,7 @@ msgstr "Filtro sblocco orizzontale"
 msgid "Horizontal deblocking filter A"
 msgstr "Filtro A sblocco orizzontale"
 
-#: src/lib/job.cc:109 src/lib/job.cc:118
+#: src/lib/job.cc:108 src/lib/job.cc:117
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -287,15 +313,15 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:750
+#: src/lib/util.cc:801
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:754
+#: src/lib/util.cc:805
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:753
+#: src/lib/util.cc:804
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -316,10 +342,6 @@ msgstr "Deinterlacciatore mediano"
 msgid "Misc"
 msgstr "Varie"
 
-#: src/lib/film.cc:931
-msgid "More than one possible DCP to make KDM for"
-msgstr ""
-
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Dinterlacciatore compensativo di movimento"
@@ -329,7 +351,7 @@ msgstr "Dinterlacciatore compensativo di movimento"
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
 
-#: src/lib/job.cc:346
+#: src/lib/job.cc:312
 msgid "OK (ran for %1)"
 msgstr "OK (eseguito in %1)"
 
@@ -349,16 +371,16 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/config.cc:74 src/lib/config.cc:143
+#: src/lib/config.cc:80 src/lib/config.cc:163
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:751
+#: src/lib/util.cc:802
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:755
+#: src/lib/util.cc:806
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -398,7 +420,7 @@ msgstr "Riduttore temporale di rumore"
 msgid "Test"
 msgstr "Prova"
 
-#: src/lib/job.cc:81
+#: src/lib/job.cc:80
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -406,7 +428,7 @@ msgstr ""
 "Sul disco dove è memorizzato il film non c'è abbastanza spazio. Liberare "
 "altro spazio e riprovare."
 
-#: src/lib/film.cc:366
+#: src/lib/film.cc:370
 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 "
@@ -425,7 +447,7 @@ msgstr "Transcodifica %1"
 msgid "Transitional"
 msgstr "Di transizione"
 
-#: src/lib/job.cc:117
+#: src/lib/job.cc:116
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -437,7 +459,7 @@ msgstr "Formato di campionamento audio non riconosciuto (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Maschera unsharp e sfocatura Gaussiana"
 
-#: src/lib/colour_conversion.cc:141
+#: src/lib/colour_conversion.cc:145
 msgid "Untitled"
 msgstr ""
 
@@ -461,15 +483,15 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:275
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
-#: src/lib/film.cc:232
+#: src/lib/film.cc:236
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:552
+#: src/lib/util.cc:583
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -477,12 +499,12 @@ msgstr "connessione scaduta"
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:267
+#: src/lib/film.cc:271
 #, fuzzy
 msgid "container"
 msgstr "contenuto"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:279
 msgid "content type"
 msgstr "tipo di contenuto"
 
@@ -494,19 +516,19 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:128
+#: src/lib/ffmpeg.cc:139
 msgid "could not find audio decoder"
 msgstr "non riesco a trovare il decoder audio"
 
-#: src/lib/ffmpeg.cc:76
+#: src/lib/ffmpeg.cc:87
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg_decoder.cc:521
+#: src/lib/ffmpeg_decoder.cc:522
 msgid "could not find subtitle decoder"
 msgstr "non riesco a trovare il decoder dei sottotitoli"
 
-#: src/lib/ffmpeg.cc:107
+#: src/lib/ffmpeg.cc:118
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
@@ -532,10 +554,15 @@ msgstr "non riesco a trovare il decoder audio"
 msgid "could not read from file %1 (%2)"
 msgstr "non posso leggere dal file %1 (%2)"
 
-#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
+#: src/lib/resampler.cc:102
 msgid "could not run sample-rate converter"
 msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 
+#: src/lib/resampler.cc:83
+#, fuzzy
+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
 msgid "could not start SCP session (%1)"
 msgstr "non posso avviare la sessione SCP (%1)"
@@ -552,14 +579,10 @@ msgstr "non posso scrivere il file (%1)"
 msgid "first frame in moving image directory is number %1"
 msgstr ""
 
-#: src/lib/transcode_job.cc:95
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/transcode_job.cc:98
-msgid "hashing"
-msgstr ""
-
 #: src/lib/util.cc:145
 msgid "hour"
 msgstr "ora"
@@ -576,7 +599,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:673
+#: src/lib/util.cc:724
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -584,15 +607,15 @@ 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:553
+#: src/lib/ffmpeg_decoder.cc:554
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:232 src/lib/film.cc:279
+#: src/lib/film.cc:236 src/lib/film.cc:283
 msgid "name"
 msgstr "nome"
 
-#: src/lib/ffmpeg_decoder.cc:568
+#: src/lib/ffmpeg_decoder.cc:569
 msgid "non-bitmap subtitles not yet supported"
 msgstr "sottotitoli non-bitmap non ancora supportati"
 
@@ -602,15 +625,15 @@ msgstr ""
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:343
+#: src/lib/job.cc:309
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/config.cc:72 src/lib/video_content.cc:109
+#: src/lib/config.cc:78 src/lib/video_content.cc:111
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:73
+#: src/lib/config.cc:79
 msgid "sRGB non-linearised"
 msgstr ""
 
@@ -623,6 +646,10 @@ msgid "there are %1 images in the directory but the last one is number %2"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not find DCP to make KDM for"
+#~ msgstr "non riesco a trovare il decoder audio"
+
+#, fuzzy
 #~ msgid "Sound file: %1"
 #~ msgstr "non riesco ad aprire %1"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 245983bb0..1cf26ce35 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-10-16 09:45+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
 "PO-Revision-Date: 2013-04-10 15:35+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/lib/sndfile_content.cc:59
+#: src/lib/sndfile_content.cc:60
 msgid "%1 [audio]"
 msgstr ""
 
@@ -34,7 +34,7 @@ msgstr ""
 msgid "%1 [still]"
 msgstr "stillbild"
 
-#: src/lib/sndfile_content.cc:80
+#: src/lib/sndfile_content.cc:81
 msgid "%1 channels, %2kHz, %3 samples"
 msgstr ""
 
@@ -43,7 +43,7 @@ msgstr ""
 msgid "%1 frames; %2 frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/video_content.cc:140
+#: src/lib/video_content.cc:142
 msgid "%1x%2 pixels (%3:1)"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Reklam"
 
-#: src/lib/job.cc:75
+#: src/lib/job.cc:74
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ett fel inträffade vid hantering av filen %1"
 
@@ -104,7 +104,7 @@ msgstr "Bikubisk"
 msgid "Bilinear"
 msgstr "Bilinjär"
 
-#: src/lib/job.cc:350
+#: src/lib/job.cc:316
 msgid "Cancelled"
 msgstr "Avbruten"
 
@@ -112,11 +112,27 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:752
+#: src/lib/util.cc:803
 msgid "Centre"
 msgstr "Mitt"
 
-#: src/lib/util.cc:775
+#: src/lib/writer.cc:73
+msgid "Checking existing image data"
+msgstr ""
+
+#: src/lib/writer.cc:398
+msgid "Computing audio digest"
+msgstr ""
+
+#: src/lib/moving_image_content.cc:84
+msgid "Computing digest"
+msgstr ""
+
+#: src/lib/writer.cc:395
+msgid "Computing image digest"
+msgstr ""
+
+#: src/lib/util.cc:833
 #, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "DCP och källa har samma bildfrekvens.\n"
@@ -133,12 +149,7 @@ msgstr "Kunde inte ansluta till server %1 (%2)"
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 
-#: src/lib/film.cc:929
-#, fuzzy
-msgid "Could not find DCP to make KDM for"
-msgstr "kunde inte hitta audio-avkodare"
-
-#: src/lib/job.cc:95
+#: src/lib/job.cc:94
 #, fuzzy
 msgid "Could not open %1"
 msgstr "kunde inte öppna fil %1"
@@ -147,7 +158,7 @@ msgstr "kunde inte öppna fil %1"
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
-#: src/lib/film.cc:939
+#: src/lib/film.cc:943
 msgid "Could not read DCP to make KDM for"
 msgstr ""
 
@@ -163,17 +174,17 @@ msgstr "Kunde inte skriva till fjärrfil (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Kubiskt interpolerande avflätare"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:845
 #, 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:778
+#: src/lib/util.cc:836
 #, 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"
 
-#: src/lib/job.cc:96
+#: src/lib/job.cc:95
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
@@ -195,15 +206,25 @@ msgid "Deringing filter"
 msgstr "Avringningsfilter"
 
 #: src/lib/dolby_cp750.cc:27
-msgid "Dolby CP750"
+#, fuzzy
+msgid "Dolby CP650 and CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:838
 #, 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/job.cc:348
+#: src/lib/util.cc:840
+#, 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/writer.cc:109
+msgid "Encoding image data"
+msgstr ""
+
+#: src/lib/job.cc:314
 msgid "Error (%1)"
 msgstr "Fel (%1)"
 
@@ -211,6 +232,11 @@ 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"
@@ -271,7 +297,7 @@ msgstr "Filter för horisontal kantighetsutjämning"
 msgid "Horizontal deblocking filter A"
 msgstr "Filter för horisontal kantighetsutjämning A"
 
-#: src/lib/job.cc:109 src/lib/job.cc:118
+#: src/lib/job.cc:108 src/lib/job.cc:117
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
@@ -287,15 +313,15 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:750
+#: src/lib/util.cc:801
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:754
+#: src/lib/util.cc:805
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:753
+#: src/lib/util.cc:804
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -316,10 +342,6 @@ msgstr "Median-avflätare"
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/lib/film.cc:931
-msgid "More than one possible DCP to make KDM for"
-msgstr ""
-
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
@@ -329,7 +351,7 @@ msgstr "Rörelsekompenserande avflätare"
 msgid "Noise reduction"
 msgstr "Brusreducering"
 
-#: src/lib/job.cc:346
+#: src/lib/job.cc:312
 msgid "OK (ran for %1)"
 msgstr "OK (kördes %1)"
 
@@ -349,16 +371,16 @@ msgstr "Offentligt Servicemeddelande"
 msgid "Rating"
 msgstr "Klassificeringsklipp"
 
-#: src/lib/config.cc:74 src/lib/config.cc:143
+#: src/lib/config.cc:80 src/lib/config.cc:163
 #, fuzzy
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:751
+#: src/lib/util.cc:802
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:755
+#: src/lib/util.cc:806
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -398,7 +420,7 @@ msgstr "Temporal brusreducering"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:81
+#: src/lib/job.cc:80
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -406,7 +428,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:366
+#: src/lib/film.cc:370
 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 "
@@ -425,7 +447,7 @@ msgstr "Konvertera %1"
 msgid "Transitional"
 msgstr "Övergångsklipp"
 
-#: src/lib/job.cc:117
+#: src/lib/job.cc:116
 msgid "Unknown error"
 msgstr "Okänt fel"
 
@@ -439,7 +461,7 @@ msgstr "Okänt audio-sampelformat (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "Oskärpemask och Gaussisk suddighet"
 
-#: src/lib/colour_conversion.cc:141
+#: src/lib/colour_conversion.cc:145
 msgid "Untitled"
 msgstr ""
 
@@ -464,16 +486,16 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:271
+#: src/lib/film.cc:275
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
-#: src/lib/film.cc:232
+#: src/lib/film.cc:236
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:552
+#: src/lib/util.cc:583
 #, fuzzy
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
@@ -482,12 +504,12 @@ msgstr "uppkopplingen tajmade ur"
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:267
+#: src/lib/film.cc:271
 #, fuzzy
 msgid "container"
 msgstr "innehåll"
 
-#: src/lib/film.cc:275
+#: src/lib/film.cc:279
 msgid "content type"
 msgstr "innehållstyp"
 
@@ -499,19 +521,19 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:128
+#: src/lib/ffmpeg.cc:139
 msgid "could not find audio decoder"
 msgstr "kunde inte hitta audio-avkodare"
 
-#: src/lib/ffmpeg.cc:76
+#: src/lib/ffmpeg.cc:87
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg_decoder.cc:521
+#: src/lib/ffmpeg_decoder.cc:522
 msgid "could not find subtitle decoder"
 msgstr "kunde inte hitta undertext-avkodare"
 
-#: src/lib/ffmpeg.cc:107
+#: src/lib/ffmpeg.cc:118
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
@@ -537,10 +559,15 @@ msgstr "kunde inte hitta audio-avkodare"
 msgid "could not read from file %1 (%2)"
 msgstr "kunde inte läsa från fil %1 (%2)"
 
-#: src/lib/resampler.cc:80 src/lib/resampler.cc:99
+#: src/lib/resampler.cc:102
 msgid "could not run sample-rate converter"
 msgstr "kunde inte köra sampelhastighetskonverteraren"
 
+#: src/lib/resampler.cc:83
+#, fuzzy
+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
 msgid "could not start SCP session (%1)"
 msgstr "kunde inte starta SCP-session (%1)"
@@ -557,14 +584,10 @@ msgstr "kunde inte skriva till fil %1 (%2)"
 msgid "first frame in moving image directory is number %1"
 msgstr ""
 
-#: src/lib/transcode_job.cc:95
+#: src/lib/transcode_job.cc:94
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/transcode_job.cc:98
-msgid "hashing"
-msgstr ""
-
 #: src/lib/util.cc:145
 msgid "hour"
 msgstr "timme"
@@ -581,7 +604,7 @@ msgstr "minut"
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:673
+#: src/lib/util.cc:724
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -589,15 +612,15 @@ 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:553
+#: src/lib/ffmpeg_decoder.cc:554
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:232 src/lib/film.cc:279
+#: src/lib/film.cc:236 src/lib/film.cc:283
 msgid "name"
 msgstr "namn"
 
-#: src/lib/ffmpeg_decoder.cc:568
+#: src/lib/ffmpeg_decoder.cc:569
 msgid "non-bitmap subtitles not yet supported"
 msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 
@@ -607,15 +630,15 @@ msgstr ""
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:343
+#: src/lib/job.cc:309
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/config.cc:72 src/lib/video_content.cc:109
+#: src/lib/config.cc:78 src/lib/video_content.cc:111
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/config.cc:73
+#: src/lib/config.cc:79
 msgid "sRGB non-linearised"
 msgstr ""
 
@@ -628,6 +651,10 @@ msgid "there are %1 images in the directory but the last one is number %2"
 msgstr ""
 
 #, fuzzy
+#~ msgid "Could not find DCP to make KDM for"
+#~ msgstr "kunde inte hitta audio-avkodare"
+
+#, fuzzy
 #~ msgid "Sound file: %1"
 #~ msgstr "kunde inte öppna fil %1"
 
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 98dec58d7..ddc0a2974 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -39,6 +39,9 @@
 #include <boost/lexical_cast.hpp>
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
+#ifdef DCPOMATIC_WINDOWS
+#include <boost/locale.hpp>
+#endif
 #include <glib.h>
 #include <openjpeg.h>
 #include <openssl/md5.h>
@@ -80,7 +83,6 @@ using std::endl;
 using std::vector;
 using std::hex;
 using std::setw;
-using std::ifstream;
 using std::ios;
 using std::min;
 using std::max;
@@ -89,7 +91,6 @@ using std::multimap;
 using std::istream;
 using std::numeric_limits;
 using std::pair;
-using std::ofstream;
 using std::cout;
 using std::streampos;
 using boost::shared_ptr;
@@ -261,8 +262,11 @@ seconds (struct timeval t)
 LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *)
 {
 	dbg::stack s;
-	ofstream f (backtrace_file.string().c_str());
-	std::copy(s.begin(), s.end(), std::ostream_iterator<dbg::stack_frame>(f, "\n"));
+	FILE* f = fopen_boost (backtrace_file, "w");
+	for (dbg::stack::const_iterator i = s.begin(); i != s.end(); ++i) {
+		fprintf (f, "%p %s %d %s", i->instruction, i->function.c_str(), i->line, i->module.c_str());
+	}
+	fclose (f);
 	return EXCEPTION_CONTINUE_SEARCH;
 }
 #endif
@@ -277,6 +281,21 @@ dcpomatic_setup ()
 	backtrace_file /= g_get_user_config_dir ();
 	backtrace_file /= "backtrace.txt";
 	SetUnhandledExceptionFilter(exception_handler);
+
+	/* Dark voodoo which, I think, gets boost::filesystem::path to
+	   correctly convert UTF-8 strings to paths, and also paths
+	   back to UTF-8 strings (on path::string()).
+
+	   After this, constructing boost::filesystem::paths from strings
+	   converts from UTF-8 to UTF-16 inside the path.  Then
+	   path::string().c_str() gives UTF-8 and
+	   path::c_str()          gives UTF-16.
+
+	   This is all Windows-only.  AFAICT Linux/OS X use UTF-8 everywhere,
+	   so things are much simpler.
+	*/
+	std::locale::global (boost::locale::generator().generate (""));
+	boost::filesystem::path::imbue (std::locale ());
 #endif	
 	
 	avfilter_register_all ();
@@ -391,7 +410,7 @@ md5_digest (void const * data, int size)
 string
 md5_digest (vector<boost::filesystem::path> files, shared_ptr<Job> job)
 {
-	int const buffer_size = 64 * 1024;
+	boost::uintmax_t const buffer_size = 64 * 1024;
 	char buffer[buffer_size];
 
 	MD5_CTX md5_context;
@@ -403,19 +422,17 @@ md5_digest (vector<boost::filesystem::path> files, shared_ptr<Job> job)
 	}
 
 	for (size_t i = 0; i < files.size(); ++i) {
-		ifstream f (files[i].string().c_str(), std::ios::binary);
-		if (!f.good ()) {
+		FILE* f = fopen_boost (files[i], "rb");
+		if (!f) {
 			throw OpenFileError (files[i].string());
 		}
-	
-		f.seekg (0, std::ios::end);
-		streampos const bytes = f.tellg ();
-		f.seekg (0, std::ios::beg);
 
-		streampos remaining = bytes;
+		boost::uintmax_t const bytes = boost::filesystem::file_size (files[i]);
+		boost::uintmax_t remaining = bytes;
+
 		while (remaining > 0) {
-			int const t = min (remaining, streampos (buffer_size));
-			f.read (buffer, t);
+			int const t = min (remaining, buffer_size);
+			fread (buffer, 1, t, f);
 			MD5_Update (&md5_context, buffer, t);
 			remaining -= t;
 
@@ -423,6 +440,8 @@ md5_digest (vector<boost::filesystem::path> files, shared_ptr<Job> job)
 				job->set_progress ((float (i) + 1 - float(remaining) / bytes) / files.size ());
 			}
 		}
+
+		fclose (f);
 	}
 
 	unsigned char digest[MD5_DIGEST_LENGTH];
diff --git a/src/lib/writer.cc b/src/lib/writer.cc
index 103ac2ba1..f4128e6c5 100644
--- a/src/lib/writer.cc
+++ b/src/lib/writer.cc
@@ -36,13 +36,13 @@
 #include "audio_mapping.h"
 #include "config.h"
 #include "job.h"
+#include "cross.h"
 
 #include "i18n.h"
 
 using std::make_pair;
 using std::pair;
 using std::string;
-using std::ifstream;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
@@ -141,8 +141,9 @@ Writer::fake_write (int frame, Eyes eyes)
 {
 	boost::mutex::scoped_lock lock (_mutex);
 
-	ifstream ifi (_film->info_path (frame, eyes).string().c_str());
+	FILE* ifi = fopen_boost (_film->info_path (frame, eyes), "r");
 	libdcp::FrameInfo info (ifi);
+	fclose (ifi);
 	
 	QueueItem qi;
 	qi.type = QueueItem::FAKE;
@@ -430,8 +431,9 @@ bool
 Writer::check_existing_picture_mxf_frame (FILE* mxf, int f, Eyes eyes)
 {
 	/* Read the frame info as written */
-	ifstream ifi (_film->info_path (f, eyes).string().c_str());
+	FILE* ifi = fopen_boost (_film->info_path (f, eyes), "r");
 	libdcp::FrameInfo info (ifi);
+	fclose (ifi);
 	if (info.size == 0) {
 		_film->log()->log (String::compose ("Existing frame %1 has no info file", f));
 		return false;
diff --git a/src/lib/wscript b/src/lib/wscript
index ebd316a0c..1699c5ec8 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -72,7 +72,7 @@ def build(bld):
     obj.export_includes = ['..']
     obj.uselib = """
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
-                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2 
+                 BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
                  CURL ZIP QUICKMAIL
                  """
@@ -80,7 +80,7 @@ def build(bld):
     obj.source = sources + ' version.cc'
 
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK'
+        obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
         obj.source += ' stack.cpp'
     if bld.env.STATIC:
         obj.uselib += ' XML++'
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index a4239bd21..b4ec1d77d 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -62,7 +62,6 @@ using std::map;
 using std::make_pair;
 using std::list;
 using std::exception;
-using std::ofstream;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
@@ -248,6 +247,22 @@ public:
 		, _servers_list_dialog (0)
 		, _hints_dialog (0)
 	{
+#ifdef DCPOMATIC_WINDOWS_CONSOLE		
+                AllocConsole();
+		
+		HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
+		int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT);
+		FILE* hf_out = _fdopen(hCrt, "w");
+		setvbuf(hf_out, NULL, _IONBF, 1);
+		*stdout = *hf_out;
+		
+		HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
+		hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT);
+		FILE* hf_in = _fdopen(hCrt, "r");
+		setvbuf(hf_in, NULL, _IONBF, 128);
+		*stdin = *hf_in;
+#endif
+
 		wxMenuBar* bar = new wxMenuBar;
 		setup_menu (bar);
 		SetMenuBar (bar);
@@ -333,7 +348,7 @@ private:
 					    std_to_wx (
 						    String::compose (wx_to_std (_("The directory %1 already exists and is not empty.  "
 										  "Are you sure you want to use it?")),
-								     d->get_path().c_str())
+								     d->get_path().string().c_str())
 						    )
 					    )) {
 					return;
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 9e6f7e7cb..3854f3bf6 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-10-16 09:46+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+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,130 +17,143 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: src/tools/dcpomatic.cc:337
+#: src/tools/dcpomatic.cc:358
 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:222
+#: src/tools/dcpomatic.cc:235
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:203
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:233
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:225
+#: src/tools/dcpomatic.cc:239
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:237
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:208
+#: src/tools/dcpomatic.cc:217
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:193
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dcpomatic.cc:201 src/tools/dcpomatic.cc:204
+#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dcpomatic.cc:188
+#: src/tools/dcpomatic.cc:197
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:205
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:186
+#: src/tools/dcpomatic.cc:195
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dcpomatic.cc:210
+#: src/tools/dcpomatic.cc:219
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:238
+msgid "&Tools"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:215
+#: src/tools/dcpomatic.cc:228
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:571
+#: src/tools/dcpomatic.cc:612
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:376
+#: src/tools/dcpomatic.cc:403
 #, 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:467
+#: src/tools/dcpomatic.cc:494
 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:460
+#: src/tools/dcpomatic.cc:487
 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:308 src/tools/dcpomatic.cc:582
+#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
+#: src/tools/dcpomatic.cc:623
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:224
+msgid "Encoding Servers..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dcpomatic.cc:209
+#: src/tools/dcpomatic.cc:223
+msgid "Hints..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
 msgid "Make &KDMs..."
 msgstr "Crear &KDMs..."
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:192
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dcpomatic.cc:211
+#: src/tools/dcpomatic.cc:220
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:85
 #, 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:355
+#: src/tools/dcpomatic.cc:378
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:348
 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:489
+#: src/tools/dcpomatic.cc:534
 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:490
+#: src/tools/dcpomatic.cc:535
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
-#: src/tools/dcpomatic.cc:360
+#: src/tools/dcpomatic.cc:387
 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 617424605..4be21e306 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,140 +7,152 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 09:46+0100\n"
-"PO-Revision-Date: 2013-07-16 23:13+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
+"PO-Revision-Date: 2013-11-25 18:58+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
-#: src/tools/dcpomatic.cc:337
+#: src/tools/dcpomatic.cc:358
 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:222
+#: src/tools/dcpomatic.cc:235
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:203
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:233
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:225
+#: src/tools/dcpomatic.cc:239
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:237
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:208
+#: src/tools/dcpomatic.cc:217
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:193
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dcpomatic.cc:201 src/tools/dcpomatic.cc:204
+#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dcpomatic.cc:188
+#: src/tools/dcpomatic.cc:197
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:205
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:186
+#: src/tools/dcpomatic.cc:195
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dcpomatic.cc:210
+#: src/tools/dcpomatic.cc:219
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:238
+msgid "&Tools"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dcpomatic.cc:215
+#: src/tools/dcpomatic.cc:228
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:571
+#: src/tools/dcpomatic.cc:612
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:376
+#: src/tools/dcpomatic.cc:403
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:467
+#: src/tools/dcpomatic.cc:494
 msgid "Could not show DCP (could not run konqueror)"
-msgstr ""
+msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
-#: src/tools/dcpomatic.cc:460
+#: src/tools/dcpomatic.cc:487
 msgid "Could not show DCP (could not run nautilus)"
-msgstr ""
+msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
-#: src/tools/dcpomatic.cc:308 src/tools/dcpomatic.cc:582
+#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
+#: src/tools/dcpomatic.cc:623
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:224
+msgid "Encoding Servers..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dcpomatic.cc:209
-msgid "Make &KDMs..."
+#: src/tools/dcpomatic.cc:223
+msgid "Hints..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:218
+msgid "Make &KDMs..."
+msgstr "Générer &KDMs..."
+
+#: src/tools/dcpomatic.cc:192
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dcpomatic.cc:211
+#: src/tools/dcpomatic.cc:220
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:85
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:355
+#: src/tools/dcpomatic.cc:378
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:348
 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:489
-#, fuzzy
+#: src/tools/dcpomatic.cc:534
 msgid "There are unfinished jobs; are you sure you want to quit?"
-msgstr ""
-"Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
+msgstr "Il y a des tâches inachevées ; voulez-vous vraiment quitter ?"
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:535
 msgid "Unfinished jobs"
-msgstr ""
+msgstr "Travaux incomplets"
 
-#: src/tools/dcpomatic.cc:360
+#: src/tools/dcpomatic.cc:387
 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 a61052f7a..7507e17a0 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-10-16 09:46+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
 "PO-Revision-Date: 2013-04-28 10:31+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,129 +17,142 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dcpomatic.cc:337
+#: src/tools/dcpomatic.cc:358
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:222
+#: src/tools/dcpomatic.cc:235
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:203
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:233
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:225
+#: src/tools/dcpomatic.cc:239
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:237
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dcpomatic.cc:208
+#: src/tools/dcpomatic.cc:217
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:193
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dcpomatic.cc:201 src/tools/dcpomatic.cc:204
+#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dcpomatic.cc:188
+#: src/tools/dcpomatic.cc:197
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:205
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:186
+#: src/tools/dcpomatic.cc:195
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dcpomatic.cc:210
+#: src/tools/dcpomatic.cc:219
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:238
+msgid "&Tools"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:215
+#: src/tools/dcpomatic.cc:228
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:571
+#: src/tools/dcpomatic.cc:612
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:376
+#: src/tools/dcpomatic.cc:403
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:467
+#: src/tools/dcpomatic.cc:494
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:460
+#: src/tools/dcpomatic.cc:487
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:308 src/tools/dcpomatic.cc:582
+#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
+#: src/tools/dcpomatic.cc:623
 #, fuzzy
 msgid "DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:224
+msgid "Encoding Servers..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dcpomatic.cc:209
+#: src/tools/dcpomatic.cc:223
+msgid "Hints..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
 msgid "Make &KDMs..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:192
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dcpomatic.cc:211
+#: src/tools/dcpomatic.cc:220
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:85
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:355
+#: src/tools/dcpomatic.cc:378
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:348
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:489
+#: src/tools/dcpomatic.cc:534
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:535
 msgid "Unfinished jobs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:360
+#: src/tools/dcpomatic.cc:387
 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 a53e486a8..1ebcc2782 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-10-16 09:46+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+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,128 +17,141 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dcpomatic.cc:337
+#: src/tools/dcpomatic.cc:358
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:222
+#: src/tools/dcpomatic.cc:235
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:194
+#: src/tools/dcpomatic.cc:203
 msgid "&Exit"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:220
+#: src/tools/dcpomatic.cc:233
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:225
+#: src/tools/dcpomatic.cc:239
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:224
+#: src/tools/dcpomatic.cc:237
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:208
+#: src/tools/dcpomatic.cc:217
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dcpomatic.cc:184
+#: src/tools/dcpomatic.cc:193
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dcpomatic.cc:201 src/tools/dcpomatic.cc:204
+#: src/tools/dcpomatic.cc:210 src/tools/dcpomatic.cc:213
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dcpomatic.cc:188
+#: src/tools/dcpomatic.cc:197
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dcpomatic.cc:196
+#: src/tools/dcpomatic.cc:205
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:186
+#: src/tools/dcpomatic.cc:195
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dcpomatic.cc:210
+#: src/tools/dcpomatic.cc:219
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:217
+#: src/tools/dcpomatic.cc:238
+msgid "&Tools"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:215
+#: src/tools/dcpomatic.cc:228
 #, fuzzy
 msgid "About DCP-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dcpomatic.cc:571
+#: src/tools/dcpomatic.cc:612
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:376
+#: src/tools/dcpomatic.cc:403
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:467
+#: src/tools/dcpomatic.cc:494
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:460
+#: src/tools/dcpomatic.cc:487
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:308 src/tools/dcpomatic.cc:582
+#: src/tools/dcpomatic.cc:329 src/tools/dcpomatic.cc:570
+#: src/tools/dcpomatic.cc:623
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:224
+msgid "Encoding Servers..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:86
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dcpomatic.cc:209
+#: src/tools/dcpomatic.cc:223
+msgid "Hints..."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
 msgid "Make &KDMs..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:183
+#: src/tools/dcpomatic.cc:192
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dcpomatic.cc:211
+#: src/tools/dcpomatic.cc:220
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:85
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:355
+#: src/tools/dcpomatic.cc:378
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic.cc:327
+#: src/tools/dcpomatic.cc:348
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:489
+#: src/tools/dcpomatic.cc:534
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:490
+#: src/tools/dcpomatic.cc:535
 msgid "Unfinished jobs"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:360
+#: src/tools/dcpomatic.cc:387
 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 99d607731..bf13620e5 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -150,7 +150,7 @@ FilmEditor::make_dcp_panel ()
 	}
 	++r;
 
-	_encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, wxT ("Encrypted"));
+	_encrypted = new wxCheckBox (_dcp_panel, wxID_ANY, _("Encrypted"));
 	grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
 	++r;
 
@@ -730,11 +730,14 @@ FilmEditor::setup_content ()
 void
 FilmEditor::content_add_file_clicked ()
 {
-	wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE);
+	/* The wxFD_CHANGE_DIR here prevents a `could not set working directory' error 123 on Windows when using
+	   non-Latin filenames or paths.
+	*/
+	wxFileDialog* d = new wxFileDialog (this, _("Choose a file or files"), wxT (""), wxT (""), wxT ("*.*"), wxFD_MULTIPLE | wxFD_CHANGE_DIR);
 	int const r = d->ShowModal ();
-	d->Destroy ();
 
 	if (r != wxID_OK) {
+		d->Destroy ();
 		return;
 	}
 
@@ -744,8 +747,10 @@ FilmEditor::content_add_file_clicked ()
 	/* XXX: check for lots of files here and do something */
 
 	for (unsigned int i = 0; i < paths.GetCount(); ++i) {
-		_film->examine_and_add_content (content_factory (_film, wx_to_std (paths[i])));
+		_film->examine_and_add_content (content_factory (_film, wx_to_std (d->GetPath ())));
 	}
+
+	d->Destroy ();
 }
 
 void
diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 2612a6afe..be5af999e 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -74,11 +74,11 @@ NewFilmDialog::~NewFilmDialog ()
 	_directory = wx_to_std (_folder->GetPath ());
 }
 
-string
+boost::filesystem::path
 NewFilmDialog::get_path () const
 {
 	filesystem::path p;
 	p /= wx_to_std (_folder->GetPath ());
 	p /= wx_to_std (_name->GetValue ());
-	return p.string ();
+	return p;
 }
diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index 4176b060d..a835c7ceb 100644
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -29,7 +29,7 @@ public:
 	NewFilmDialog (wxWindow *);
 	~NewFilmDialog ();
 
-	std::string get_path () const;
+	boost::filesystem::path get_path () const;
 
 private:
 	wxTextCtrl* _name;
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 1ee8a820b..f8f36111c 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-10-16 09:46+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+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"
@@ -21,13 +21,13 @@ msgstr ""
 msgid "%"
 msgstr "%"
 
-#: src/wx/about_dialog.cc:77
+#: src/wx/about_dialog.cc:78
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:105
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 
@@ -35,27 +35,27 @@ msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 msgid "1 / "
 msgstr ""
 
-#: src/wx/audio_panel.cc:269
+#: src/wx/audio_panel.cc:237
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:200
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:213
+#: src/wx/film_editor.cc:215
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:135
+#: src/wx/video_panel.cc:201
 msgid "3D left/right"
 msgstr "3D izquierda/derecha"
 
-#: src/wx/film_editor.cc:214
+#: src/wx/film_editor.cc:216
 msgid "4K"
 msgstr ""
 
@@ -64,19 +64,19 @@ msgstr ""
 msgid "About DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:63
+#: src/wx/kdm_dialog.cc:66
 msgid "Add Cinema..."
 msgstr "Añadir cine..."
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:73
 msgid "Add Screen..."
 msgstr "Añadir pantalla..."
 
-#: src/wx/film_editor.cc:266
+#: src/wx/film_editor.cc:268
 msgid "Add file(s)..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:270
 msgid "Add folder..."
 msgstr "Añadir carpeta..."
 
@@ -84,11 +84,11 @@ msgstr "Añadir carpeta..."
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:63
+#: src/wx/audio_panel.cc:67
 msgid "Audio Delay"
 msgstr "Retardo del audio"
 
-#: src/wx/audio_panel.cc:51
+#: src/wx/audio_panel.cc:52
 msgid "Audio Gain"
 msgstr "Ganancia del audio"
 
@@ -96,12 +96,12 @@ msgstr "Ganancia del audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
-#: src/wx/audio_panel.cc:75
+#: src/wx/audio_panel.cc:81
 #, fuzzy
 msgid "Audio Stream"
 msgstr "Retardo del audio"
 
-#: src/wx/film_editor.cc:156
+#: src/wx/film_editor.cc:158
 #, fuzzy
 msgid "Audio channels"
 msgstr "canales"
@@ -111,7 +111,7 @@ msgstr "canales"
 msgid "Bad setting for %s (%s)"
 msgstr "Configuración erronea para %s (%s)"
 
-#: src/wx/video_panel.cc:71
+#: src/wx/video_panel.cc:123
 msgid "Bottom crop"
 msgstr "Recortar abajo"
 
@@ -127,11 +127,11 @@ msgstr "pero tengo que usar el fader a"
 msgid "C"
 msgstr ""
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Calcular..."
 
-#: src/wx/job_manager_view.cc:63
+#: src/wx/job_manager_view.cc:66
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -139,34 +139,39 @@ msgstr "Cancelar"
 msgid "Channels"
 msgstr "Canales"
 
-#: src/wx/film_editor.cc:723
+#: src/wx/content_menu.cc:137
+#, fuzzy
+msgid "Choose a file"
+msgstr "Crear en carpeta"
+
+#: src/wx/film_editor.cc:737
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/film_editor.cc:756
+#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
 #, fuzzy
 msgid "Choose a folder"
 msgstr "Crear en carpeta"
 
 #: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:98
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
-#: src/wx/config_dialog.cc:64
+#: src/wx/config_dialog.cc:63
 msgid "Colour conversions"
 msgstr "Conversiones de color"
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:133
 #, fuzzy
 msgid "Container"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:86
 msgid "Content"
 msgstr "Contenido"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:138
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
@@ -175,7 +180,7 @@ msgstr "Tipo de contenido"
 msgid "Content channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:339
+#: src/wx/video_panel.cc:333
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Velocidad del contenido %.4f\n"
@@ -185,16 +190,16 @@ msgstr "Velocidad del contenido %.4f\n"
 msgid "Content version"
 msgstr "Tipo de contenido"
 
-#: src/wx/video_panel.cc:297
+#: src/wx/video_panel.cc:291
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "El video es %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:132
+#: src/wx/audio_dialog.cc:136
 msgid "Could not analyse audio."
 msgstr "No se pudo analizar el audio."
 
-#: src/wx/film_viewer.cc:347
+#: src/wx/film_viewer.cc:336
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -208,17 +213,17 @@ msgstr "No se pudo crear el DCP: %s"
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/config_dialog.cc:285
+#: src/wx/config_dialog.cc:284
 #, fuzzy
 msgid "Creator"
 msgstr "Crear en carpeta"
 
-#: src/wx/video_panel.cc:309
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Recortado a %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:242
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -226,19 +231,19 @@ msgstr "Personalizado"
 msgid "DCI name"
 msgstr "Nombre DCI"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:117
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
-#: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
+#: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:52
 msgid "DCP-o-matic Preferences"
 msgstr "Preferencias DCP-o-matic"
 
@@ -247,35 +252,35 @@ msgstr "Preferencias DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %1"
 
-#: src/wx/config_dialog.cc:142
+#: src/wx/config_dialog.cc:141
 msgid "Default DCI name details"
 msgstr "Detalles por defecto del nombre DCI"
 
-#: src/wx/config_dialog.cc:155
+#: src/wx/config_dialog.cc:154
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/config_dialog.cc:146
+#: src/wx/config_dialog.cc:145
 #, fuzzy
 msgid "Default container"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:150
+#: src/wx/config_dialog.cc:149
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo de contenido"
 
-#: src/wx/config_dialog.cc:134
+#: src/wx/config_dialog.cc:133
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:125
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Carpeta por defecto para nuevas películas"
 
-#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:75
+#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detalles..."
 
@@ -283,26 +288,35 @@ msgstr "Detalles..."
 msgid "Disk space required"
 msgstr "Espacio requerido en disco"
 
-#: src/wx/kdm_dialog.cc:65
+#: src/wx/kdm_dialog.cc:68
 #, fuzzy
 msgid "Edit Cinema..."
 msgstr "Editar..."
 
-#: src/wx/kdm_dialog.cc:72
+#: src/wx/kdm_dialog.cc:75
 #, fuzzy
 msgid "Edit Screen..."
 msgstr "Editar..."
 
-#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:91
-#: src/wx/video_panel.cc:108
+#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174
 msgid "Edit..."
 msgstr "Editar..."
 
-#: src/wx/config_dialog.cc:62
+#: src/wx/servers_list_dialog.cc:30
+#, fuzzy
+msgid "Encoding Servers"
+msgstr "Servidores de codificación"
+
+#: src/wx/config_dialog.cc:61
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Servidores de codificación"
 
+#: src/wx/film_editor.cc:154
+msgid "Encrypted"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
@@ -315,11 +329,15 @@ msgstr "Propiedades de la película"
 msgid "Film name"
 msgstr "Nombre de la película"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:82
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
 msgid "Filters"
 msgstr "Filtros"
 
-#: src/wx/film_editor.cc:142
+#: src/wx/content_menu.cc:49
+msgid "Find missing..."
+msgstr ""
+
+#: src/wx/film_editor.cc:144
 #, fuzzy
 msgid "Frame Rate"
 msgstr "Velocidad DCP"
@@ -332,16 +350,16 @@ msgstr "Fotogramas"
 msgid "Frames already encoded"
 msgstr "Fotogramas ya codificados"
 
-#: src/wx/about_dialog.cc:60
+#: src/wx/about_dialog.cc:61
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Generación de DCP a partir de casi cualquier cosa, libre y de código abierto."
 
-#: src/wx/kdm_dialog.cc:82
+#: src/wx/kdm_dialog.cc:85
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:120
 msgid "From address for KDM emails"
 msgstr "Remitente para los emails de KDM"
 
@@ -353,11 +371,19 @@ msgstr "Calculadora de ganancia"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/hints_dialog.cc:26
+msgid "Hints"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:40
+msgid "Host"
+msgstr ""
+
+#: src/wx/server_dialog.cc:41
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
-#: src/wx/audio_panel.cc:273
+#: src/wx/audio_panel.cc:241
 msgid "Hz"
 msgstr "Hz"
 
@@ -365,31 +391,36 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Quiero reproducir con el fader a"
 
-#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:241
 msgid "IP address"
 msgstr "Dirección IP"
 
+#: src/wx/config_dialog.cc:313
+#, fuzzy
+msgid "IP address / host name"
+msgstr "Dirección IP"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr "Gamma de entrada"
 
-#: src/wx/film_editor.cc:217
+#: src/wx/film_editor.cc:219
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:281
+#: src/wx/config_dialog.cc:280
 msgid "Issuer"
 msgstr "Emisor"
 
-#: src/wx/film_editor.cc:171
+#: src/wx/film_editor.cc:173
 msgid "JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000"
 
-#: src/wx/config_dialog.cc:70
+#: src/wx/config_dialog.cc:69
 msgid "KDM email"
 msgstr "Email KDM"
 
-#: src/wx/film_editor.cc:284
+#: src/wx/film_editor.cc:286
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
 
@@ -397,7 +428,7 @@ msgstr "Mantener el video secuencia"
 msgid "L"
 msgstr ""
 
-#: src/wx/video_panel.cc:56
+#: src/wx/video_panel.cc:90
 msgid "Left crop"
 msgstr "Recorte izquierda"
 
@@ -418,11 +449,15 @@ msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:175
+#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/kdm_dialog.cc:44
+#: src/wx/film_editor.cc:711
+msgid "MISSING: "
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
 msgstr "Crear KDMs"
 
@@ -430,19 +465,24 @@ msgstr "Crear KDMs"
 msgid "Matrix"
 msgstr ""
 
-#: src/wx/config_dialog.cc:66
+#: src/wx/config_dialog.cc:65
 msgid "Metadata"
 msgstr ""
 
-#: src/wx/config_dialog.cc:60
+#: src/wx/config_dialog.cc:59
 msgid "Miscellaneous"
 msgstr "Varios"
 
+#: src/wx/video_panel.cc:279
+#, fuzzy
+msgid "Multiple content selected"
+msgstr "Tipo de contenido"
+
 #: src/wx/dir_picker_ctrl.cc:52
 msgid "My Documents"
 msgstr "Mis documentos"
 
-#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nombre"
@@ -451,15 +491,15 @@ msgstr "Nombre"
 msgid "New Film"
 msgstr "Nueva película"
 
-#: src/wx/video_panel.cc:132
+#: src/wx/video_panel.cc:198
 msgid "No stretch"
 msgstr "Sin deformar"
 
-#: src/wx/video_panel.cc:89 src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
 msgid "None"
 msgstr "Ninguno"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:116
 #, fuzzy
 msgid "Outgoing mail server"
 msgstr "Servidores de codificación"
@@ -472,17 +512,17 @@ msgstr "Gamma de salida"
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/video_panel.cc:332
+#: src/wx/video_panel.cc:326
 #, 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:254
+#: src/wx/config_dialog.cc:253
 #, fuzzy
 msgid "Password"
 msgstr "Clave del TMS"
 
-#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
+#: src/wx/job_manager_view.cc:72 src/wx/job_manager_view.cc:164
 msgid "Pause"
 msgstr "Pausa"
 
@@ -514,16 +554,16 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Clasificación (ej. 16)"
 
-#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:270
+#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
 msgid "Remove"
 msgstr "Quitar"
 
-#: src/wx/kdm_dialog.cc:67
+#: src/wx/kdm_dialog.cc:70
 #, fuzzy
 msgid "Remove Cinema"
 msgstr "Quitar"
 
-#: src/wx/kdm_dialog.cc:74
+#: src/wx/kdm_dialog.cc:77
 #, fuzzy
 msgid "Remove Screen"
 msgstr "Quitar"
@@ -537,19 +577,19 @@ msgstr "Repetir"
 msgid "Repeat Content"
 msgstr "Seleccionar fichero de contenido"
 
-#: src/wx/content_menu.cc:39
+#: src/wx/content_menu.cc:48
 msgid "Repeat..."
 msgstr "Repetir..."
 
-#: src/wx/film_editor.cc:165
+#: src/wx/film_editor.cc:167
 msgid "Resolution"
 msgstr "Resolución"
 
-#: src/wx/job_manager_view.cc:144
+#: src/wx/job_manager_view.cc:167
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/wx/video_panel.cc:61
+#: src/wx/video_panel.cc:101
 msgid "Right crop"
 msgstr "Recorte derecha"
 
@@ -558,21 +598,21 @@ msgstr "Recorte derecha"
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:216
+#: src/wx/film_editor.cc:218
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:76
+#: src/wx/video_panel.cc:134
 #, fuzzy
 msgid "Scale to"
 msgstr "Escalador"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:318
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Redimensionado a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Scaler"
 msgstr "Escalador"
 
@@ -581,11 +621,11 @@ msgstr "Escalador"
 msgid "Select Certificate File"
 msgstr "Seleccionar fichero de contenido"
 
-#: src/wx/kdm_dialog.cc:108
+#: src/wx/kdm_dialog.cc:136
 msgid "Send by email"
 msgstr "Enviar por email"
 
-#: src/wx/server_dialog.cc:27
+#: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Servidor"
 
@@ -593,11 +633,11 @@ msgstr "Servidor"
 msgid "Set"
 msgstr "Seleccionar"
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:95
 msgid "Set language"
 msgstr "Seleccionar idioma"
 
-#: src/wx/audio_panel.cc:46
+#: src/wx/audio_panel.cc:48
 msgid "Show Audio..."
 msgstr "Mostrar audio..."
 
@@ -609,7 +649,7 @@ msgstr "Suavizado"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:180
+#: src/wx/film_editor.cc:182
 msgid "Standard"
 msgstr "Estandard"
 
@@ -638,16 +678,16 @@ msgstr "Escala del subtítulo"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:124
+#: src/wx/about_dialog.cc:128
 msgid "Supported by"
 msgstr "Soportado por"
 
-#: src/wx/config_dialog.cc:68
+#: src/wx/config_dialog.cc:67
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:246
+#: src/wx/config_dialog.cc:245
 #, fuzzy
 msgid "Target path"
 msgstr "Ruta en el TMS"
@@ -656,15 +696,22 @@ msgstr "Ruta en el TMS"
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/content_menu.cc:178
+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 "
+"missing content."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:97
+msgid "There are no hints: everything looks good!"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Hilos"
 
-#: src/wx/server_dialog.cc:44
-msgid "Threads to use"
-msgstr "Hilos a utilizar"
-
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:112
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
@@ -677,7 +724,7 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:276
+#: src/wx/film_editor.cc:278
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
@@ -685,11 +732,11 @@ msgstr "Linea de tiempo..."
 msgid "Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:66
+#: src/wx/video_panel.cc:112
 msgid "Top crop"
 msgstr "Recortar arriba"
 
-#: src/wx/about_dialog.cc:99
+#: src/wx/about_dialog.cc:100
 msgid "Translated by"
 msgstr "Traducido por"
 
@@ -703,19 +750,23 @@ msgstr "Recortar fotogramas"
 msgid "Trim from start"
 msgstr "Recortar fotogramas"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:51
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/kdm_dialog.cc:88
+#: src/wx/kdm_dialog.cc:91
 msgid "Until"
 msgstr "Hasta"
 
-#: src/wx/film_editor.cc:125
+#: src/wx/film_editor.cc:127
 msgid "Use DCI name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/config_dialog.cc:309
+msgid "Use all servers"
+msgstr ""
+
+#: src/wx/film_editor.cc:148
 msgid "Use best"
 msgstr "Usar la mejor"
 
@@ -724,12 +775,12 @@ msgstr "Usar la mejor"
 msgid "Use preset"
 msgstr "Usar la mejor"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:249
 #, fuzzy
 msgid "User name"
 msgstr "Usar el nombre DCI"
 
-#: src/wx/video_panel.cc:44
+#: src/wx/video_panel.cc:70
 msgid "Video"
 msgstr "Vídeo"
 
@@ -737,20 +788,46 @@ msgstr "Vídeo"
 msgid "With Subtitles"
 msgstr "Con subtítulos"
 
-#: src/wx/kdm_dialog.cc:94
+#: src/wx/kdm_dialog.cc:122
 msgid "Write to"
 msgstr "Escribe a"
 
-#: src/wx/about_dialog.cc:90
+#: src/wx/about_dialog.cc:91
 msgid "Written by"
 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."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:76
+#, c-format
+msgid ""
+"Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
+"projectors.  Use 24 or 48 frames per second to be on the safe side."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:66
+msgid ""
+"Your DCP has an odd number of audio channels.  This is very likely to cause "
+"problems on playback."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:70
+msgid ""
+"Your DCP has fewer than 6 audio channels.  This may cause problems on some "
+"projectors."
+msgstr ""
+
 #: src/wx/timeline.cc:213
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:271
+#: src/wx/audio_panel.cc:239
 msgid "channels"
 msgstr "canales"
 
@@ -758,16 +835,16 @@ msgstr "canales"
 msgid "counting..."
 msgstr "contando..."
 
-#: src/wx/audio_panel.cc:56
+#: src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:69
+#: src/wx/audio_panel.cc:78
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:129
 msgid "s"
 msgstr "s"
 
@@ -784,6 +861,9 @@ msgstr ""
 msgid "video"
 msgstr "Vídeo"
 
+#~ msgid "Threads to use"
+#~ msgstr "Hilos a utilizar"
+
 #~ msgid "Add"
 #~ msgstr "Añadir"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 0a72bf97c..c832641ca 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,26 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-16 09:46+0100\n"
-"PO-Revision-Date: 2013-07-16 23:21+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
+"PO-Revision-Date: 2013-11-25 19:28+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 msgid "%"
 msgstr "%"
 
-#: src/wx/about_dialog.cc:77
+#: src/wx/about_dialog.cc:78
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:105
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr ""
 "(redémarrez DCP-o-matic pour que les changements de langue prennent effet)"
@@ -35,27 +36,27 @@ msgstr ""
 msgid "1 / "
 msgstr ""
 
-#: src/wx/audio_panel.cc:269
+#: src/wx/audio_panel.cc:237
 msgid "1 channel"
 msgstr "1 canal"
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:200
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:213
+#: src/wx/film_editor.cc:215
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:135
+#: src/wx/video_panel.cc:201
 msgid "3D left/right"
-msgstr ""
+msgstr "3D gauche/droite"
 
-#: src/wx/film_editor.cc:214
+#: src/wx/film_editor.cc:216
 msgid "4K"
 msgstr ""
 
@@ -63,31 +64,31 @@ msgstr ""
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:63
+#: src/wx/kdm_dialog.cc:66
 msgid "Add Cinema..."
-msgstr ""
+msgstr "Ajout cinéma"
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:73
 msgid "Add Screen..."
-msgstr ""
+msgstr "Ajout une salle"
 
-#: src/wx/film_editor.cc:266
+#: src/wx/film_editor.cc:268
 msgid "Add file(s)..."
-msgstr ""
+msgstr "Ajout fichier(s)..."
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:270
 msgid "Add folder..."
-msgstr ""
+msgstr "Ajout dossier..."
 
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:63
+#: src/wx/audio_panel.cc:67
 msgid "Audio Delay"
 msgstr "Délai audio"
 
-#: src/wx/audio_panel.cc:51
+#: src/wx/audio_panel.cc:52
 msgid "Audio Gain"
 msgstr "Gain audio"
 
@@ -95,21 +96,20 @@ msgstr "Gain audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Langue audio (ex. FR)"
 
-#: src/wx/audio_panel.cc:75
+#: src/wx/audio_panel.cc:81
 msgid "Audio Stream"
 msgstr "Flux audio"
 
-#: src/wx/film_editor.cc:156
-#, fuzzy
+#: src/wx/film_editor.cc:158
 msgid "Audio channels"
-msgstr "canaux audios du DCP"
+msgstr "Canaux audios"
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "Mauvais paramètre pour %s (%s)"
 
-#: src/wx/video_panel.cc:71
+#: src/wx/video_panel.cc:123
 msgid "Bottom crop"
 msgstr "Découpe bas"
 
@@ -125,11 +125,11 @@ msgstr "Je souhaite utiliser ce volume"
 msgid "C"
 msgstr "C"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Calcul..."
 
-#: src/wx/job_manager_view.cc:63
+#: src/wx/job_manager_view.cc:66
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -137,33 +137,37 @@ msgstr "Annuler"
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/wx/film_editor.cc:723
+#: src/wx/content_menu.cc:137
+#, fuzzy
+msgid "Choose a file"
+msgstr "Choisissez un dossier"
+
+#: src/wx/film_editor.cc:737
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/film_editor.cc:756
-#, fuzzy
+#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
 msgid "Choose a folder"
-msgstr "Choisissez un ou plusieurs fichiers"
+msgstr "Choisissez un dossier"
 
 #: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:98
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
 msgid "Colour conversion"
-msgstr ""
+msgstr "Conversion colorimétrique"
 
-#: src/wx/config_dialog.cc:64
+#: src/wx/config_dialog.cc:63
 msgid "Colour conversions"
-msgstr ""
+msgstr "Conversions colorimétriques"
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:133
 msgid "Container"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:86
 msgid "Content"
 msgstr "Contenu"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:138
 msgid "Content Type"
 msgstr "Type de Contenu"
 
@@ -171,26 +175,25 @@ msgstr "Type de Contenu"
 msgid "Content channel"
 msgstr "Contenu audio"
 
-#: src/wx/video_panel.cc:339
+#: src/wx/video_panel.cc:333
 #, c-format
 msgid "Content frame rate %.4f\n"
-msgstr ""
+msgstr "Cadence du contenu %.4f\n"
 
 #: src/wx/dci_metadata_dialog.cc:35
-#, fuzzy
 msgid "Content version"
-msgstr "Type de Contenu"
+msgstr "Version du contenu"
 
-#: src/wx/video_panel.cc:297
-#, fuzzy, c-format
+#: src/wx/video_panel.cc:291
+#, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
-msgstr "La vidéo originale est %dx%d (%.2f:1)\n"
+msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:132
+#: src/wx/audio_dialog.cc:136
 msgid "Could not analyse audio."
-msgstr ""
+msgstr "Analyse du son impossible"
 
-#: src/wx/film_viewer.cc:347
+#: src/wx/film_viewer.cc:336
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -204,36 +207,36 @@ msgstr "Impossible de créer le DCP : %s"
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/config_dialog.cc:285
+#: src/wx/config_dialog.cc:284
 msgid "Creator"
 msgstr "Créateur"
 
-#: src/wx/video_panel.cc:309
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Découpe de %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:242
 msgid "Custom"
-msgstr ""
+msgstr "Personnalisé"
 
 #: src/wx/dci_metadata_dialog.cc:30
 msgid "DCI name"
 msgstr "Nom DCI"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:117
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
-#: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
+#: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:52
 msgid "DCP-o-matic Preferences"
 msgstr "Préférences DCP-o-matic"
 
@@ -242,31 +245,31 @@ msgstr "Préférences DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Son DCP-o-matic  - %s"
 
-#: src/wx/config_dialog.cc:142
+#: src/wx/config_dialog.cc:141
 msgid "Default DCI name details"
 msgstr "Détails du nom DCI par défaut"
 
-#: src/wx/config_dialog.cc:155
+#: src/wx/config_dialog.cc:154
 msgid "Default JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 par défaut"
 
-#: src/wx/config_dialog.cc:146
+#: src/wx/config_dialog.cc:145
 msgid "Default container"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:150
+#: src/wx/config_dialog.cc:149
 msgid "Default content type"
 msgstr "Type de contenu par défaut"
 
-#: src/wx/config_dialog.cc:134
+#: src/wx/config_dialog.cc:133
 msgid "Default directory for new films"
 msgstr "Dossier par défaut des nouveaux films"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:125
 msgid "Default duration of still images"
 msgstr "Durée par défaut des images fixes"
 
-#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:75
+#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Détails..."
 
@@ -274,25 +277,32 @@ msgstr "Détails..."
 msgid "Disk space required"
 msgstr "Espace disque requis"
 
-#: src/wx/kdm_dialog.cc:65
-#, fuzzy
+#: src/wx/kdm_dialog.cc:68
 msgid "Edit Cinema..."
-msgstr "Éditer..."
+msgstr "Éditer le cinéma"
 
-#: src/wx/kdm_dialog.cc:72
-#, fuzzy
+#: src/wx/kdm_dialog.cc:75
 msgid "Edit Screen..."
-msgstr "Éditer..."
+msgstr "Éditer la salle"
 
-#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:91
-#: src/wx/video_panel.cc:108
+#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174
 msgid "Edit..."
 msgstr "Éditer..."
 
-#: src/wx/config_dialog.cc:62
+#: src/wx/servers_list_dialog.cc:30
+#, fuzzy
+msgid "Encoding Servers"
+msgstr "Serveurs d'encodage"
+
+#: src/wx/config_dialog.cc:61
 msgid "Encoding servers"
 msgstr "Serveurs d'encodage"
 
+#: src/wx/film_editor.cc:154
+msgid "Encrypted"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
@@ -305,14 +315,17 @@ msgstr "Propriétés du film"
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:82
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
 msgid "Filters"
 msgstr "Filtres"
 
-#: src/wx/film_editor.cc:142
-#, fuzzy
+#: src/wx/content_menu.cc:49
+msgid "Find missing..."
+msgstr ""
+
+#: src/wx/film_editor.cc:144
 msgid "Frame Rate"
-msgstr "Cadence image du DCP"
+msgstr "Cadence image"
 
 #: src/wx/properties_dialog.cc:41
 msgid "Frames"
@@ -322,15 +335,15 @@ msgstr "Images"
 msgid "Frames already encoded"
 msgstr "Images déjà encodées"
 
-#: src/wx/about_dialog.cc:60
+#: src/wx/about_dialog.cc:61
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et gratuit depuis presque tout."
 
-#: src/wx/kdm_dialog.cc:82
+#: src/wx/kdm_dialog.cc:85
 msgid "From"
-msgstr ""
+msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:120
 msgid "From address for KDM emails"
 msgstr ""
 
@@ -342,11 +355,19 @@ msgstr "Calculateur de gain"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/hints_dialog.cc:26
+msgid "Hints"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:40
+msgid "Host"
+msgstr ""
+
+#: src/wx/server_dialog.cc:41
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
-#: src/wx/audio_panel.cc:273
+#: src/wx/audio_panel.cc:241
 msgid "Hz"
 msgstr "Hz"
 
@@ -354,39 +375,44 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:241
 msgid "IP address"
 msgstr "Adresse IP"
 
+#: src/wx/config_dialog.cc:313
+#, fuzzy
+msgid "IP address / host name"
+msgstr "Adresse IP"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
-msgstr ""
+msgstr "Gamma d'entrée"
 
-#: src/wx/film_editor.cc:217
+#: src/wx/film_editor.cc:219
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:281
+#: src/wx/config_dialog.cc:280
 msgid "Issuer"
 msgstr "Emetteur"
 
-#: src/wx/film_editor.cc:171
+#: src/wx/film_editor.cc:173
 msgid "JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000"
 
-#: src/wx/config_dialog.cc:70
+#: src/wx/config_dialog.cc:69
 msgid "KDM email"
-msgstr ""
+msgstr "e-mail des KDM"
 
-#: src/wx/film_editor.cc:284
+#: src/wx/film_editor.cc:286
 msgid "Keep video in sequence"
-msgstr ""
+msgstr "Garder la vidéo en séquence"
 
 #: src/wx/audio_mapping_view.cc:183
 msgid "L"
 msgstr "L"
 
-#: src/wx/video_panel.cc:56
+#: src/wx/video_panel.cc:90
 msgid "Left crop"
 msgstr "Découpe gauche"
 
@@ -400,37 +426,46 @@ msgstr "Lfe"
 
 #: src/wx/colour_conversion_editor.cc:49
 msgid "Linearise input gamma curve for low values"
-msgstr ""
+msgstr "Linéariser la courbe gamma d'entrée pour les bas niveaux"
 
 #: src/wx/audio_mapping_view.cc:199
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:175
+#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/kdm_dialog.cc:44
-msgid "Make KDMs"
+#: src/wx/film_editor.cc:711
+msgid "MISSING: "
 msgstr ""
 
+#: src/wx/kdm_dialog.cc:47
+msgid "Make KDMs"
+msgstr "Générer les KDMs"
+
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
-msgstr ""
+msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:66
+#: src/wx/config_dialog.cc:65
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: src/wx/config_dialog.cc:60
+#: src/wx/config_dialog.cc:59
 msgid "Miscellaneous"
 msgstr "Divers"
 
+#: src/wx/video_panel.cc:279
+#, fuzzy
+msgid "Multiple content selected"
+msgstr "Type de contenu par défaut"
+
 #: src/wx/dir_picker_ctrl.cc:52
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nom"
@@ -439,37 +474,36 @@ msgstr "Nom"
 msgid "New Film"
 msgstr "Nouveau Film"
 
-#: src/wx/video_panel.cc:132
+#: src/wx/video_panel.cc:198
 msgid "No stretch"
-msgstr ""
+msgstr "Pas d'étirement"
 
-#: src/wx/video_panel.cc:89 src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
 msgid "None"
 msgstr "Aucun"
 
-#: src/wx/config_dialog.cc:117
-#, fuzzy
+#: src/wx/config_dialog.cc:116
 msgid "Outgoing mail server"
-msgstr "Serveurs d'encodage"
+msgstr "Serveurs de messagerie sortante"
 
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
-msgstr ""
+msgstr "Gamma de sortie"
 
 #: src/wx/dci_metadata_dialog.cc:63
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/video_panel.cc:332
+#: src/wx/video_panel.cc:326
 #, 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:254
+#: src/wx/config_dialog.cc:253
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
+#: src/wx/job_manager_view.cc:72 src/wx/job_manager_view.cc:164
 msgid "Pause"
 msgstr "Pause"
 
@@ -487,7 +521,7 @@ msgstr "Merci de patienter ; analyse de la piste son..."
 
 #: src/wx/timing_panel.cc:37
 msgid "Position"
-msgstr ""
+msgstr "Position"
 
 #: src/wx/audio_mapping_view.cc:187
 msgid "R"
@@ -501,42 +535,39 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Rating (ex. 15)"
 
-#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:270
+#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
 msgid "Remove"
 msgstr "Supprimer"
 
-#: src/wx/kdm_dialog.cc:67
-#, fuzzy
+#: src/wx/kdm_dialog.cc:70
 msgid "Remove Cinema"
-msgstr "Supprimer"
+msgstr "Supprimer le cinéma"
 
-#: src/wx/kdm_dialog.cc:74
-#, fuzzy
+#: src/wx/kdm_dialog.cc:77
 msgid "Remove Screen"
-msgstr "Supprimer"
+msgstr "Supprimer la salle"
 
 #: src/wx/repeat_dialog.cc:33
 msgid "Repeat"
-msgstr ""
+msgstr "Répéter"
 
 #: src/wx/repeat_dialog.cc:24
-#, fuzzy
 msgid "Repeat Content"
-msgstr "Sélectionner le fichier vidéo"
+msgstr "Répéter le contenu"
 
-#: src/wx/content_menu.cc:39
+#: src/wx/content_menu.cc:48
 msgid "Repeat..."
-msgstr ""
+msgstr "Répéter..."
 
-#: src/wx/film_editor.cc:165
+#: src/wx/film_editor.cc:167
 msgid "Resolution"
-msgstr ""
+msgstr "Résolution"
 
-#: src/wx/job_manager_view.cc:144
+#: src/wx/job_manager_view.cc:167
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/wx/video_panel.cc:61
+#: src/wx/video_panel.cc:101
 msgid "Right crop"
 msgstr "Découpe droite"
 
@@ -544,45 +575,44 @@ msgstr "Découpe droite"
 msgid "Rs"
 msgstr "Rs"
 
-#: src/wx/film_editor.cc:216
+#: src/wx/film_editor.cc:218
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:76
+#: src/wx/video_panel.cc:134
 msgid "Scale to"
 msgstr "Mise à l'échelle"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:318
 #, 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:185
+#: src/wx/film_editor.cc:187
 msgid "Scaler"
 msgstr "Mise à l'échelle"
 
 #: src/wx/screen_dialog.cc:88
-#, fuzzy
 msgid "Select Certificate File"
-msgstr "Sélectionner le fichier vidéo"
+msgstr "Sélectionner le certificat"
 
-#: src/wx/kdm_dialog.cc:108
+#: src/wx/kdm_dialog.cc:136
 msgid "Send by email"
-msgstr ""
+msgstr "Envoyé par e-mail"
 
-#: src/wx/server_dialog.cc:27
+#: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Serveur"
 
 #: src/wx/timecode.cc:65
 msgid "Set"
-msgstr ""
+msgstr "Sélection"
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:95
 msgid "Set language"
 msgstr "Selectionnez la langue"
 
-#: src/wx/audio_panel.cc:46
+#: src/wx/audio_panel.cc:48
 msgid "Show Audio..."
 msgstr "Analyser le son..."
 
@@ -594,9 +624,9 @@ msgstr "Lissage"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:180
+#: src/wx/film_editor.cc:182
 msgid "Standard"
-msgstr ""
+msgstr "Standard"
 
 #: src/wx/dci_metadata_dialog.cc:55
 msgid "Studio (e.g. TCF)"
@@ -622,15 +652,15 @@ msgstr "Flux de sous-titre"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:124
+#: src/wx/about_dialog.cc:128
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:68
+#: src/wx/config_dialog.cc:67
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:246
+#: src/wx/config_dialog.cc:245
 msgid "Target path"
 msgstr "Chemin d'accès"
 
@@ -638,15 +668,22 @@ msgstr "Chemin d'accès"
 msgid "Territory (e.g. UK)"
 msgstr "Territoire (ex. FR)"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/content_menu.cc:178
+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 "
+"missing content."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:97
+msgid "There are no hints: everything looks good!"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Processus"
 
-#: src/wx/server_dialog.cc:44
-msgid "Threads to use"
-msgstr "Nombre de processus à utiliser"
-
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:112
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
@@ -658,7 +695,7 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:276
+#: src/wx/film_editor.cc:278
 msgid "Timeline..."
 msgstr "Timeline..."
 
@@ -666,50 +703,51 @@ msgstr "Timeline..."
 msgid "Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:66
+#: src/wx/video_panel.cc:112
 msgid "Top crop"
 msgstr "Découpe haut"
 
-#: src/wx/about_dialog.cc:99
+#: src/wx/about_dialog.cc:100
 msgid "Translated by"
 msgstr "Traduit par"
 
 #: src/wx/timing_panel.cc:46
-#, fuzzy
 msgid "Trim from end"
-msgstr "Images coupées"
+msgstr "Images coupées depuis la fin"
 
 #: src/wx/timing_panel.cc:43
-#, fuzzy
 msgid "Trim from start"
-msgstr "Images coupées"
+msgstr "Images coupées depuis le début"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:51
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
 msgid "Type"
 msgstr "Type"
 
-#: src/wx/kdm_dialog.cc:88
+#: src/wx/kdm_dialog.cc:91
 msgid "Until"
-msgstr ""
+msgstr "Jusqu'au"
 
-#: src/wx/film_editor.cc:125
+#: src/wx/film_editor.cc:127
 msgid "Use DCI name"
 msgstr "Utiliser le nom DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/config_dialog.cc:309
+msgid "Use all servers"
+msgstr ""
+
+#: src/wx/film_editor.cc:148
 msgid "Use best"
 msgstr "Automatique"
 
 #: src/wx/content_colour_conversion_dialog.cc:41
-#, fuzzy
 msgid "Use preset"
-msgstr "Automatique"
+msgstr "Utiliser le préréglage"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:249
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
-#: src/wx/video_panel.cc:44
+#: src/wx/video_panel.cc:70
 msgid "Video"
 msgstr "Vidéo"
 
@@ -717,20 +755,45 @@ msgstr "Vidéo"
 msgid "With Subtitles"
 msgstr "Avec sous-titres"
 
-#: src/wx/kdm_dialog.cc:94
-#, fuzzy
+#: src/wx/kdm_dialog.cc:122
 msgid "Write to"
-msgstr "Développé par"
+msgstr ""
 
-#: src/wx/about_dialog.cc:90
+#: src/wx/about_dialog.cc:91
 msgid "Written by"
 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."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:76
+#, c-format
+msgid ""
+"Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
+"projectors.  Use 24 or 48 frames per second to be on the safe side."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:66
+msgid ""
+"Your DCP has an odd number of audio channels.  This is very likely to cause "
+"problems on playback."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:70
+msgid ""
+"Your DCP has fewer than 6 audio channels.  This may cause problems on some "
+"projectors."
+msgstr ""
+
 #: src/wx/timeline.cc:213
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:271
+#: src/wx/audio_panel.cc:239
 msgid "channels"
 msgstr "canaux"
 
@@ -738,16 +801,16 @@ msgstr "canaux"
 msgid "counting..."
 msgstr "calcul..."
 
-#: src/wx/audio_panel.cc:56
+#: src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:69
+#: src/wx/audio_panel.cc:78
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:129
 msgid "s"
 msgstr "s"
 
@@ -763,6 +826,9 @@ msgstr ""
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Threads to use"
+#~ msgstr "Nombre de processus à utiliser"
+
 #~ msgid "Add"
 #~ msgstr "Ajouter"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 9728614f1..d14ed4f88 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-10-16 09:46+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
 "PO-Revision-Date: 2013-04-28 10:27+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "%"
 msgstr "%"
 
-#: src/wx/about_dialog.cc:77
+#: src/wx/about_dialog.cc:78
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:105
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 
@@ -34,27 +34,27 @@ msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
 msgid "1 / "
 msgstr ""
 
-#: src/wx/audio_panel.cc:269
+#: src/wx/audio_panel.cc:237
 msgid "1 channel"
 msgstr "1 canale"
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:200
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:213
+#: src/wx/film_editor.cc:215
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:135
+#: src/wx/video_panel.cc:201
 msgid "3D left/right"
 msgstr ""
 
-#: src/wx/film_editor.cc:214
+#: src/wx/film_editor.cc:216
 msgid "4K"
 msgstr ""
 
@@ -63,19 +63,19 @@ msgstr ""
 msgid "About DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:63
+#: src/wx/kdm_dialog.cc:66
 msgid "Add Cinema..."
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:73
 msgid "Add Screen..."
 msgstr ""
 
-#: src/wx/film_editor.cc:266
+#: src/wx/film_editor.cc:268
 msgid "Add file(s)..."
 msgstr ""
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:270
 msgid "Add folder..."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:63
+#: src/wx/audio_panel.cc:67
 msgid "Audio Delay"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/audio_panel.cc:51
+#: src/wx/audio_panel.cc:52
 msgid "Audio Gain"
 msgstr "Guadagno dell'audio"
 
@@ -95,12 +95,12 @@ msgstr "Guadagno dell'audio"
 msgid "Audio Language (e.g. EN)"
 msgstr "Lingua dell'audio (es. EN)"
 
-#: src/wx/audio_panel.cc:75
+#: src/wx/audio_panel.cc:81
 #, fuzzy
 msgid "Audio Stream"
 msgstr "Ritardo dell'audio"
 
-#: src/wx/film_editor.cc:156
+#: src/wx/film_editor.cc:158
 #, fuzzy
 msgid "Audio channels"
 msgstr "canali"
@@ -110,7 +110,7 @@ msgstr "canali"
 msgid "Bad setting for %s (%s)"
 msgstr "Valore sbagliato per %s (%s)"
 
-#: src/wx/video_panel.cc:71
+#: src/wx/video_panel.cc:123
 msgid "Bottom crop"
 msgstr "Taglio in basso"
 
@@ -126,11 +126,11 @@ msgstr "Ma dovrò riprodurre con il fader a"
 msgid "C"
 msgstr ""
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Calcola..."
 
-#: src/wx/job_manager_view.cc:63
+#: src/wx/job_manager_view.cc:66
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -138,34 +138,39 @@ msgstr "Annulla"
 msgid "Channels"
 msgstr "Canali"
 
-#: src/wx/film_editor.cc:723
+#: src/wx/content_menu.cc:137
+#, fuzzy
+msgid "Choose a file"
+msgstr "Crea nella cartella"
+
+#: src/wx/film_editor.cc:737
 msgid "Choose a file or files"
 msgstr ""
 
-#: src/wx/film_editor.cc:756
+#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
 #, fuzzy
 msgid "Choose a folder"
 msgstr "Crea nella cartella"
 
 #: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:98
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
 msgid "Colour conversion"
 msgstr ""
 
-#: src/wx/config_dialog.cc:64
+#: src/wx/config_dialog.cc:63
 msgid "Colour conversions"
 msgstr ""
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:133
 #, fuzzy
 msgid "Container"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:86
 msgid "Content"
 msgstr "Contenuto"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:138
 msgid "Content Type"
 msgstr "Tipo di contenuto"
 
@@ -174,7 +179,7 @@ msgstr "Tipo di contenuto"
 msgid "Content channel"
 msgstr "1 canale"
 
-#: src/wx/video_panel.cc:339
+#: src/wx/video_panel.cc:333
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr ""
@@ -184,16 +189,16 @@ msgstr ""
 msgid "Content version"
 msgstr "Tipo di contenuto"
 
-#: src/wx/video_panel.cc:297
+#: src/wx/video_panel.cc:291
 #, fuzzy, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Il video originale è %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:132
+#: src/wx/audio_dialog.cc:136
 msgid "Could not analyse audio."
 msgstr ""
 
-#: src/wx/film_viewer.cc:347
+#: src/wx/film_viewer.cc:336
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -207,17 +212,17 @@ msgstr "Non posso creare il DCP: %s"
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/config_dialog.cc:285
+#: src/wx/config_dialog.cc:284
 #, fuzzy
 msgid "Creator"
 msgstr "Crea nella cartella"
 
-#: src/wx/video_panel.cc:309
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Tagliato da %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:242
 msgid "Custom"
 msgstr ""
 
@@ -225,19 +230,19 @@ msgstr ""
 msgid "DCI name"
 msgstr "Nome del DCP"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:117
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
-#: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
+#: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:52
 msgid "DCP-o-matic Preferences"
 msgstr "Preferenze DCP-o-matic"
 
@@ -246,35 +251,35 @@ msgstr "Preferenze DCP-o-matic"
 msgid "DCP-o-matic audio - %s"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:142
+#: src/wx/config_dialog.cc:141
 msgid "Default DCI name details"
 msgstr "Dettagli del nome di default DCI"
 
-#: src/wx/config_dialog.cc:155
+#: src/wx/config_dialog.cc:154
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:146
+#: src/wx/config_dialog.cc:145
 #, fuzzy
 msgid "Default container"
 msgstr "Tipo di contenuto"
 
-#: src/wx/config_dialog.cc:150
+#: src/wx/config_dialog.cc:149
 #, fuzzy
 msgid "Default content type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/config_dialog.cc:134
+#: src/wx/config_dialog.cc:133
 msgid "Default directory for new films"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:125
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Directory di default per i nuovi films"
 
-#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:75
+#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Dettagli"
 
@@ -282,26 +287,35 @@ msgstr "Dettagli"
 msgid "Disk space required"
 msgstr "Spazio su disco rischiesto"
 
-#: src/wx/kdm_dialog.cc:65
+#: src/wx/kdm_dialog.cc:68
 #, fuzzy
 msgid "Edit Cinema..."
 msgstr "Modifica..."
 
-#: src/wx/kdm_dialog.cc:72
+#: src/wx/kdm_dialog.cc:75
 #, fuzzy
 msgid "Edit Screen..."
 msgstr "Modifica..."
 
-#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:91
-#: src/wx/video_panel.cc:108
+#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174
 msgid "Edit..."
 msgstr "Modifica..."
 
-#: src/wx/config_dialog.cc:62
+#: src/wx/servers_list_dialog.cc:30
+#, fuzzy
+msgid "Encoding Servers"
+msgstr "Servers di codifica"
+
+#: src/wx/config_dialog.cc:61
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Servers di codifica"
 
+#: src/wx/film_editor.cc:154
+msgid "Encrypted"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
@@ -314,11 +328,15 @@ msgstr "Proprietà del film"
 msgid "Film name"
 msgstr "Nome del film"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:82
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
 msgid "Filters"
 msgstr "Filtri"
 
-#: src/wx/film_editor.cc:142
+#: src/wx/content_menu.cc:49
+msgid "Find missing..."
+msgstr ""
+
+#: src/wx/film_editor.cc:144
 #, fuzzy
 msgid "Frame Rate"
 msgstr "Frequenza fotogrammi del DCP"
@@ -331,15 +349,15 @@ msgstr "Fotogrammi"
 msgid "Frames already encoded"
 msgstr "Fotogrammi già codificati"
 
-#: src/wx/about_dialog.cc:60
+#: src/wx/about_dialog.cc:61
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:82
+#: src/wx/kdm_dialog.cc:85
 msgid "From"
 msgstr ""
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:120
 msgid "From address for KDM emails"
 msgstr ""
 
@@ -351,11 +369,19 @@ msgstr "Calcolatore del guadagno audio"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/hints_dialog.cc:26
+msgid "Hints"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:40
+msgid "Host"
+msgstr ""
+
+#: src/wx/server_dialog.cc:41
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
-#: src/wx/audio_panel.cc:273
+#: src/wx/audio_panel.cc:241
 msgid "Hz"
 msgstr "Hz"
 
@@ -363,31 +389,36 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Sto usando il fader a"
 
-#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:241
 msgid "IP address"
 msgstr "Indirizzo IP"
 
+#: src/wx/config_dialog.cc:313
+#, fuzzy
+msgid "IP address / host name"
+msgstr "Indirizzo IP"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr ""
 
-#: src/wx/film_editor.cc:217
+#: src/wx/film_editor.cc:219
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:281
+#: src/wx/config_dialog.cc:280
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:171
+#: src/wx/film_editor.cc:173
 msgid "JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:70
+#: src/wx/config_dialog.cc:69
 msgid "KDM email"
 msgstr ""
 
-#: src/wx/film_editor.cc:284
+#: src/wx/film_editor.cc:286
 msgid "Keep video in sequence"
 msgstr ""
 
@@ -395,7 +426,7 @@ msgstr ""
 msgid "L"
 msgstr ""
 
-#: src/wx/video_panel.cc:56
+#: src/wx/video_panel.cc:90
 msgid "Left crop"
 msgstr "Taglio a sinistra"
 
@@ -416,11 +447,15 @@ msgstr ""
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:175
+#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/kdm_dialog.cc:44
+#: src/wx/film_editor.cc:711
+msgid "MISSING: "
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
 msgstr ""
 
@@ -428,19 +463,24 @@ msgstr ""
 msgid "Matrix"
 msgstr ""
 
-#: src/wx/config_dialog.cc:66
+#: src/wx/config_dialog.cc:65
 msgid "Metadata"
 msgstr ""
 
-#: src/wx/config_dialog.cc:60
+#: src/wx/config_dialog.cc:59
 msgid "Miscellaneous"
 msgstr ""
 
+#: src/wx/video_panel.cc:279
+#, fuzzy
+msgid "Multiple content selected"
+msgstr "Tipo di contenuto"
+
 #: src/wx/dir_picker_ctrl.cc:52
 msgid "My Documents"
 msgstr "Documenti"
 
-#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Nome"
@@ -449,15 +489,15 @@ msgstr "Nome"
 msgid "New Film"
 msgstr "Nuovo Film"
 
-#: src/wx/video_panel.cc:132
+#: src/wx/video_panel.cc:198
 msgid "No stretch"
 msgstr ""
 
-#: src/wx/video_panel.cc:89 src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
 msgid "None"
 msgstr "Nessuno"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:116
 #, fuzzy
 msgid "Outgoing mail server"
 msgstr "Servers di codifica"
@@ -470,17 +510,17 @@ msgstr ""
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/video_panel.cc:332
+#: src/wx/video_panel.cc:326
 #, 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:254
+#: src/wx/config_dialog.cc:253
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
 
-#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
+#: src/wx/job_manager_view.cc:72 src/wx/job_manager_view.cc:164
 msgid "Pause"
 msgstr ""
 
@@ -512,16 +552,16 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Classificazione (es. 15)"
 
-#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:270
+#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: src/wx/kdm_dialog.cc:67
+#: src/wx/kdm_dialog.cc:70
 #, fuzzy
 msgid "Remove Cinema"
 msgstr "Rimuovi"
 
-#: src/wx/kdm_dialog.cc:74
+#: src/wx/kdm_dialog.cc:77
 #, fuzzy
 msgid "Remove Screen"
 msgstr "Rimuovi"
@@ -535,19 +575,19 @@ msgstr ""
 msgid "Repeat Content"
 msgstr "Seleziona il file con il contenuto"
 
-#: src/wx/content_menu.cc:39
+#: src/wx/content_menu.cc:48
 msgid "Repeat..."
 msgstr ""
 
-#: src/wx/film_editor.cc:165
+#: src/wx/film_editor.cc:167
 msgid "Resolution"
 msgstr ""
 
-#: src/wx/job_manager_view.cc:144
+#: src/wx/job_manager_view.cc:167
 msgid "Resume"
 msgstr ""
 
-#: src/wx/video_panel.cc:61
+#: src/wx/video_panel.cc:101
 msgid "Right crop"
 msgstr "Taglio a destra"
 
@@ -556,21 +596,21 @@ msgstr "Taglio a destra"
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:216
+#: src/wx/film_editor.cc:218
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:76
+#: src/wx/video_panel.cc:134
 #, fuzzy
 msgid "Scale to"
 msgstr "Scaler"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:318
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Scalato a %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Scaler"
 msgstr "Scaler"
 
@@ -579,11 +619,11 @@ msgstr "Scaler"
 msgid "Select Certificate File"
 msgstr "Seleziona il file con il contenuto"
 
-#: src/wx/kdm_dialog.cc:108
+#: src/wx/kdm_dialog.cc:136
 msgid "Send by email"
 msgstr ""
 
-#: src/wx/server_dialog.cc:27
+#: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
@@ -591,11 +631,11 @@ msgstr "Server"
 msgid "Set"
 msgstr ""
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:95
 msgid "Set language"
 msgstr "Seleziona la lingua"
 
-#: src/wx/audio_panel.cc:46
+#: src/wx/audio_panel.cc:48
 msgid "Show Audio..."
 msgstr "Mostra Audio..."
 
@@ -607,7 +647,7 @@ msgstr "Levigatura"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:180
+#: src/wx/film_editor.cc:182
 msgid "Standard"
 msgstr ""
 
@@ -636,16 +676,16 @@ msgstr "Scala dei Sottotitoli"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:124
+#: src/wx/about_dialog.cc:128
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:68
+#: src/wx/config_dialog.cc:67
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:246
+#: src/wx/config_dialog.cc:245
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
@@ -654,15 +694,22 @@ msgstr "Percorso di destinazione del TMS"
 msgid "Territory (e.g. UK)"
 msgstr "Nazione (es. UK)"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/content_menu.cc:178
+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 "
+"missing content."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:97
+msgid "There are no hints: everything looks good!"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Threads"
 
-#: src/wx/server_dialog.cc:44
-msgid "Threads to use"
-msgstr "Threads da usare"
-
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:112
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
@@ -675,7 +722,7 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Tempo"
 
-#: src/wx/film_editor.cc:276
+#: src/wx/film_editor.cc:278
 msgid "Timeline..."
 msgstr ""
 
@@ -683,11 +730,11 @@ msgstr ""
 msgid "Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:66
+#: src/wx/video_panel.cc:112
 msgid "Top crop"
 msgstr "Taglio in alto"
 
-#: src/wx/about_dialog.cc:99
+#: src/wx/about_dialog.cc:100
 msgid "Translated by"
 msgstr ""
 
@@ -701,19 +748,23 @@ msgstr "Taglia fotogrammi"
 msgid "Trim from start"
 msgstr "Taglia fotogrammi"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:51
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
 msgid "Type"
 msgstr "Tipo"
 
-#: src/wx/kdm_dialog.cc:88
+#: src/wx/kdm_dialog.cc:91
 msgid "Until"
 msgstr ""
 
-#: src/wx/film_editor.cc:125
+#: src/wx/film_editor.cc:127
 msgid "Use DCI name"
 msgstr "Usa nome DCI"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/config_dialog.cc:309
+msgid "Use all servers"
+msgstr ""
+
+#: src/wx/film_editor.cc:148
 msgid "Use best"
 msgstr "Usa la migliore"
 
@@ -722,12 +773,12 @@ msgstr "Usa la migliore"
 msgid "Use preset"
 msgstr "Usa la migliore"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:249
 #, fuzzy
 msgid "User name"
 msgstr "Usa nome DCI"
 
-#: src/wx/video_panel.cc:44
+#: src/wx/video_panel.cc:70
 msgid "Video"
 msgstr "Video"
 
@@ -735,20 +786,46 @@ msgstr "Video"
 msgid "With Subtitles"
 msgstr "Con sottotitoli"
 
-#: src/wx/kdm_dialog.cc:94
+#: src/wx/kdm_dialog.cc:122
 msgid "Write to"
 msgstr ""
 
-#: src/wx/about_dialog.cc:90
+#: src/wx/about_dialog.cc:91
 msgid "Written by"
 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."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:76
+#, c-format
+msgid ""
+"Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
+"projectors.  Use 24 or 48 frames per second to be on the safe side."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:66
+msgid ""
+"Your DCP has an odd number of audio channels.  This is very likely to cause "
+"problems on playback."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:70
+msgid ""
+"Your DCP has fewer than 6 audio channels.  This may cause problems on some "
+"projectors."
+msgstr ""
+
 #: src/wx/timeline.cc:213
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:271
+#: src/wx/audio_panel.cc:239
 msgid "channels"
 msgstr "canali"
 
@@ -756,16 +833,16 @@ msgstr "canali"
 msgid "counting..."
 msgstr "conteggio..."
 
-#: src/wx/audio_panel.cc:56
+#: src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:69
+#: src/wx/audio_panel.cc:78
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:129
 msgid "s"
 msgstr "s"
 
@@ -782,6 +859,9 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Threads to use"
+#~ msgstr "Threads da usare"
+
 #~ msgid "Add"
 #~ msgstr "Aggiungi"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 7fad36008..748bb9946 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-10-16 09:46+0100\n"
+"POT-Creation-Date: 2013-11-26 22:26+0000\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -21,12 +21,12 @@ msgstr ""
 msgid "%"
 msgstr "%"
 
-#: src/wx/about_dialog.cc:77
+#: src/wx/about_dialog.cc:78
 msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/wx/config_dialog.cc:106
+#: src/wx/config_dialog.cc:105
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(starta om DCP-o-matic för att se språkändringar)"
 
@@ -34,27 +34,27 @@ msgstr "(starta om DCP-o-matic för att se språkändringar)"
 msgid "1 / "
 msgstr ""
 
-#: src/wx/audio_panel.cc:269
+#: src/wx/audio_panel.cc:237
 msgid "1 channel"
 msgstr "1 kanal"
 
-#: src/wx/video_panel.cc:134
+#: src/wx/video_panel.cc:200
 msgid "2D"
 msgstr ""
 
-#: src/wx/film_editor.cc:213
+#: src/wx/film_editor.cc:215
 msgid "2K"
 msgstr ""
 
-#: src/wx/film_editor.cc:161
+#: src/wx/film_editor.cc:163
 msgid "3D"
 msgstr ""
 
-#: src/wx/video_panel.cc:135
+#: src/wx/video_panel.cc:201
 msgid "3D left/right"
 msgstr ""
 
-#: src/wx/film_editor.cc:214
+#: src/wx/film_editor.cc:216
 msgid "4K"
 msgstr ""
 
@@ -63,19 +63,19 @@ msgstr ""
 msgid "About DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/kdm_dialog.cc:63
+#: src/wx/kdm_dialog.cc:66
 msgid "Add Cinema..."
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:73
 msgid "Add Screen..."
 msgstr ""
 
-#: src/wx/film_editor.cc:266
+#: src/wx/film_editor.cc:268
 msgid "Add file(s)..."
 msgstr ""
 
-#: src/wx/film_editor.cc:268
+#: src/wx/film_editor.cc:270
 msgid "Add folder..."
 msgstr ""
 
@@ -83,11 +83,11 @@ msgstr ""
 msgid "Audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:63
+#: src/wx/audio_panel.cc:67
 msgid "Audio Delay"
 msgstr "Audio Fördröjning"
 
-#: src/wx/audio_panel.cc:51
+#: src/wx/audio_panel.cc:52
 msgid "Audio Gain"
 msgstr "Audio Förstärkning"
 
@@ -95,12 +95,12 @@ msgstr "Audio Förstärkning"
 msgid "Audio Language (e.g. EN)"
 msgstr "Audio Språk (ex. SV)"
 
-#: src/wx/audio_panel.cc:75
+#: src/wx/audio_panel.cc:81
 #, fuzzy
 msgid "Audio Stream"
 msgstr "Audio Fördröjning"
 
-#: src/wx/film_editor.cc:156
+#: src/wx/film_editor.cc:158
 #, fuzzy
 msgid "Audio channels"
 msgstr "kanaler"
@@ -110,7 +110,7 @@ msgstr "kanaler"
 msgid "Bad setting for %s (%s)"
 msgstr "Felaktig inställning för %s (%s)"
 
-#: src/wx/video_panel.cc:71
+#: src/wx/video_panel.cc:123
 msgid "Bottom crop"
 msgstr "Nedre beskärning"
 
@@ -126,11 +126,11 @@ msgstr "Men jag måste använda mixervolym"
 msgid "C"
 msgstr ""
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:63
 msgid "Calculate..."
 msgstr "Beräkna..."
 
-#: src/wx/job_manager_view.cc:63
+#: src/wx/job_manager_view.cc:66
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -138,34 +138,39 @@ msgstr "Avbryt"
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/wx/film_editor.cc:723
+#: src/wx/content_menu.cc:137
+#, fuzzy
+msgid "Choose a file"
+msgstr "Skapa i katalog"
+
+#: src/wx/film_editor.cc:737
 msgid "Choose a file or files"
 msgstr ""
 
-#: src/wx/film_editor.cc:756
+#: src/wx/content_menu.cc:130 src/wx/film_editor.cc:760
 #, fuzzy
 msgid "Choose a folder"
 msgstr "Skapa i katalog"
 
 #: src/wx/content_colour_conversion_dialog.cc:33
-#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:98
+#: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:164
 msgid "Colour conversion"
 msgstr ""
 
-#: src/wx/config_dialog.cc:64
+#: src/wx/config_dialog.cc:63
 msgid "Colour conversions"
 msgstr ""
 
-#: src/wx/film_editor.cc:131
+#: src/wx/film_editor.cc:133
 #, fuzzy
 msgid "Container"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:84
+#: src/wx/film_editor.cc:86
 msgid "Content"
 msgstr "Innehåll"
 
-#: src/wx/film_editor.cc:136
+#: src/wx/film_editor.cc:138
 msgid "Content Type"
 msgstr "Innehållstyp"
 
@@ -174,7 +179,7 @@ msgstr "Innehållstyp"
 msgid "Content channel"
 msgstr "1 kanal"
 
-#: src/wx/video_panel.cc:339
+#: src/wx/video_panel.cc:333
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr ""
@@ -184,16 +189,16 @@ msgstr ""
 msgid "Content version"
 msgstr "Innehållstyp"
 
-#: src/wx/video_panel.cc:297
+#: src/wx/video_panel.cc:291
 #, fuzzy, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Original-videon är %dx%d (%.2f:1)\n"
 
-#: src/wx/audio_dialog.cc:132
+#: src/wx/audio_dialog.cc:136
 msgid "Could not analyse audio."
 msgstr ""
 
-#: src/wx/film_viewer.cc:347
+#: src/wx/film_viewer.cc:336
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -207,17 +212,17 @@ msgstr "Kunde inte skapa DCP: %s"
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
-#: src/wx/config_dialog.cc:285
+#: src/wx/config_dialog.cc:284
 #, fuzzy
 msgid "Creator"
 msgstr "Skapa i katalog"
 
-#: src/wx/video_panel.cc:309
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beskuren till %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:248
+#: src/wx/video_panel.cc:242
 msgid "Custom"
 msgstr ""
 
@@ -225,19 +230,19 @@ msgstr ""
 msgid "DCI name"
 msgstr "DCI namn"
 
-#: src/wx/film_editor.cc:86
+#: src/wx/film_editor.cc:88 src/wx/kdm_dialog.cc:102
 msgid "DCP"
 msgstr ""
 
-#: src/wx/film_editor.cc:115
+#: src/wx/film_editor.cc:117
 msgid "DCP Name"
 msgstr "DCP Namn"
 
-#: src/wx/about_dialog.cc:44 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
+#: src/wx/about_dialog.cc:45 src/wx/wx_util.cc:87 src/wx/wx_util.cc:95
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:53
+#: src/wx/config_dialog.cc:52
 msgid "DCP-o-matic Preferences"
 msgstr "DCP-o-matic Inställningar"
 
@@ -246,35 +251,35 @@ msgstr "DCP-o-matic Inställningar"
 msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic audio - %s"
 
-#: src/wx/config_dialog.cc:142
+#: src/wx/config_dialog.cc:141
 msgid "Default DCI name details"
 msgstr "Detaljer om förvalda DCI-namn"
 
-#: src/wx/config_dialog.cc:155
+#: src/wx/config_dialog.cc:154
 #, fuzzy
 msgid "Default JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/config_dialog.cc:146
+#: src/wx/config_dialog.cc:145
 #, fuzzy
 msgid "Default container"
 msgstr "Innehållstyp"
 
-#: src/wx/config_dialog.cc:150
+#: src/wx/config_dialog.cc:149
 #, fuzzy
 msgid "Default content type"
 msgstr "Innehållstyp"
 
-#: src/wx/config_dialog.cc:134
+#: src/wx/config_dialog.cc:133
 msgid "Default directory for new films"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/config_dialog.cc:126
+#: src/wx/config_dialog.cc:125
 #, fuzzy
 msgid "Default duration of still images"
 msgstr "Förvald katalog för nya filmer"
 
-#: src/wx/film_editor.cc:127 src/wx/job_manager_view.cc:75
+#: src/wx/film_editor.cc:129 src/wx/job_manager_view.cc:78
 msgid "Details..."
 msgstr "Detaljer..."
 
@@ -282,26 +287,35 @@ msgstr "Detaljer..."
 msgid "Disk space required"
 msgstr "Diskutrymme som krävs"
 
-#: src/wx/kdm_dialog.cc:65
+#: src/wx/kdm_dialog.cc:68
 #, fuzzy
 msgid "Edit Cinema..."
 msgstr "Redigera..."
 
-#: src/wx/kdm_dialog.cc:72
+#: src/wx/kdm_dialog.cc:75
 #, fuzzy
 msgid "Edit Screen..."
 msgstr "Redigera..."
 
-#: src/wx/config_dialog.cc:143 src/wx/video_panel.cc:91
-#: src/wx/video_panel.cc:108
+#: src/wx/config_dialog.cc:142 src/wx/video_panel.cc:157
+#: src/wx/video_panel.cc:174
 msgid "Edit..."
 msgstr "Redigera..."
 
-#: src/wx/config_dialog.cc:62
+#: src/wx/servers_list_dialog.cc:30
+#, fuzzy
+msgid "Encoding Servers"
+msgstr "Kodningsservrar"
+
+#: src/wx/config_dialog.cc:61
 #, fuzzy
 msgid "Encoding servers"
 msgstr "Kodningsservrar"
 
+#: src/wx/film_editor.cc:154
+msgid "Encrypted"
+msgstr ""
+
 #: src/wx/dci_metadata_dialog.cc:59
 msgid "Facility (e.g. DLA)"
 msgstr "Företag (ex. DLA)"
@@ -314,11 +328,15 @@ msgstr "Film Egenskaper"
 msgid "Film name"
 msgstr "film namn"
 
-#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:82
+#: src/wx/filter_dialog.cc:32 src/wx/video_panel.cc:148
 msgid "Filters"
 msgstr "Filter"
 
-#: src/wx/film_editor.cc:142
+#: src/wx/content_menu.cc:49
+msgid "Find missing..."
+msgstr ""
+
+#: src/wx/film_editor.cc:144
 #, fuzzy
 msgid "Frame Rate"
 msgstr "DCP bildhastighet"
@@ -331,15 +349,15 @@ msgstr "Bildrutor"
 msgid "Frames already encoded"
 msgstr "Bildrutor redan kodade"
 
-#: src/wx/about_dialog.cc:60
+#: src/wx/about_dialog.cc:61
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
-#: src/wx/kdm_dialog.cc:82
+#: src/wx/kdm_dialog.cc:85
 msgid "From"
 msgstr ""
 
-#: src/wx/config_dialog.cc:121
+#: src/wx/config_dialog.cc:120
 msgid "From address for KDM emails"
 msgstr ""
 
@@ -351,11 +369,19 @@ msgstr "Volym Kalkylator"
 msgid "Gb"
 msgstr "Gb"
 
-#: src/wx/server_dialog.cc:40
+#: src/wx/hints_dialog.cc:26
+msgid "Hints"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:40
+msgid "Host"
+msgstr ""
+
+#: src/wx/server_dialog.cc:41
 msgid "Host name or IP address"
 msgstr "Värd-namn eller IP-adress"
 
-#: src/wx/audio_panel.cc:273
+#: src/wx/audio_panel.cc:241
 msgid "Hz"
 msgstr "Hz"
 
@@ -363,31 +389,36 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Jag vill spela upp detta med mixervolym"
 
-#: src/wx/config_dialog.cc:242 src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:241
 msgid "IP address"
 msgstr "IP-adress"
 
+#: src/wx/config_dialog.cc:313
+#, fuzzy
+msgid "IP address / host name"
+msgstr "IP-adress"
+
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
 msgstr ""
 
-#: src/wx/film_editor.cc:217
+#: src/wx/film_editor.cc:219
 msgid "Interop"
 msgstr ""
 
-#: src/wx/config_dialog.cc:281
+#: src/wx/config_dialog.cc:280
 msgid "Issuer"
 msgstr ""
 
-#: src/wx/film_editor.cc:171
+#: src/wx/film_editor.cc:173
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000 bandbredd"
 
-#: src/wx/config_dialog.cc:70
+#: src/wx/config_dialog.cc:69
 msgid "KDM email"
 msgstr ""
 
-#: src/wx/film_editor.cc:284
+#: src/wx/film_editor.cc:286
 msgid "Keep video in sequence"
 msgstr ""
 
@@ -395,7 +426,7 @@ msgstr ""
 msgid "L"
 msgstr ""
 
-#: src/wx/video_panel.cc:56
+#: src/wx/video_panel.cc:90
 msgid "Left crop"
 msgstr "Vänster beskärning"
 
@@ -416,11 +447,15 @@ msgstr ""
 msgid "Ls"
 msgstr "s"
 
-#: src/wx/config_dialog.cc:159 src/wx/film_editor.cc:175
+#: src/wx/config_dialog.cc:158 src/wx/film_editor.cc:177
 msgid "MBps"
 msgstr "MBps"
 
-#: src/wx/kdm_dialog.cc:44
+#: src/wx/film_editor.cc:711
+msgid "MISSING: "
+msgstr ""
+
+#: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
 msgstr ""
 
@@ -428,19 +463,24 @@ msgstr ""
 msgid "Matrix"
 msgstr ""
 
-#: src/wx/config_dialog.cc:66
+#: src/wx/config_dialog.cc:65
 msgid "Metadata"
 msgstr ""
 
-#: src/wx/config_dialog.cc:60
+#: src/wx/config_dialog.cc:59
 msgid "Miscellaneous"
 msgstr ""
 
+#: src/wx/video_panel.cc:279
+#, fuzzy
+msgid "Multiple content selected"
+msgstr "Innehållstyp"
+
 #: src/wx/dir_picker_ctrl.cc:52
 msgid "My Documents"
 msgstr "Mina Dokument"
 
-#: src/wx/config_dialog.cc:461 src/wx/film_editor.cc:110
+#: src/wx/config_dialog.cc:470 src/wx/film_editor.cc:112
 #: src/wx/preset_colour_conversion_dialog.cc:38
 msgid "Name"
 msgstr "Namn"
@@ -449,15 +489,15 @@ msgstr "Namn"
 msgid "New Film"
 msgstr "Ny Film"
 
-#: src/wx/video_panel.cc:132
+#: src/wx/video_panel.cc:198
 msgid "No stretch"
 msgstr ""
 
-#: src/wx/video_panel.cc:89 src/wx/video_panel.cc:253
+#: src/wx/video_panel.cc:155 src/wx/video_panel.cc:247
 msgid "None"
 msgstr "Inget"
 
-#: src/wx/config_dialog.cc:117
+#: src/wx/config_dialog.cc:116
 #, fuzzy
 msgid "Outgoing mail server"
 msgstr "Kodningsservrar"
@@ -470,17 +510,17 @@ msgstr ""
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/video_panel.cc:332
+#: src/wx/video_panel.cc:326
 #, 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:254
+#: src/wx/config_dialog.cc:253
 #, fuzzy
 msgid "Password"
 msgstr "TMS lösenord"
 
-#: src/wx/job_manager_view.cc:69 src/wx/job_manager_view.cc:141
+#: src/wx/job_manager_view.cc:72 src/wx/job_manager_view.cc:164
 msgid "Pause"
 msgstr ""
 
@@ -512,16 +552,16 @@ msgstr "RMS"
 msgid "Rating (e.g. 15)"
 msgstr "Klassificering (ex. 15)"
 
-#: src/wx/content_menu.cc:41 src/wx/film_editor.cc:270
+#: src/wx/content_menu.cc:51 src/wx/film_editor.cc:272
 msgid "Remove"
 msgstr "Ta bort"
 
-#: src/wx/kdm_dialog.cc:67
+#: src/wx/kdm_dialog.cc:70
 #, fuzzy
 msgid "Remove Cinema"
 msgstr "Ta bort"
 
-#: src/wx/kdm_dialog.cc:74
+#: src/wx/kdm_dialog.cc:77
 #, fuzzy
 msgid "Remove Screen"
 msgstr "Ta bort"
@@ -535,19 +575,19 @@ msgstr ""
 msgid "Repeat Content"
 msgstr "Välj innehållsfil"
 
-#: src/wx/content_menu.cc:39
+#: src/wx/content_menu.cc:48
 msgid "Repeat..."
 msgstr ""
 
-#: src/wx/film_editor.cc:165
+#: src/wx/film_editor.cc:167
 msgid "Resolution"
 msgstr ""
 
-#: src/wx/job_manager_view.cc:144
+#: src/wx/job_manager_view.cc:167
 msgid "Resume"
 msgstr ""
 
-#: src/wx/video_panel.cc:61
+#: src/wx/video_panel.cc:101
 msgid "Right crop"
 msgstr "Höger beskärning"
 
@@ -556,21 +596,21 @@ msgstr "Höger beskärning"
 msgid "Rs"
 msgstr "s"
 
-#: src/wx/film_editor.cc:216
+#: src/wx/film_editor.cc:218
 msgid "SMPTE"
 msgstr ""
 
-#: src/wx/video_panel.cc:76
+#: src/wx/video_panel.cc:134
 #, fuzzy
 msgid "Scale to"
 msgstr "Omskalare"
 
-#: src/wx/video_panel.cc:324
+#: src/wx/video_panel.cc:318
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skalad till %dx%d (%.2f:1)\n"
 
-#: src/wx/film_editor.cc:185
+#: src/wx/film_editor.cc:187
 msgid "Scaler"
 msgstr "Omskalare"
 
@@ -579,11 +619,11 @@ msgstr "Omskalare"
 msgid "Select Certificate File"
 msgstr "Välj innehållsfil"
 
-#: src/wx/kdm_dialog.cc:108
+#: src/wx/kdm_dialog.cc:136
 msgid "Send by email"
 msgstr ""
 
-#: src/wx/server_dialog.cc:27
+#: src/wx/server_dialog.cc:28
 msgid "Server"
 msgstr "Server"
 
@@ -591,11 +631,11 @@ msgstr "Server"
 msgid "Set"
 msgstr ""
 
-#: src/wx/config_dialog.cc:96
+#: src/wx/config_dialog.cc:95
 msgid "Set language"
 msgstr "Välj språk"
 
-#: src/wx/audio_panel.cc:46
+#: src/wx/audio_panel.cc:48
 msgid "Show Audio..."
 msgstr "Visa Audio..."
 
@@ -607,7 +647,7 @@ msgstr "Utjämning"
 msgid "Snap"
 msgstr ""
 
-#: src/wx/film_editor.cc:180
+#: src/wx/film_editor.cc:182
 msgid "Standard"
 msgstr ""
 
@@ -636,16 +676,16 @@ msgstr "Undertext Skalning"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:124
+#: src/wx/about_dialog.cc:128
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:68
+#: src/wx/config_dialog.cc:67
 #, fuzzy
 msgid "TMS"
 msgstr "RMS"
 
-#: src/wx/config_dialog.cc:246
+#: src/wx/config_dialog.cc:245
 #, fuzzy
 msgid "Target path"
 msgstr "TMS målsökväg"
@@ -654,15 +694,22 @@ msgstr "TMS målsökväg"
 msgid "Territory (e.g. UK)"
 msgstr "Område (ex. SV)"
 
-#: src/wx/config_dialog.cc:315
+#: src/wx/content_menu.cc:178
+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 "
+"missing content."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:97
+msgid "There are no hints: everything looks good!"
+msgstr ""
+
+#: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
 msgstr "Trådar"
 
-#: src/wx/server_dialog.cc:44
-msgid "Threads to use"
-msgstr "Antal trådar att använda"
-
-#: src/wx/config_dialog.cc:113
+#: src/wx/config_dialog.cc:112
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
@@ -675,7 +722,7 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tid"
 
-#: src/wx/film_editor.cc:276
+#: src/wx/film_editor.cc:278
 msgid "Timeline..."
 msgstr ""
 
@@ -683,11 +730,11 @@ msgstr ""
 msgid "Timing"
 msgstr ""
 
-#: src/wx/video_panel.cc:66
+#: src/wx/video_panel.cc:112
 msgid "Top crop"
 msgstr "Övre beskärning"
 
-#: src/wx/about_dialog.cc:99
+#: src/wx/about_dialog.cc:100
 msgid "Translated by"
 msgstr ""
 
@@ -701,19 +748,23 @@ msgstr "Skippa bilder"
 msgid "Trim from start"
 msgstr "Skippa bilder"
 
-#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:51
+#: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:77
 msgid "Type"
 msgstr "Typ"
 
-#: src/wx/kdm_dialog.cc:88
+#: src/wx/kdm_dialog.cc:91
 msgid "Until"
 msgstr ""
 
-#: src/wx/film_editor.cc:125
+#: src/wx/film_editor.cc:127
 msgid "Use DCI name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/film_editor.cc:146
+#: src/wx/config_dialog.cc:309
+msgid "Use all servers"
+msgstr ""
+
+#: src/wx/film_editor.cc:148
 msgid "Use best"
 msgstr "Använd bästa"
 
@@ -722,12 +773,12 @@ msgstr "Använd bästa"
 msgid "Use preset"
 msgstr "Använd bästa"
 
-#: src/wx/config_dialog.cc:250
+#: src/wx/config_dialog.cc:249
 #, fuzzy
 msgid "User name"
 msgstr "Använd DCI-namnet"
 
-#: src/wx/video_panel.cc:44
+#: src/wx/video_panel.cc:70
 msgid "Video"
 msgstr "Video"
 
@@ -735,20 +786,46 @@ msgstr "Video"
 msgid "With Subtitles"
 msgstr "Med Undertexter"
 
-#: src/wx/kdm_dialog.cc:94
+#: src/wx/kdm_dialog.cc:122
 msgid "Write to"
 msgstr ""
 
-#: src/wx/about_dialog.cc:90
+#: src/wx/about_dialog.cc:91
 msgid "Written by"
 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."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:76
+#, c-format
+msgid ""
+"Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
+"projectors.  Use 24 or 48 frames per second to be on the safe side."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:66
+msgid ""
+"Your DCP has an odd number of audio channels.  This is very likely to cause "
+"problems on playback."
+msgstr ""
+
+#: src/wx/hints_dialog.cc:70
+msgid ""
+"Your DCP has fewer than 6 audio channels.  This may cause problems on some "
+"projectors."
+msgstr ""
+
 #: src/wx/timeline.cc:213
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:271
+#: src/wx/audio_panel.cc:239
 msgid "channels"
 msgstr "kanaler"
 
@@ -756,16 +833,16 @@ msgstr "kanaler"
 msgid "counting..."
 msgstr "räknar..."
 
-#: src/wx/audio_panel.cc:56
+#: src/wx/audio_panel.cc:62
 msgid "dB"
 msgstr "dB"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:69
+#: src/wx/audio_panel.cc:78
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:130
+#: src/wx/config_dialog.cc:129
 msgid "s"
 msgstr "s"
 
@@ -782,6 +859,9 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Threads to use"
+#~ msgstr "Antal trådar att använda"
+
 #~ msgid "Add"
 #~ msgstr "Lägg till"
 
diff --git a/src/wx/wscript b/src/wx/wscript
index 084e5cc68..34047f3ac 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -54,15 +54,15 @@ def configure(conf):
     if conf.env.STATIC:
 	# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
         # check_cfg(), so just hard-code it all.
-        conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-2.9', 'wx_gtk2u_xrc-2.9', 'wx_gtk2u_qa-2.9', 'wx_baseu_net-2.9', 'wx_gtk2u_html-2.9',
-                                    'wx_gtk2u_adv-2.9', 'wx_gtk2u_core-2.9', 'wx_baseu_xml-2.9', 'wx_baseu-2.9']
+        conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0',
+                                    'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0']
         conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
  
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
     conf.im_msg = 0
-    if wx_version != '2.9.4' and wx_version != '2.9.5':
-        conf.fatal('wxwidgets version 2.9.4 or 2.9.5 is required; %s found' % wx_version)
+    if wx_version != '3.0.0':
+        conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version)
 
 def build(bld):
     if bld.env.STATIC:
diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc
index 27a4554ca..103d36d00 100644
--- a/src/wx/wx_util.cc
+++ b/src/wx/wx_util.cc
@@ -105,7 +105,7 @@ confirm_dialog (wxWindow* parent, wxString m)
 string
 wx_to_std (wxString s)
 {
-	return string (s.mb_str ());
+	return string (s.ToUTF8 ());
 }
 
 /** @param s STL string.