pot_merge.

6 files changed, 348 insertions, 252 deletions

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index e5556af81..3a25b0e81 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-20 11:11+0100\n"
 "PO-Revision-Date: 2014-06-20 03:38+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.5.7\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "%1 existiert bereits als Datei, kann also nicht für einen neuen Film benutzt "
@@ -28,55 +28,59 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "&Projekt hinzufügen"
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Ende"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Datei"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Aufgaben"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&DCP erstellen"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Öffnen..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Einstellungen..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Eigenschaften..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Speichern"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&DCP an TMS senden"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Werkzeuge"
 
@@ -86,11 +90,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Über"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Über DCP-o-matic"
 
@@ -98,7 +102,7 @@ msgstr "Über DCP-o-matic"
 msgid "Add Film..."
 msgstr "Film hinzufügen..."
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -106,34 +110,38 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
 "den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Auf Updates überprüfen..."
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Film %1 (%2) konnte nicht geladen werden"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Der Film konnte nicht bei %s (%s) geöffnet werden"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 "DCP kann nicht angezeigt werden (Konqueror konnte nicht gestartet werden)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "DCP kann nicht angezeigt werden (Nautilus konnte nicht geladen werden)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -141,11 +149,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic Batch Converter"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Encoding Server..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Projekt gewechselt"
 
@@ -155,32 +163,40 @@ msgstr ""
 "Kostenlose Open-Source-Software zur DCP-Erstellung aus nahezu allen "
 "Quellformaten."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Tipps..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "&KDM erstellen..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Neu..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "Z&eige DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Zu öffnendes Projekt auswählen"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -189,11 +205,11 @@ msgstr ""
 "Das DCP für diesen Film wird etwa %.1f Gbyte groß. Auf dem ausgewählten "
 "Laufwerk sind aber nur %.1f Gbyte frei. Möchten Sie trotzdem weitermachen ?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Der DCP-o-matic Download Server ist nicht erreichbar."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -201,17 +217,17 @@ msgstr ""
 "Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
 "benutzen ?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Es ist keine neue Version von DCP-o-matic verfügbar."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Manche Aufgaben sind nicht erledigt - sind Sie sicher, dass Sie Beenden "
 "wollen ?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -220,11 +236,11 @@ msgstr ""
 "worden und wird in dieser Programmversion möglicherweise nicht korrekt "
 "umgesetzt. Bitte prüfen Sie alle Projekteinstellungen sorgfältig!"
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Unerledigte Aufgaben"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index c62f3ff20..0c0cc007f 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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-20 11:11+0100\n"
 "PO-Revision-Date: 2014-04-20 10:21-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.6.4\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 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."
 
@@ -25,55 +25,59 @@ msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
 msgid "&Add Film..."
 msgstr "&Añadir película..."
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Salir"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Herramientas"
 
@@ -83,11 +87,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Acerca de DVD-o-matic"
 
@@ -95,39 +99,43 @@ msgstr "Acerca de DVD-o-matic"
 msgid "Add Film..."
 msgstr "Añadir película..."
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr "Ha ocurrido un error desconocido."
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Buscar actualizaciones"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, 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:538
+#: src/tools/dcpomatic.cc:530
 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:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilos)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -135,11 +143,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "Convertidor por lotes DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Servidores de codificación..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Película cambiada"
 
@@ -149,32 +157,40 @@ msgstr ""
 "Generación libre y de código abierto de DCP a partir de casi cualquier "
 "fuente."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Pistas..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Crear &KDMs..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, 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:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -184,26 +200,26 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 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:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 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:145
+#: src/tools/dcpomatic.cc:141
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -212,11 +228,11 @@ msgstr ""
 "cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
 "opciones."
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Trabajos sin finalizar"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 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 41cde4f5a..730f2b4b3 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-20 11:11+0100\n"
 "PO-Revision-Date: 2014-04-18 22:54+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 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."
@@ -26,55 +26,59 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "&Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Quitter"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Outils"
 
@@ -84,11 +88,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
@@ -96,39 +100,43 @@ msgstr "À propos de DCP-o-matic"
 msgid "Add Film..."
 msgstr "Ajouter Film..."
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr "Une exception inconnue est arrivée"
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Recherche mises à jour"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -136,11 +144,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic - Convertisseur Batch"
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Serveurs d'encodage"
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film changé"
 
