Merge master.

7 files changed, 365 insertions, 381 deletions

diff --git a/src/lib/format.cc b/src/lib/format.cc
index 538bf7953..addab2b60 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -73,68 +73,55 @@ Format::setup_formats ()
 {
 	/// TRANSLATORS: these are film picture aspect ratios; "Academy" means 1.37, "Flat" 1.85 and "Scope" 2.39.
 	_formats.push_back (
-		new FixedFormat (119, libdcp::Size (1285, 1080), N_("119"), _("1.19"), N_("F"),
-				 _("Source scaled to 1.19:1")
+		new FixedFormat (119, libdcp::Size (1285, 1080), N_("119"), _("1.19"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (133, libdcp::Size (1436, 1080), N_("133"), _("1.33"), N_("F"),
-				 _("Source scaled to 1.33:1")
+		new FixedFormat (133, libdcp::Size (1436, 1080), N_("133"), _("1.33"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (138, libdcp::Size (1485, 1080), N_("138"), _("1.375"), N_("F"),
-				 _("Source scaled to 1.375:1")
+		new FixedFormat (138, libdcp::Size (1485, 1080), N_("138"), _("1.375"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (133, libdcp::Size (1998, 1080), N_("133-in-flat"), _("4:3 within Flat"), N_("F"),
-				 _("Source scaled to 1.33:1 then pillarboxed to Flat")
+		new FixedFormat (133, libdcp::Size (1998, 1080), N_("133-in-flat"), _("4:3 within Flat"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (137, libdcp::Size (1480, 1080), N_("137"), _("Academy"), N_("F"),
-				 _("Source scaled to 1.37:1 (Academy ratio)")
+		new FixedFormat (137, libdcp::Size (1480, 1080), N_("137"), _("Academy"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (166, libdcp::Size (1793, 1080), N_("166"), _("1.66"), N_("F"),
-				 _("Source scaled to 1.66:1")
+		new FixedFormat (166, libdcp::Size (1793, 1080), N_("166"), _("1.66"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (166, libdcp::Size (1998, 1080), N_("166-in-flat"), _("1.66 within Flat"), N_("F"),
-				 _("Source scaled to 1.66:1 then pillarboxed to Flat")
+		new FixedFormat (166, libdcp::Size (1998, 1080), N_("166-in-flat"), _("1.66 within Flat"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (178, libdcp::Size (1998, 1080), N_("178-in-flat"), _("16:9 within Flat"), N_("F"),
-				 _("Source scaled to 1.78:1 then pillarboxed to Flat")
+		new FixedFormat (178, libdcp::Size (1998, 1080), N_("178-in-flat"), _("16:9 within Flat"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (178, libdcp::Size (1920, 1080), N_("178"), _("16:9"), N_("F"),
-				 _("Source scaled to 1.78:1")
+		new FixedFormat (178, libdcp::Size (1920, 1080), N_("178"), _("16:9"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (185, libdcp::Size (1998, 1080), N_("185"), _("Flat"), N_("F"),
-				 _("Source scaled to Flat (1.85:1)")
+		new FixedFormat (185, libdcp::Size (1998, 1080), N_("185"), _("Flat"), N_("F")
 			));
 	
 	_formats.push_back (
-		new FixedFormat (239, libdcp::Size (2048, 858), N_("239"), _("Scope"), N_("S"),
-				 _("Source scaled to Scope (2.39:1)")
+		new FixedFormat (239, libdcp::Size (2048, 858), N_("239"), _("Scope"), N_("S")
 			));
 		
 	_formats.push_back (
-		new VariableFormat (libdcp::Size (1998, 1080), N_("var-185"), _("Flat without stretch"), N_("F"),
-				    _("Source scaled to fit Flat preserving its aspect ratio")
+		new VariableFormat (libdcp::Size (1998, 1080), N_("var-185"), _("Flat without stretch"), N_("F")
 			));
 	
 	_formats.push_back (
-		new VariableFormat (libdcp::Size (2048, 858), N_("var-239"), _("Scope without stretch"), N_("S"),
-				    _("Source scaled to fit Scope preserving its aspect ratio")
+		new VariableFormat (libdcp::Size (2048, 858), N_("var-239"), _("Scope without stretch"), N_("S")
 			));
 }
 
@@ -196,8 +183,8 @@ Format::all ()
  *  @param id ID (e.g. 185)
  *  @param n Nick name (e.g. Flat)
  */
-FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d, string e)
-	: Format (dcp, id, n, d, e)
+FixedFormat::FixedFormat (int r, libdcp::Size dcp, string id, string n, string d)
+	: Format (dcp, id, n, d)
 	, _ratio (r)
 {
 
@@ -225,8 +212,8 @@ Format::container_ratio_as_float () const
 	return static_cast<float> (_dcp_size.width) / _dcp_size.height;
 }
 
-VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d, string e)
-	: Format (dcp, id, n, d, e)
+VariableFormat::VariableFormat (libdcp::Size dcp, string id, string n, string d)
+	: Format (dcp, id, n, d)
 {
 
 }
diff --git a/src/lib/format.h b/src/lib/format.h
index cc7502893..7958ca534 100644
--- a/src/lib/format.h
+++ b/src/lib/format.h
@@ -31,12 +31,11 @@ class Film;
 class Format
 {
 public:
-	Format (libdcp::Size dcp, std::string id, std::string n, std::string d, std::string e)
+	Format (libdcp::Size dcp, std::string id, std::string n, std::string d)
 		: _dcp_size (dcp)
 		, _id (id)
 		, _nickname (n)
 		, _dci_name (d)
-		, _description (e)
 	{}
 
 	/** @return the aspect ratio multiplied by 100
@@ -76,10 +75,6 @@ public:
 		return _dci_name;
 	}
 
-	std::string description () const {
-		return _description;
-	}
-
 	std::string as_metadata () const;
 
 	static Format const * from_nickname (std::string n);
@@ -99,7 +94,6 @@ protected:
 	/** nickname (e.g. Flat, Scope) */
 	std::string _nickname;
 	std::string _dci_name;
-	std::string _description;
 
 private:	
 	/** all available formats */
@@ -113,7 +107,7 @@ private:
 class FixedFormat : public Format
 {
 public:
-	FixedFormat (int, libdcp::Size, std::string, std::string, std::string, std::string);
+	FixedFormat (int, libdcp::Size, std::string, std::string, std::string);
 
 	int ratio_as_integer (boost::shared_ptr<const Film>) const {
 		return _ratio;
@@ -134,7 +128,7 @@ private:
 class VariableFormat : public Format
 {
 public:
-	VariableFormat (libdcp::Size, std::string, std::string, std::string, std::string);
+	VariableFormat (libdcp::Size, std::string, std::string, std::string);
 
 	int ratio_as_integer (boost::shared_ptr<const Film> f) const;
 	float ratio_as_float (boost::shared_ptr<const Film> f) const;
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 153a90085..8f6a06563 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDVDOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-15 08:39+0000\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-04-02 19:10-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
+"Language: es-ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
-"Language: es-ES\n"
 
 #: src/lib/transcode_job.cc:87
 msgid "0%"
@@ -25,27 +25,27 @@ msgstr "0%"
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/format.cc:80
+#: src/lib/format.cc:79
 msgid "1.33"
 msgstr "1.33"
 
-#: src/lib/format.cc:85
+#: src/lib/format.cc:83
 msgid "1.375"
 msgstr "1.375"
 
-#: src/lib/format.cc:100
+#: src/lib/format.cc:95
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/format.cc:105
+#: src/lib/format.cc:99
 msgid "1.66 within Flat"
 msgstr "1.66 en Flat"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:107
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:110
+#: src/lib/format.cc:103
 msgid "16:9 within Flat"
 msgstr "16:9 en Flat"
 
@@ -53,7 +53,7 @@ msgstr "16:9 en Flat"
 msgid "3D denoiser"
 msgstr "reducción de ruido 3D"
 
-#: src/lib/format.cc:90
+#: src/lib/format.cc:87
 msgid "4:3 within Flat"
 msgstr "4:3 en Flat"
 
@@ -61,7 +61,7 @@ msgstr "4:3 en Flat"
 msgid "A/B transcode %1"
 msgstr "Codificación A/B %1"
 
-#: src/lib/format.cc:95
+#: src/lib/format.cc:91
 msgid "Academy"
 msgstr "Academy"
 
@@ -69,7 +69,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/job.cc:71
+#: src/lib/job.cc:72
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
@@ -89,11 +89,23 @@ msgstr "Bicúbico"
 msgid "Bilinear"
 msgstr "Bilineal"
 
+#: src/lib/job.cc:302
+msgid "Cancelled"
+msgstr ""
+
+#: src/lib/exceptions.cc:60
+msgid "Cannot handle pixel format %1 during %2"
+msgstr ""
+
 #: src/lib/encoder.cc:101
 msgid "Cannot resample audio as libswresample is not present"
 msgstr ""
 "No se puede redimensionar el sonido porque no se encuentra libswresample"
 
+#: src/lib/util.cc:932
+msgid "Centre"
+msgstr ""
+
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
@@ -122,15 +134,16 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:965
+#: src/lib/util.cc:1007
 msgid "DCP and source have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/util.cc:975
-msgid "DCP will run at %1%% of the source speed."
-msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente."
+#: src/lib/util.cc:1017
+#, fuzzy
+msgid "DCP will run at %1%% of the source speed.\n"
+msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 
-#: src/lib/util.cc:968
+#: src/lib/util.cc:1010
 msgid "DCP will use every other frame of the source.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
 
@@ -153,11 +166,11 @@ msgstr "Deringing filter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:970
+#: src/lib/util.cc:1012
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
-#: src/lib/job.cc:287
+#: src/lib/job.cc:300
 msgid "Error (%1)"
 msgstr "Error (%1)"
 
@@ -197,11 +210,11 @@ msgstr "Bilineal rápido"
 msgid "Feature"
 msgstr "Película"
 
-#: src/lib/format.cc:120
+#: src/lib/format.cc:111
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:130
+#: src/lib/format.cc:119
 msgid "Flat without stretch"
 msgstr "Flat sin deformación"
 
@@ -229,7 +242,7 @@ msgstr "Horizontal deblocking filter"
 msgid "Horizontal deblocking filter A"
 msgstr "Horizontal deblocking filter A"
 
-#: src/lib/job.cc:87 src/lib/job.cc:96
+#: src/lib/job.cc:92 src/lib/job.cc:101
 msgid ""
 "It is not known what caused this error.  The best idea is to report the "
 "problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
@@ -245,6 +258,18 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
+#: src/lib/util.cc:930
+msgid "Left"
+msgstr ""
+
+#: src/lib/util.cc:934
+msgid "Left surround"
+msgstr ""
+
+#: src/lib/util.cc:933
+msgid "Lfe (sub)"
+msgstr ""
+
 #: src/lib/filter.cc:75
 msgid "Linear blend deinterlacer"
 msgstr "Linear blend deinterlacer"
@@ -271,7 +296,7 @@ msgstr "Motion compensating deinterlacer"
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:285
+#: src/lib/job.cc:298
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
@@ -291,19 +316,27 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/util.cc:458
+#: src/lib/util.cc:500
 msgid "Rec 709"
 msgstr "Rec 709"
 
+#: src/lib/util.cc:931
+msgid "Right"
+msgstr ""
+
+#: src/lib/util.cc:935
+msgid "Right surround"
+msgstr ""
+
 #: src/lib/scp_dcp_job.cc:133
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
-#: src/lib/format.cc:125
+#: src/lib/format.cc:115
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:135
+#: src/lib/format.cc:123
 msgid "Scope without stretch"
 msgstr "Scope sin deformación"
 
@@ -315,58 +348,6 @@ msgstr "Cortometraje"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/format.cc:76
-msgid "Source scaled to 1.19:1"
-msgstr "Fuente escalada a 1.19:1"
-
-#: src/lib/format.cc:81
-msgid "Source scaled to 1.33:1"
-msgstr "Fuente escalada a 1.33:1"
-
-#: src/lib/format.cc:91
-msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
-msgstr "Fuente escalada a 1.33:1 con bandas hasta Flat"
-
-#: src/lib/format.cc:86
-msgid "Source scaled to 1.375:1"
-msgstr "Fuente escalada a 1.375:1"
-
-#: src/lib/format.cc:96
-msgid "Source scaled to 1.37:1 (Academy ratio)"
-msgstr "Fuente escalada a 1.37:1 (Academy)"
-
-#: src/lib/format.cc:101
-msgid "Source scaled to 1.66:1"
-msgstr "Fuente escalada a 1.66:1"
-
-#: src/lib/format.cc:106
-msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
-msgstr "Fuente escalada a 1.66:1 con bandas hasta Flat"
-
-#: src/lib/format.cc:116
-msgid "Source scaled to 1.78:1"
-msgstr "Fuente escalada a 1.78:1"
-
-#: src/lib/format.cc:111
-msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
-msgstr "Fuente escalada a 1.78:1 con bandas hasta Flat"
-
-#: src/lib/format.cc:121
-msgid "Source scaled to Flat (1.85:1)"
-msgstr "Fuente escalada a Flat (1.85:1)"
-
-#: src/lib/format.cc:126
-msgid "Source scaled to Scope (2.39:1)"
-msgstr "Fuente escalada a Scope (2.39:1)"
-
-#: src/lib/format.cc:131
-msgid "Source scaled to fit Flat preserving its aspect ratio"
-msgstr "Fuente escalada a Flat conservando el ratio de aspecto"
-
-#: src/lib/format.cc:136
-msgid "Source scaled to fit Scope preserving its aspect ratio"
-msgstr "Fuente escalada a Scope conservando el ratio de aspecto"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -387,7 +368,7 @@ msgstr "Temporal noise reducer"
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:76
+#: src/lib/job.cc:77
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -407,7 +388,7 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:95
+#: src/lib/job.cc:100
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -439,15 +420,11 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/encoder.cc:271
-msgid "adding to queue of %1"
-msgstr "añadiendo a la cola de %1"
-
 #: src/lib/film.cc:263
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:541
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -467,6 +444,11 @@ msgstr "tipo de contenido"
 msgid "copying %1"
 msgstr "copiando %1"
 
+#: src/lib/exceptions.cc:36
+#, fuzzy
+msgid "could not create file %1"
+msgstr "No se pudo escribir el fichero remoto (%1)"
+
 #: src/lib/ffmpeg_decoder.cc:191
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
@@ -483,14 +465,24 @@ msgstr "no se pudo encontrar decodificador de subtítutlos"
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
-#: src/lib/external_audio_decoder.cc:72
+#: src/lib/sndfile_decoder.cc:72
 msgid "could not open external audio file for reading"
 msgstr "no se pudo leer el fichero externo  de audio"
 
+#: src/lib/exceptions.cc:29
+#, fuzzy
+msgid "could not open file %1"
+msgstr "no se pudo abrir el fichero para lectura"
+
 #: src/lib/dcp_video_frame.cc:388
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
+#: src/lib/exceptions.cc:44
+#, fuzzy
+msgid "could not read from file %1 (%2)"
+msgstr "No se pudo crear la carpeta remota %1 (%2)"
+
 #: src/lib/encoder.cc:137 src/lib/encoder.cc:314
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
@@ -503,19 +495,16 @@ msgstr "no se pudo abrir la sesión SCP (%1)"
 msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
-#: src/lib/encoder.cc:247
-msgid "decoder sleeps with queue of %1"
-msgstr ""
-
-#: src/lib/encoder.cc:249
-msgid "decoder wakes with queue of %1"
-msgstr ""
+#: src/lib/exceptions.cc:50
+#, fuzzy
+msgid "could not write to file %1 (%2)"
+msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/external_audio_decoder.cc:94
+#: src/lib/sndfile_decoder.cc:94
 msgid "external audio files have differing lengths"
 msgstr "los ficheros externos de sonido tienen duraciones diferentes"
 
-#: src/lib/external_audio_decoder.cc:76
+#: src/lib/sndfile_decoder.cc:76
 msgid "external audio files must be mono"
 msgstr "los ficheros externos de sonido deben ser mono"
 
@@ -543,10 +532,14 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:642
+#: src/lib/util.cc:684
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
+#: src/lib/exceptions.cc:54
+msgid "missing required setting %1"
+msgstr ""
+
 #: src/lib/subtitle.cc:52
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
@@ -565,11 +558,11 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:282
+#: src/lib/job.cc:295
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/util.cc:456
+#: src/lib/util.cc:498
 msgid "sRGB"
 msgstr "sRGB"
 
@@ -584,3 +577,45 @@ msgstr "imagen fija"
 #: src/lib/film.cc:274
 msgid "video"
 msgstr "vídeo"
+
+#~ msgid "Source scaled to 1.19:1"
+#~ msgstr "Fuente escalada a 1.19:1"
+
+#~ msgid "Source scaled to 1.33:1"
+#~ msgstr "Fuente escalada a 1.33:1"
+
+#~ msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
+#~ msgstr "Fuente escalada a 1.33:1 con bandas hasta Flat"
+
+#~ msgid "Source scaled to 1.375:1"
+#~ msgstr "Fuente escalada a 1.375:1"
+
+#~ msgid "Source scaled to 1.37:1 (Academy ratio)"
+#~ msgstr "Fuente escalada a 1.37:1 (Academy)"
+
+#~ msgid "Source scaled to 1.66:1"
+#~ msgstr "Fuente escalada a 1.66:1"
+
+#~ msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
+#~ msgstr "Fuente escalada a 1.66:1 con bandas hasta Flat"
+
+#~ msgid "Source scaled to 1.78:1"
+#~ msgstr "Fuente escalada a 1.78:1"
+
+#~ msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
+#~ msgstr "Fuente escalada a 1.78:1 con bandas hasta Flat"
+
+#~ msgid "Source scaled to Flat (1.85:1)"
+#~ msgstr "Fuente escalada a Flat (1.85:1)"
+
+#~ msgid "Source scaled to Scope (2.39:1)"
+#~ msgstr "Fuente escalada a Scope (2.39:1)"
+
+#~ msgid "Source scaled to fit Flat preserving its aspect ratio"
+#~ msgstr "Fuente escalada a Flat conservando el ratio de aspecto"
+
+#~ msgid "Source scaled to fit Scope preserving its aspect ratio"
+#~ msgstr "Fuente escalada a Scope conservando el ratio de aspecto"
+
+#~ msgid "adding to queue of %1"
+#~ msgstr "añadiendo a la cola de %1"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 7bd003c08..ccdad3fe2 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"
@@ -24,27 +24,27 @@ msgstr "0%"
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/format.cc:80
+#: src/lib/format.cc:79
 msgid "1.33"
 msgstr "1.33"
 
-#: src/lib/format.cc:85
+#: src/lib/format.cc:83
 msgid "1.375"
 msgstr "1.375"
 
-#: src/lib/format.cc:100
+#: src/lib/format.cc:95
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/format.cc:105
+#: src/lib/format.cc:99
 msgid "1.66 within Flat"
 msgstr "1.66 dans Flat"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:107
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:110
+#: src/lib/format.cc:103
 msgid "16:9 within Flat"
 msgstr "16:9 dans Flat"
 
@@ -52,7 +52,7 @@ msgstr "16:9 dans Flat"
 msgid "3D denoiser"
 msgstr "Débruitage 3D"
 
-#: src/lib/format.cc:90
+#: src/lib/format.cc:87
 msgid "4:3 within Flat"
 msgstr "4:3 dans Flat"
 
@@ -60,7 +60,7 @@ msgstr "4:3 dans Flat"
 msgid "A/B transcode %1"
 msgstr "Transcodage A/B %1"
 
-#: src/lib/format.cc:95
+#: src/lib/format.cc:91
 msgid "Academy"
 msgstr "Academy"
 
@@ -100,7 +100,7 @@ msgstr ""
 msgid "Cannot resample audio as libswresample is not present"
 msgstr "Ré-échantillonnage du son impossible : libswresample est absent"
 
-#: src/lib/util.cc:931
+#: src/lib/util.cc:932
 msgid "Centre"
 msgstr ""
 
@@ -132,15 +132,16 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Désentrelacement cubique interpolé"
 
-#: src/lib/util.cc:1006
+#: src/lib/util.cc:1007
 msgid "DCP and source have the same rate.\n"
 msgstr "Le DCP et la source ont les mêmes cadences.\n"
 
-#: src/lib/util.cc:1016
-msgid "DCP will run at %1%% of the source speed."
-msgstr "La cadence du DCP sera %1%% par rapport à la source"
+#: src/lib/util.cc:1017
+#, fuzzy
+msgid "DCP will run at %1%% of the source speed.\n"
+msgstr "La cadence du DCP sera %1%% par rapport à la source\n"
 
-#: src/lib/util.cc:1009
+#: src/lib/util.cc:1010
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
@@ -163,7 +164,7 @@ msgstr "Filtre anti bourdonnement"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1011
+#: src/lib/util.cc:1012
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
@@ -207,11 +208,11 @@ msgstr "Bilinéaire rapide"
 msgid "Feature"
 msgstr "Feature"
 
-#: src/lib/format.cc:120
+#: src/lib/format.cc:111
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:130
+#: src/lib/format.cc:119
 msgid "Flat without stretch"
 msgstr "Flat sans déformation"
 
@@ -255,15 +256,15 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:929
+#: src/lib/util.cc:930
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:933
+#: src/lib/util.cc:934
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:932
+#: src/lib/util.cc:933
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -313,15 +314,15 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:500
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:930
+#: src/lib/util.cc:931
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:934
+#: src/lib/util.cc:935
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -329,11 +330,11 @@ msgstr "Arrière droite"
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
-#: src/lib/format.cc:125
+#: src/lib/format.cc:115
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:135
+#: src/lib/format.cc:123
 msgid "Scope without stretch"
 msgstr "Scope sans déformation"
 
@@ -345,58 +346,6 @@ msgstr "Short"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/format.cc:76
-msgid "Source scaled to 1.19:1"
-msgstr "Source mise à l'échelle en 1.19:1"
-
-#: src/lib/format.cc:81
-msgid "Source scaled to 1.33:1"
-msgstr "Source mise à l'échelle en 1.33:1"
-
-#: src/lib/format.cc:91
-msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
-msgstr "Source mise à l'échelle en 1.33:1 puis contenue dans Flat"
-
-#: src/lib/format.cc:86
-msgid "Source scaled to 1.375:1"
-msgstr "Source mise à l'échelle en 1.375:1"
-
-#: src/lib/format.cc:96
-msgid "Source scaled to 1.37:1 (Academy ratio)"
-msgstr "Source mise à l'échelle en 1.37:1 (ratio \"academy\")"
-
-#: src/lib/format.cc:101
-msgid "Source scaled to 1.66:1"
-msgstr "Source mise à l'échelle en 1.66:1"
-
-#: src/lib/format.cc:106
-msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
-msgstr "Source mise à l'échelle en 1.66:1 puis contenue dans Flat"
-
-#: src/lib/format.cc:116
-msgid "Source scaled to 1.78:1"
-msgstr "Source mise à l'échelle en 1.78:1"
-
-#: src/lib/format.cc:111
-msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
-msgstr "Source mise à l'échelle en 1.78:1 puis contenue dans Flat"
-
-#: src/lib/format.cc:121
-msgid "Source scaled to Flat (1.85:1)"
-msgstr "Source mise à l'échelle en Flat (1.85:1)"
-
-#: src/lib/format.cc:126
-msgid "Source scaled to Scope (2.39:1)"
-msgstr "Source mise à l'échelle en Scope (2.39:1)"
-
-#: src/lib/format.cc:131
-msgid "Source scaled to fit Flat preserving its aspect ratio"
-msgstr "Source réduite en Flat afin de préserver ses dimensions"
-
-#: src/lib/format.cc:136
-msgid "Source scaled to fit Scope preserving its aspect ratio"
-msgstr "Source réduite en Scope afin de préserver ses dimensions"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -473,7 +422,7 @@ msgstr "Un autre filtre de désentrelacement"
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:540
+#: src/lib/util.cc:541
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -577,7 +526,7 @@ msgstr "minute"
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:683
+#: src/lib/util.cc:684
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -607,7 +556,7 @@ msgstr "sous-titres non-bitmap non supportés actuellement"
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:498
 msgid "sRGB"
 msgstr "sRGB"
 
@@ -623,6 +572,45 @@ msgstr "fixe"
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Source scaled to 1.19:1"
+#~ msgstr "Source mise à l'échelle en 1.19:1"
+
+#~ msgid "Source scaled to 1.33:1"
+#~ msgstr "Source mise à l'échelle en 1.33:1"
+
+#~ msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
+#~ msgstr "Source mise à l'échelle en 1.33:1 puis contenue dans Flat"
+
+#~ msgid "Source scaled to 1.375:1"
+#~ msgstr "Source mise à l'échelle en 1.375:1"
+
+#~ msgid "Source scaled to 1.37:1 (Academy ratio)"
+#~ msgstr "Source mise à l'échelle en 1.37:1 (ratio \"academy\")"
+
+#~ msgid "Source scaled to 1.66:1"
+#~ msgstr "Source mise à l'échelle en 1.66:1"
+
+#~ msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
+#~ msgstr "Source mise à l'échelle en 1.66:1 puis contenue dans Flat"
+
+#~ msgid "Source scaled to 1.78:1"
+#~ msgstr "Source mise à l'échelle en 1.78:1"
+
+#~ msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
+#~ msgstr "Source mise à l'échelle en 1.78:1 puis contenue dans Flat"
+
+#~ msgid "Source scaled to Flat (1.85:1)"
+#~ msgstr "Source mise à l'échelle en Flat (1.85:1)"
+
+#~ msgid "Source scaled to Scope (2.39:1)"
+#~ msgstr "Source mise à l'échelle en Scope (2.39:1)"
+
+#~ msgid "Source scaled to fit Flat preserving its aspect ratio"
+#~ msgstr "Source réduite en Flat afin de préserver ses dimensions"
+
+#~ msgid "Source scaled to fit Scope preserving its aspect ratio"
+#~ msgstr "Source réduite en Scope afin de préserver ses dimensions"
+
 #~ msgid "adding to queue of %1"
 #~ msgstr "Mise en file d'attente de %1"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index b4278d93c..8e9b7166b 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-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-03-20 11:45+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -25,27 +25,27 @@ msgstr "0%"
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/format.cc:80
+#: src/lib/format.cc:79
 msgid "1.33"
 msgstr "1.33"
 
-#: src/lib/format.cc:85
+#: src/lib/format.cc:83
 msgid "1.375"
 msgstr "1.375"
 
-#: src/lib/format.cc:100
+#: src/lib/format.cc:95
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/format.cc:105
+#: src/lib/format.cc:99
 msgid "1.66 within Flat"
 msgstr "1.66 all'interno di Flat"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:107
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:110
+#: src/lib/format.cc:103
 msgid "16:9 within Flat"
 msgstr "16:9 all'interno di Flat"
 
@@ -53,7 +53,7 @@ msgstr "16:9 all'interno di Flat"
 msgid "3D denoiser"
 msgstr "Riduttore di rumore 3D"
 
-#: src/lib/format.cc:90
+#: src/lib/format.cc:87
 msgid "4:3 within Flat"
 msgstr "4:3 all'interno di  Flat"
 
@@ -61,7 +61,7 @@ msgstr "4:3 all'interno di  Flat"
 msgid "A/B transcode %1"
 msgstr "Transcodifica A/B %1"
 
-#: src/lib/format.cc:95
+#: src/lib/format.cc:91
 msgid "Academy"
 msgstr "Academy"
 
@@ -101,7 +101,7 @@ msgstr ""
 msgid "Cannot resample audio as libswresample is not present"
 msgstr "Non posso ricampionare l'audio perchè libswresample non è presente"
 
-#: src/lib/util.cc:931
+#: src/lib/util.cc:932
 msgid "Centre"
 msgstr ""
 
@@ -133,15 +133,16 @@ msgstr "Non posso scrivere il file remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Deinterlacciatore cubico interpolato"
 
-#: src/lib/util.cc:1006
+#: src/lib/util.cc:1007
 msgid "DCP and source have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
-#: src/lib/util.cc:1016
-msgid "DCP will run at %1%% of the source speed."
-msgstr "Il DCP andrà al %1%% della velocità del sorgente."
+#: src/lib/util.cc:1017
+#, fuzzy
+msgid "DCP will run at %1%% of the source speed.\n"
+msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
 
-#: src/lib/util.cc:1009
+#: src/lib/util.cc:1010
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
 
@@ -164,7 +165,7 @@ msgstr "Filtro deringing"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1011
+#: src/lib/util.cc:1012
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
@@ -208,11 +209,11 @@ msgstr "Bilineare rapida"
 msgid "Feature"
 msgstr "Caratteristica"
 
-#: src/lib/format.cc:120
+#: src/lib/format.cc:111
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:130
+#: src/lib/format.cc:119
 msgid "Flat without stretch"
 msgstr "Flat senza stiramento"
 
@@ -256,15 +257,15 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:929
+#: src/lib/util.cc:930
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:933
+#: src/lib/util.cc:934
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/util.cc:932
+#: src/lib/util.cc:933
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -314,15 +315,15 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:500
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:930
+#: src/lib/util.cc:931
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:934
+#: src/lib/util.cc:935
 msgid "Right surround"
 msgstr ""
 
@@ -330,11 +331,11 @@ msgstr ""
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
-#: src/lib/format.cc:125
+#: src/lib/format.cc:115
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:135
+#: src/lib/format.cc:123
 msgid "Scope without stretch"
 msgstr "Scope senza stiramento"
 
@@ -346,58 +347,6 @@ msgstr "Corto"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/format.cc:76
-msgid "Source scaled to 1.19:1"
-msgstr "Sorgente scalato a 1.19:1"
-
-#: src/lib/format.cc:81
-msgid "Source scaled to 1.33:1"
-msgstr "Sorgente scalato a 1.33:1"
-
-#: src/lib/format.cc:91
-msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
-msgstr "Sorgente scalato a 1.33:1 e poi inviato come Flat"
-
-#: src/lib/format.cc:86
-msgid "Source scaled to 1.375:1"
-msgstr "Sorgente scalato a 1.375:1"
-
-#: src/lib/format.cc:96
-msgid "Source scaled to 1.37:1 (Academy ratio)"
-msgstr "Sorgente scalato a 1.37:1 (Academy ratio)"
-
-#: src/lib/format.cc:101
-msgid "Source scaled to 1.66:1"
-msgstr "Sorgente scalato a 1.66:1"
-
-#: src/lib/format.cc:106
-msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
-msgstr "Sorgente scalato a 1.66:1 e poi inviato come Flat"
-
-#: src/lib/format.cc:116
-msgid "Source scaled to 1.78:1"
-msgstr "Sorgente scalato a 1.78:1"
-
-#: src/lib/format.cc:111
-msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
-msgstr "Sorgente scalato a 1.78:1 e poi inviato come Flat"
-
-#: src/lib/format.cc:121
-msgid "Source scaled to Flat (1.85:1)"
-msgstr "Sorgente scalato a Flat (1.85:1)"
-
-#: src/lib/format.cc:126
-msgid "Source scaled to Scope (2.39:1)"
-msgstr "Sorgente scalato a Scope (2.39:1)"
-
-#: src/lib/format.cc:131
-msgid "Source scaled to fit Flat preserving its aspect ratio"
-msgstr "Sorgente scalato per adattarsi a Flat mantentendo le sue proporzioni"
-
-#: src/lib/format.cc:136
-msgid "Source scaled to fit Scope preserving its aspect ratio"
-msgstr "Sorgente scalato per adattarsi a Scope mantentendo le sue proporzioni"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -474,7 +423,7 @@ msgstr "Ancora un altro filtro di deinterlacciamento"
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:540
+#: src/lib/util.cc:541
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -582,7 +531,7 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:683
+#: src/lib/util.cc:684
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -612,7 +561,7 @@ msgstr "sottotitoli non-bitmap non ancora supportati"
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:498
 msgid "sRGB"
 msgstr "sRGB"
 
@@ -628,6 +577,47 @@ msgstr "ancora"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Source scaled to 1.19:1"
+#~ msgstr "Sorgente scalato a 1.19:1"
+
+#~ msgid "Source scaled to 1.33:1"
+#~ msgstr "Sorgente scalato a 1.33:1"
+
+#~ msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
+#~ msgstr "Sorgente scalato a 1.33:1 e poi inviato come Flat"
+
+#~ msgid "Source scaled to 1.375:1"
+#~ msgstr "Sorgente scalato a 1.375:1"
+
+#~ msgid "Source scaled to 1.37:1 (Academy ratio)"
+#~ msgstr "Sorgente scalato a 1.37:1 (Academy ratio)"
+
+#~ msgid "Source scaled to 1.66:1"
+#~ msgstr "Sorgente scalato a 1.66:1"
+
+#~ msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
+#~ msgstr "Sorgente scalato a 1.66:1 e poi inviato come Flat"
+
+#~ msgid "Source scaled to 1.78:1"
+#~ msgstr "Sorgente scalato a 1.78:1"
+
+#~ msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
+#~ msgstr "Sorgente scalato a 1.78:1 e poi inviato come Flat"
+
+#~ msgid "Source scaled to Flat (1.85:1)"
+#~ msgstr "Sorgente scalato a Flat (1.85:1)"
+
+#~ msgid "Source scaled to Scope (2.39:1)"
+#~ msgstr "Sorgente scalato a Scope (2.39:1)"
+
+#~ msgid "Source scaled to fit Flat preserving its aspect ratio"
+#~ msgstr ""
+#~ "Sorgente scalato per adattarsi a Flat mantentendo le sue proporzioni"
+
+#~ msgid "Source scaled to fit Scope preserving its aspect ratio"
+#~ msgstr ""
+#~ "Sorgente scalato per adattarsi a Scope mantentendo le sue proporzioni"
+
 #~ msgid "adding to queue of %1"
 #~ msgstr "aggiungo alla coda %1"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 9af19206f..a155771a7 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"POT-Creation-Date: 2013-04-07 18:17+0100\n"
 "PO-Revision-Date: 2013-04-04 10:22+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,27 +25,27 @@ msgstr "0%"
 msgid "1.19"
 msgstr "1,19"
 
-#: src/lib/format.cc:80
+#: src/lib/format.cc:79
 msgid "1.33"
 msgstr "1,33"
 
-#: src/lib/format.cc:85
+#: src/lib/format.cc:83
 msgid "1.375"
 msgstr "1,375"
 
-#: src/lib/format.cc:100
+#: src/lib/format.cc:95
 msgid "1.66"
 msgstr "1,66"
 
-#: src/lib/format.cc:105
+#: src/lib/format.cc:99
 msgid "1.66 within Flat"
 msgstr "1,66 innanför Flat"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:107
 msgid "16:9"
 msgstr "16:9"
 
-#: src/lib/format.cc:110
+#: src/lib/format.cc:103
 msgid "16:9 within Flat"
 msgstr "16:9 innanför Flat"
 
@@ -52,7 +53,7 @@ msgstr "16:9 innanför Flat"
 msgid "3D denoiser"
 msgstr "3D brusreducering"
 
-#: src/lib/format.cc:90
+#: src/lib/format.cc:87
 msgid "4:3 within Flat"
 msgstr "4:3 innanför Flat"
 
@@ -60,7 +61,7 @@ msgstr "4:3 innanför Flat"
 msgid "A/B transcode %1"
 msgstr "A/B konvertera %1"
 
-#: src/lib/format.cc:95
+#: src/lib/format.cc:91
 msgid "Academy"
 msgstr "Academy"
 
@@ -101,7 +102,7 @@ msgid "Cannot resample audio as libswresample is not present"
 msgstr ""
 "Kan inte omsampla ljudet eftersom libswresample inte finns tillgängligt"
 
-#: src/lib/util.cc:931
+#: src/lib/util.cc:932
 msgid "Centre"
 msgstr "Mitt"
 
@@ -133,15 +134,16 @@ msgstr "Kunde inte skriva till fjärrfil (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Kubiskt interpolerande avflätare"
 
-#: src/lib/util.cc:1006
+#: src/lib/util.cc:1007
 msgid "DCP and source have the same rate.\n"
 msgstr "DCP och källa har samma bildfrekvens.\n"
 
-#: src/lib/util.cc:1016
-msgid "DCP will run at %1%% of the source speed."
-msgstr "DCP kommer att köras på %1%% av källans hastighet."
+#: src/lib/util.cc:1017
+#, fuzzy
+msgid "DCP will run at %1%% of the source speed.\n"
+msgstr "DCP kommer att köras på %1%% av källans hastighet.\n"
 
-#: src/lib/util.cc:1009
+#: src/lib/util.cc:1010
 msgid "DCP will use every other frame of the source.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
@@ -164,7 +166,7 @@ msgstr "Avringningsfilter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1011
+#: src/lib/util.cc:1012
 msgid "Each source 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"
 
@@ -208,11 +210,11 @@ msgstr "Snabb bilinjär"
 msgid "Feature"
 msgstr "Långfilm"
 
-#: src/lib/format.cc:120
+#: src/lib/format.cc:111
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:130
+#: src/lib/format.cc:119
 msgid "Flat without stretch"
 msgstr "Flat utan utsträckning"
 
@@ -256,15 +258,15 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:929
+#: src/lib/util.cc:930
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:933
+#: src/lib/util.cc:934
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:932
+#: src/lib/util.cc:933
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -314,15 +316,15 @@ msgstr "Offentligt Servicemeddelande"
 msgid "Rating"
 msgstr "Klassificeringsklipp"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:500
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:930
+#: src/lib/util.cc:931
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:934
+#: src/lib/util.cc:935
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -330,11 +332,11 @@ msgstr "Höger surround"
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
-#: src/lib/format.cc:125
+#: src/lib/format.cc:115
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:135
+#: src/lib/format.cc:123
 msgid "Scope without stretch"
 msgstr "Scope utan utsträckning"
 
@@ -346,59 +348,6 @@ msgstr "Kortfilm"
 msgid "Sinc"
 msgstr "Sinc"
 
-#: src/lib/format.cc:76
-msgid "Source scaled to 1.19:1"
-msgstr "Källan skalad till 1,19:1"
-
-#: src/lib/format.cc:81
-msgid "Source scaled to 1.33:1"
-msgstr "Källan skalad till 1,33:1"
-
-#: src/lib/format.cc:91
-msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
-msgstr "Källan skalad till 1,33:1, med sorgkanter innanför Flat"
-
-#: src/lib/format.cc:86
-msgid "Source scaled to 1.375:1"
-msgstr "Källan skalad till 1,375:1"
-
-#: src/lib/format.cc:96
-msgid "Source scaled to 1.37:1 (Academy ratio)"
-msgstr "Källan skalad till 1,37:1 (Academy-förhållande)"
-
-#: src/lib/format.cc:101
-msgid "Source scaled to 1.66:1"
-msgstr "Källan skalad till 1,66:1"
-
-#: src/lib/format.cc:106
-msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
-msgstr "Källan skalad till 1,66:1, med sorgkanter innanför Flat"
-
-#: src/lib/format.cc:116
-msgid "Source scaled to 1.78:1"
-msgstr "Källan skalad till 1,78:1"
-
-#: src/lib/format.cc:111
-msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
-msgstr "Källan skalad till 1,78:1, med sorgkanter innanför Flat"
-
-#: src/lib/format.cc:121
-msgid "Source scaled to Flat (1.85:1)"
-msgstr "Källan skalad till Flat (1,85:1)"
-
-#: src/lib/format.cc:126
-msgid "Source scaled to Scope (2.39:1)"
-msgstr "Källan skalad till Scope (2,39:1)"
-
-#: src/lib/format.cc:131
-msgid "Source scaled to fit Flat preserving its aspect ratio"
-msgstr "Källan skalad för att rymmas inom Flat utan att ändra bildförhållandet"
-
-#: src/lib/format.cc:136
-msgid "Source scaled to fit Scope preserving its aspect ratio"
-msgstr ""
-"Källan skalad för att rymmas inom Scope utan att ändra bildförhållandet"
-
 #: src/lib/scaler.cc:68
 msgid "Spline"
 msgstr "Spline"
@@ -479,7 +428,7 @@ msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:540
+#: src/lib/util.cc:541
 #, fuzzy
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
@@ -584,7 +533,7 @@ msgstr "minut"
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:683
+#: src/lib/util.cc:684
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -614,7 +563,7 @@ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:498
 msgid "sRGB"
 msgstr "sRGB"
 
@@ -629,3 +578,44 @@ msgstr "stillbild"
 #: src/lib/film.cc:274
 msgid "video"
 msgstr "video"
+
+#~ msgid "Source scaled to 1.19:1"
+#~ msgstr "Källan skalad till 1,19:1"
+
+#~ msgid "Source scaled to 1.33:1"
+#~ msgstr "Källan skalad till 1,33:1"
+
+#~ msgid "Source scaled to 1.33:1 then pillarboxed to Flat"
+#~ msgstr "Källan skalad till 1,33:1, med sorgkanter innanför Flat"
+
+#~ msgid "Source scaled to 1.375:1"
+#~ msgstr "Källan skalad till 1,375:1"
+
+#~ msgid "Source scaled to 1.37:1 (Academy ratio)"
+#~ msgstr "Källan skalad till 1,37:1 (Academy-förhållande)"
+
+#~ msgid "Source scaled to 1.66:1"
+#~ msgstr "Källan skalad till 1,66:1"
+
+#~ msgid "Source scaled to 1.66:1 then pillarboxed to Flat"
+#~ msgstr "Källan skalad till 1,66:1, med sorgkanter innanför Flat"
+
+#~ msgid "Source scaled to 1.78:1"
+#~ msgstr "Källan skalad till 1,78:1"
+
+#~ msgid "Source scaled to 1.78:1 then pillarboxed to Flat"
+#~ msgstr "Källan skalad till 1,78:1, med sorgkanter innanför Flat"
+
+#~ msgid "Source scaled to Flat (1.85:1)"
+#~ msgstr "Källan skalad till Flat (1,85:1)"
+
+#~ msgid "Source scaled to Scope (2.39:1)"
+#~ msgstr "Källan skalad till Scope (2,39:1)"
+
+#~ msgid "Source scaled to fit Flat preserving its aspect ratio"
+#~ msgstr ""
+#~ "Källan skalad för att rymmas inom Flat utan att ändra bildförhållandet"
+
+#~ msgid "Source scaled to fit Scope preserving its aspect ratio"
+#~ msgstr ""
+#~ "Källan skalad för att rymmas inom Scope utan att ändra bildförhållandet"
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 654546e62..06da94294 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -972,7 +972,7 @@ FrameRateConversion::FrameRateConversion (float source, int dcp)
 
 		if (change_speed) {
 			float const pc = dcp * 100 / (source * factor());
-			description += String::compose (_("DCP will run at %1%% of the source speed."), pc);
+			description += String::compose (_("DCP will run at %1%% of the source speed.\n"), pc);
 		}
 	}
 }