Merge master.

5 files changed, 53 insertions, 35 deletions

diff --git a/src/lib/format.cc b/src/lib/format.cc
index addab2b60..5eda9eb88 100644
--- a/src/lib/format.cc
+++ b/src/lib/format.cc
@@ -113,6 +113,10 @@ Format::setup_formats ()
 			));
 	
 	_formats.push_back (
+		new FixedFormat (178, libdcp::Size (2048, 858), N_("178-in-scope"), _("16:9 within Scope"), N_("S")
+			));
+	
+	_formats.push_back (
 		new FixedFormat (239, libdcp::Size (2048, 858), N_("239"), _("Scope"), N_("S")
 			));
 		
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 8f6a06563..17051bd98 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDVDOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+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"
@@ -49,6 +49,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 en Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 en Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "reducción de ruido 3D"
@@ -214,7 +219,7 @@ msgstr "Película"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat sin deformación"
 
@@ -332,11 +337,11 @@ msgstr ""
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope sin deformación"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index ccdad3fe2..d9d945b52 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-07 18:17+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"
@@ -48,6 +48,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 dans Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 dans Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "Débruitage 3D"
@@ -139,7 +144,7 @@ msgstr "Le DCP et la source ont les mêmes cadences.\n"
 #: 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"
+msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 
 #: src/lib/util.cc:1010
 msgid "DCP will use every other frame of the source.\n"
@@ -212,7 +217,7 @@ msgstr "Feature"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat sans déformation"
 
@@ -330,11 +335,11 @@ msgstr "Arrière droite"
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope sans déformation"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 8e9b7166b..992eda107 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-03-20 11:45+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-03 15:04+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
 "Language: Italiano\n"
@@ -49,6 +49,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 all'interno di Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 all'interno di Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "Riduttore di rumore 3D"
@@ -91,11 +96,11 @@ msgstr "Bilineare"
 
 #: src/lib/job.cc:302
 msgid "Cancelled"
-msgstr ""
+msgstr "Cancellato"
 
 #: src/lib/exceptions.cc:60
 msgid "Cannot handle pixel format %1 during %2"
-msgstr ""
+msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
 #: src/lib/encoder.cc:101
 msgid "Cannot resample audio as libswresample is not present"
@@ -103,7 +108,7 @@ msgstr "Non posso ricampionare l'audio perchè libswresample non è presente"
 
 #: src/lib/util.cc:932
 msgid "Centre"
-msgstr ""
+msgstr "Centro"
 
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
@@ -138,7 +143,6 @@ msgid "DCP and source have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
 #: 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"
 
@@ -213,7 +217,7 @@ msgstr "Caratteristica"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat senza stiramento"
 
@@ -259,15 +263,15 @@ msgstr "Lanczos"
 
 #: src/lib/util.cc:930
 msgid "Left"
-msgstr ""
+msgstr "Sinistro"
 
 #: src/lib/util.cc:934
 msgid "Left surround"
-msgstr ""
+msgstr "Surround sinistro"
 
 #: src/lib/util.cc:933
 msgid "Lfe (sub)"
-msgstr ""
+msgstr "Lfe(sub)"
 
 #: src/lib/filter.cc:75
 msgid "Linear blend deinterlacer"
@@ -321,21 +325,21 @@ msgstr "Rec 709"
 
 #: src/lib/util.cc:931
 msgid "Right"
-msgstr ""
+msgstr "Destro"
 
 #: src/lib/util.cc:935
 msgid "Right surround"
-msgstr ""
+msgstr "Surround destro"
 
 #: src/lib/scp_dcp_job.cc:133
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope senza stiramento"
 
@@ -417,7 +421,7 @@ msgstr "X"
 
 #: src/lib/filter.cc:83
 msgid "Yet Another Deinterlacing Filter"
-msgstr "Ancora un altro filtro di deinterlacciamento"
+msgstr "Altro filtro di deinterlacciamento"
 
 #: src/lib/film.cc:263
 msgid "cannot contain slashes"
@@ -444,7 +448,6 @@ msgid "copying %1"
 msgstr "copia %1"
 
 #: src/lib/exceptions.cc:36
-#, fuzzy
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
@@ -469,7 +472,6 @@ msgid "could not open external audio file for reading"
 msgstr "non riesco ad aprire il file dell'audio esterno per leggerlo"
 
 #: src/lib/exceptions.cc:29
-#, fuzzy
 msgid "could not open file %1"
 msgstr "non riesco ad aprire il file per leggerlo"
 
@@ -478,7 +480,6 @@ msgid "could not open file for reading"
 msgstr "non riesco ad aprire il file per leggerlo"
 
 #: src/lib/exceptions.cc:44
-#, fuzzy
 msgid "could not read from file %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
@@ -495,7 +496,6 @@ msgid "could not start SSH session"
 msgstr "non posso avviare la sessione SSH"
 
 #: src/lib/exceptions.cc:50
-#, fuzzy
 msgid "could not write to file %1 (%2)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
@@ -537,7 +537,7 @@ msgstr "persa la chiave %1 tra i valori chiave"
 
 #: src/lib/exceptions.cc:54
 msgid "missing required setting %1"
-msgstr ""
+msgstr "persa la regolazione richiesta %1"
 
 #: src/lib/subtitle.cc:52
 msgid "multi-part subtitles not yet supported"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index a155771a7..d574261c8 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-07 18:17+0100\n"
-"PO-Revision-Date: 2013-04-04 10:22+0100\n"
+"POT-Creation-Date: 2013-04-09 11:14+0100\n"
+"PO-Revision-Date: 2013-04-09 10:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -49,6 +49,11 @@ msgstr "16:9"
 msgid "16:9 within Flat"
 msgstr "16:9 innanför Flat"
 
+#: src/lib/format.cc:115
+#, fuzzy
+msgid "16:9 within Scope"
+msgstr "16:9 innanför Flat"
+
 #: src/lib/filter.cc:88
 msgid "3D denoiser"
 msgstr "3D brusreducering"
@@ -139,7 +144,6 @@ msgid "DCP and source have the same rate.\n"
 msgstr "DCP och källa har samma bildfrekvens.\n"
 
 #: 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"
 
@@ -214,7 +218,7 @@ msgstr "Långfilm"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:119
+#: src/lib/format.cc:123
 msgid "Flat without stretch"
 msgstr "Flat utan utsträckning"
 
@@ -332,11 +336,11 @@ msgstr "Höger surround"
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
-#: src/lib/format.cc:115
+#: src/lib/format.cc:119
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Scope without stretch"
 msgstr "Scope utan utsträckning"