@@ -148,32 +156,40 @@ msgstr "Film changé"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et open-source à partir de presque tout."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Avertissements..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Générer &KDMs..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -182,26 +198,26 @@ msgstr ""
 "Le DCP de ce film prendra environ %.1f Go d'espace. Le disque que vous "
 "utilisez n'a que %.1f Go disponible(s). Souhaitez-vous continuer?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 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:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Aucune mise à jour disponible pour DCP-o-matic."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Il y a des tâches inachevées ; voulez-vous vraiment quitter ?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -210,11 +226,11 @@ msgstr ""
 "être ouvert correctement dans cette version. Veuillez vérifier les "
 "paramètres de réglages très attentivement."
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Travaux incomplets"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 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 465d32192..dc800bf08 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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-20 11:11+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.6.3\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 
@@ -25,55 +25,59 @@ msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Esci"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Strumenti"
 
@@ -83,11 +87,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Su DVD-o-matic"
 
@@ -95,39 +99,43 @@ msgstr "Su DVD-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Controlla aggiornamenti"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -135,11 +143,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film modificato"
 
@@ -147,32 +155,40 @@ msgstr "Film modificato"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Genera DCP da quasi tutto, free e open-source."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Suggerimenti..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -181,35 +197,35 @@ msgstr ""
 "Il DCP di questo film occupa %.1f Gb, ma il disco che stai usando dispone di "
 "%.1f Gb liberi.  Vuoi continuare ugualmente?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Il download server di DCP-o-matic non può essere contattato."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Non ci sono nuove versioni di DCP-o-matic disponibili."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "C'è un processo in corso: sei sicuro di voler uscire?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Processo in corso"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 0495207e6..89adcfff9 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-20 11:11+0100\n"
 "PO-Revision-Date: 2014-03-30 19:38+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "X-Generator: Poedit 1.6.4\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr ""
 "%1 Dit bestand bestaat al, hierdoor kunt u het niet gebruiken voor een "
@@ -28,55 +28,59 @@ msgstr ""
 msgid "&Add Film..."
 msgstr "Open een DCP map"
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Edit"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Bestand"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Help"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Projecten"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Maak een DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Openen..."
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Voorkeuren..."
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Instellingen..."
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Afsluiten"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Opslaan"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Verstuur DCP naar TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Gereedschappen"
 
@@ -85,11 +89,11 @@ msgid ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Over.."
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Over DCP-o-matic"
 
@@ -97,39 +101,43 @@ msgstr "Over DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Controleer op updates"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Kan film niet openen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kan film niet openen in  %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kan DCP niet vertonen (Kan Konqueror niet starten)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kan DCP niet vertonen (Kan Nautilus niet starten)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -137,11 +145,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Render servers..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film is veranderd"
 
@@ -149,32 +157,40 @@ msgstr "Film is veranderd"
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Tips"
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Maak &KDMs..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Nieuw..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "S&hoe DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Bewaar veranderingen naar film \"%s\" voor afsluiten?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Kies een film om te openen"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -183,26 +199,26 @@ msgstr ""
 "De DCP voor deze film neemt ongeveer %.1f Gb in beslag, er is echter maar "
 "%.1f Gb beschikbaar.  Wilt u toch doorgaan?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "De verbinding met de DCP-o-matic download server is niet beschikbaar."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr "De map %1 bestaat al en is niet leeg. Wilt u deze toch gebruiken?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Er is geen nieuwere versie van DCP-o-matic beschikbaar."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr ""
 "Er zijn nog niet afgeronde projecten, weet u zeker dat u wilt afsluiten?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -210,11 +226,11 @@ msgstr ""
 "Deze film is gemaakt met een oude versie van DCP-o-matic en opent mogelijk "
 "niet goed in de huidige versie.  Controleer alle instellingen zorgvuldig."
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Niet afgemaakte projecten"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 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 901ad3179..b962e4b48 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: 2014-05-02 22:01+0100\n"
+"POT-Creation-Date: 2014-06-20 11:11+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+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.6.3\n"
 
-#: src/tools/dcpomatic.cc:396
+#: src/tools/dcpomatic.cc:370
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 
@@ -25,55 +25,59 @@ msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
 msgid "&Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:270
+#: src/tools/dcpomatic.cc:243
+msgid "&Content"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:241
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dcpomatic.cc:237
+#: src/tools/dcpomatic.cc:204
 msgid "&Exit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:268 src/tools/dcpomatic_batch.cc:55
+#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:55
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dcpomatic.cc:274 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:246 src/tools/dcpomatic_batch.cc:56
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dcpomatic.cc:272
+#: src/tools/dcpomatic.cc:244
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dcpomatic.cc:251
+#: src/tools/dcpomatic.cc:222
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
-#: src/tools/dcpomatic.cc:227
+#: src/tools/dcpomatic.cc:194
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dcpomatic.cc:244 src/tools/dcpomatic.cc:247
+#: src/tools/dcpomatic.cc:211 src/tools/dcpomatic.cc:214
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
-#: src/tools/dcpomatic.cc:231
+#: src/tools/dcpomatic.cc:198
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dcpomatic.cc:239 src/tools/dcpomatic_batch.cc:50
+#: src/tools/dcpomatic.cc:206 src/tools/dcpomatic_batch.cc:50
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: src/tools/dcpomatic.cc:229
+#: src/tools/dcpomatic.cc:196
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dcpomatic.cc:253
+#: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dcpomatic.cc:273
+#: src/tools/dcpomatic.cc:245
 msgid "&Tools"
 msgstr "&Verktyg"
 
@@ -83,11 +87,11 @@ msgid ""
 msgstr ""
 "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 
-#: src/tools/dcpomatic.cc:265 src/tools/dcpomatic_batch.cc:53
+#: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dcpomatic.cc:263
+#: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
 msgstr "Om DCP-o-matic"
 
@@ -95,39 +99,43 @@ msgstr "Om DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic.cc:766
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:508
+#: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:259
+#: src/tools/dcpomatic.cc:480
+msgid "CPL's content is not encrypted."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
 msgstr "Leta efter uppdateringar"
 
-#: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic.cc:691 src/tools/dcpomatic_batch.cc:255
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dcpomatic.cc:439 src/tools/dcpomatic_batch.cc:193
+#: src/tools/dcpomatic.cc:412 src/tools/dcpomatic_batch.cc:193
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dcpomatic.cc:538
+#: src/tools/dcpomatic.cc:530
 msgid "Could not show DCP (could not run konqueror)"
 msgstr "Kunde inte visa DCP (kunde inte köra konqueror)"
 
-#: src/tools/dcpomatic.cc:531
+#: src/tools/dcpomatic.cc:523
 msgid "Could not show DCP (could not run nautilus)"
 msgstr "Kunde inte visa DCP (kunde inte köra nautilus)"
 
-#: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
-#: src/tools/dcpomatic.cc:678
+#: src/tools/dcpomatic.cc:341 src/tools/dcpomatic.cc:651
+#: src/tools/dcpomatic.cc:705
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -135,11 +143,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:258
+#: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
 msgstr "Kodningsservrar..."
 
-#: src/tools/dcpomatic.cc:95
+#: src/tools/dcpomatic.cc:91
 msgid "Film changed"
 msgstr "Film ändrad"
 
@@ -148,32 +156,40 @@ msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
 "Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som helst."
 
-#: src/tools/dcpomatic.cc:257
+#: src/tools/dcpomatic.cc:228
 msgid "Hints..."
 msgstr "Råd..."
 
-#: src/tools/dcpomatic.cc:252
+#: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
 msgstr "Skapa &KDM:er..."
 
-#: src/tools/dcpomatic.cc:226
+#: src/tools/dcpomatic.cc:193
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dcpomatic.cc:254
+#: src/tools/dcpomatic.cc:225
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dcpomatic.cc:94
+#: src/tools/dcpomatic.cc:90
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
 
-#: src/tools/dcpomatic.cc:416 src/tools/dcpomatic_batch.cc:170
+#: src/tools/dcpomatic.cc:219
+msgid "Scale to fit &height"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:218
+msgid "Scale to fit &width"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dcpomatic.cc:477
+#: src/tools/dcpomatic.cc:451
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -182,11 +198,11 @@ msgstr ""
 "DCP:n för denna film kommer att uppta ungefär %.1f Gb, och disken du "
 "använder har bara %.1f Gb ledigt. Vill du fortsätta ändå?"
 
-#: src/tools/dcpomatic.cc:782
+#: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
 
-#: src/tools/dcpomatic.cc:386
+#: src/tools/dcpomatic.cc:360
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
@@ -194,25 +210,25 @@ msgstr ""
 "Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
 "den?"
 
-#: src/tools/dcpomatic.cc:777
+#: src/tools/dcpomatic.cc:799
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Det finns inga nya versioner av DCP-o-matic tillgängligt."
 
-#: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
+#: src/tools/dcpomatic.cc:575 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "Det finns oasvlutade jobb; är du säker på att du vill avsluta?"
 
-#: src/tools/dcpomatic.cc:145
+#: src/tools/dcpomatic.cc:141
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic.cc:576 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"
 msgstr "Oavslutade jobb"
 
-#: src/tools/dcpomatic.cc:425 src/tools/dcpomatic_batch.cc:179
+#: src/tools/dcpomatic.cc:398 src/tools/dcpomatic_batch.cc:179
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."