Merge master.

diff --git a/ChangeLog b/ChangeLog
index 1bbaed6e5222024718f96bbe4e6c900e3625d9c1..38a8ea5ce01a929593fb280a30e2e505f7f22552 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
        * Add subtitle view.
 
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.67.1 released.
+
+2014-04-29  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.67.0 released.
+
 2014-04-27  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.66.16 released.

diff --git a/cscript b/cscript
index 890c937e6f3d15e8be71bbe7b96418fdc017a027..e1a987fdec0f73b13aa222b682ee0178d0ad5412 100644 (file)
--- a/cscript
+++ b/cscript
@@ -143,7 +143,7 @@ def make_control(debian_version, bits, filename, debug):
         print >>f,''
 
 def dependencies(target):
-    return (('ffmpeg-cdist', 'a0db025'),
+    return (('ffmpeg-cdist', 'bba68a5'),
             ('libdcp', '1.0'))
 
 def build(target, options):

diff --git a/debian/changelog b/debian/changelog
index f941ea6b5a55941e96380a640ef88a1e1333b0d8..23b1da6115b11c4a18366cba7c35a2145d9da547 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.66.16-1) UNRELEASED; urgency=low
+dcpomatic (1.67.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -120,8 +120,10 @@ dcpomatic (1.66.16-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 27 Apr 2014 21:46:39 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Tue, 29 Apr 2014 18:29:53 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/i18n.py b/i18n.py
index 51d236dc631d36d5a36b3d0f29d8667db17a6b46..26a8a10ec3041ad2bd3592b6eb7f485d6f021c59 100644 (file)
--- a/i18n.py
+++ b/i18n.py
@@ -3,7 +3,7 @@ import os
 from waflib import Logs
 
 def command(c):
-    print c
+    print(c)
     os.system(c)
 
 def pot(dir, sources, name):

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 52a6a710103ce0b0ae232bbaec5011b01c6a9bf9..1207dccef5e2f22b189a133aeee56b51a9e47dc1 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -85,6 +85,7 @@ universal_copy $ENV lib/libzip*.dylib $WORK/$libs
 universal_copy $ENV lib/libquickmail*.dylib $WORK/$libs
 universal_copy $ENV lib/libcurl*.dylib $WORK/$libs
 universal_copy $ENV lib/libffi*.dylib $WORK/$libs
+universal_copy $ENV lib/libiconv*.dylib $WORK/$libs
 
 for obj in $WORK/$macos/dcpomatic $WORK/$macos/ffprobe $WORK/$libs/*.dylib; do
   deps=`otool -L $obj | awk '{print $1}' | egrep "(/Users/carl|libboost|libssh|libltdl|libxmlsec)"`

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index d602e9601c22378ca89ad1a6743b6dde87d1163f..1938ed30254c29f6f61566743de69fab1488e638 100644 (file)
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-01-14 19:45+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -110,7 +110,7 @@ msgstr "Überprüfe bestehende Bilddateien"
 msgid "Computing audio digest"
 msgstr "Ton berechnen"
 
-#: src/lib/image_content.cc:100
+#: src/lib/image_content.cc:104
 msgid "Computing digest"
 msgstr "Teil berechnen"
 
@@ -328,9 +328,10 @@ msgid "High quality 3D denoiser"
 msgstr "3D Rauschunterdrückung Hoher Qualität"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
+#, fuzzy
 msgid ""
-"It is not known what caused this error.  The best idea is to report the "
-"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+"It is not known what caused this error.  Please report the problem to the "
+"DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
 "Dieser Fehler ist nicht bekannt. Am besten den Fehler an die DCP-o-matic "
 "Mailliste (carl@dcpomatic.com) schicken."
@@ -372,14 +373,18 @@ msgstr "Verschiedenes"
 msgid "Motion compensating deinterlacer"
 msgstr "Kompensierender Bewegungsde-interlacer"
 
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:449
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:446
 msgid "No stretch"
 msgstr ""
 
+#: src/lib/image_content.cc:49
+msgid "No valid image files were found in the folder."
+msgstr ""
+
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Rauschunterdrückung"
@@ -553,11 +558,11 @@ msgstr "Noch ein anderer De-Interlacer"
 msgid "You must add some content to the DCP before creating it"
 msgstr "Sie müssen einen Inhalt hinzufügen bevor Sie ein DCP erstellen können."
 
-#: src/lib/image_content.cc:68
+#: src/lib/image_content.cc:72
 msgid "[moving images]"
 msgstr "[Bewegte Bilder]"
 
-#: src/lib/image_content.cc:66
+#: src/lib/image_content.cc:70
 msgid "[still]"
 msgstr "[Standbild]"
 
@@ -689,7 +694,7 @@ msgstr "Key %1 in Key-value set fehlt"
 msgid "missing required setting %1"
 msgstr "Benötigte Einstellung %1 fehlt"
 
-#: src/lib/image_content.cc:83
+#: src/lib/image_content.cc:87
 msgid "moving"
 msgstr "wird verschoben"
 
@@ -723,7 +728,7 @@ msgstr "sRGB nicht linearisiert"
 msgid "seconds"
 msgstr "Sekunden"
 
-#: src/lib/image_content.cc:81
+#: src/lib/image_content.cc:85
 msgid "still"
 msgstr "Standbild"
 

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 337185c5f81f006201cc892c97e6b08abe9333d3..10455a19a50c92fdb6e1b06d5cde4d296e950020 100644 (file)
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -109,7 +109,7 @@ msgstr "Comprobando las imágenes existentes"
 msgid "Computing audio digest"
 msgstr "Calculando la firma resumen del audio"
 
-#: src/lib/image_content.cc:100
+#: src/lib/image_content.cc:104
 msgid "Computing digest"
 msgstr "Calculando la firma resumen"
 
@@ -325,9 +325,10 @@ msgid "High quality 3D denoiser"
 msgstr "Reductor de ruido 3D de alta calidad"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
+#, fuzzy
 msgid ""
-"It is not known what caused this error.  The best idea is to report the "
-"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+"It is not known what caused this error.  Please report the problem to the "
+"DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
 "Error desconocido. La mejor idea es informar del problema a la lista de "
 "correo de DCP-o-matic (carl@dcpomatic.com)"
@@ -368,14 +369,18 @@ msgstr "Miscelánea"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:449
 msgid "No scale"
 msgstr "No redimensionar"
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:446
 msgid "No stretch"
 msgstr "Sin deformación"
 
+#: src/lib/image_content.cc:49
+msgid "No valid image files were found in the folder."
+msgstr ""
+
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
@@ -548,11 +553,11 @@ msgstr "Yet Another Deinterlacing Filter"
 msgid "You must add some content to the DCP before creating it"
 msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
-#: src/lib/image_content.cc:68
+#: src/lib/image_content.cc:72
 msgid "[moving images]"
 msgstr "[imágenes en movimiento]"
 
-#: src/lib/image_content.cc:66
+#: src/lib/image_content.cc:70
 msgid "[still]"
 msgstr "[imagen fija]"
 
@@ -684,7 +689,7 @@ msgstr "falta la clave %1 en el par clave-valor"
 msgid "missing required setting %1"
 msgstr "falta una configuración obligatoria %1"
 
-#: src/lib/image_content.cc:83
+#: src/lib/image_content.cc:87
 msgid "moving"
 msgstr "moviendo"
 
@@ -718,7 +723,7 @@ msgstr "sRGB no-lineal"
 msgid "seconds"
 msgstr "segundos"
 
-#: src/lib/image_content.cc:81
+#: src/lib/image_content.cc:85
 msgid "still"
 msgstr "imagen fija"
 

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index b88099016893a6d73386bfddce326fc17ee48c86..84ca8d1d45478866e145d75691883ccc031069a5 100644 (file)
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-04-18 22:51+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -109,7 +109,7 @@ msgstr "Recherche de données images existantes"
 msgid "Computing audio digest"
 msgstr "Fabrication rendu audio"
 
-#: src/lib/image_content.cc:100
+#: src/lib/image_content.cc:104
 msgid "Computing digest"
 msgstr "fabrication rendu"
 
@@ -320,9 +320,10 @@ msgid "High quality 3D denoiser"
 msgstr "Débruiteur 3D haute qualité"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
+#, fuzzy
 msgid ""
-"It is not known what caused this error.  The best idea is to report the "
-"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+"It is not known what caused this error.  Please report the problem to the "
+"DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic "
 "(carl@dcpomatic.com)"
@@ -363,14 +364,18 @@ msgstr "Divers"
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:449
 msgid "No scale"
 msgstr "Pas de mise à l'échelle"
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:446
 msgid "No stretch"
 msgstr "Sans déformation"
 
+#: src/lib/image_content.cc:49
+msgid "No valid image files were found in the folder."
+msgstr ""
+
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
@@ -541,11 +546,11 @@ msgstr "Un autre filtre de désentrelacement"
 msgid "You must add some content to the DCP before creating it"
 msgstr "Ajoutez un contenu pour créer le DCP"
 
-#: src/lib/image_content.cc:68
+#: src/lib/image_content.cc:72
 msgid "[moving images]"
 msgstr "[Déplacement d'images]"
 
-#: src/lib/image_content.cc:66
+#: src/lib/image_content.cc:70
 #, fuzzy
 msgid "[still]"
 msgstr "[fixe]"
@@ -680,7 +685,7 @@ msgstr "clé %1 non sélectionnée"
 msgid "missing required setting %1"
 msgstr "paramètre %1 manquant"
 
-#: src/lib/image_content.cc:83
+#: src/lib/image_content.cc:87
 msgid "moving"
 msgstr "déplacement"
 
@@ -714,7 +719,7 @@ msgstr "sRGB non linéarisé"
 msgid "seconds"
 msgstr "secondes"
 
-#: src/lib/image_content.cc:81
+#: src/lib/image_content.cc:85
 #, fuzzy
 msgid "still"
 msgstr "%1 [fixe]"

diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 8ca337e458b0d89243c4a2e3844cb54688b39e11..185138bf72bc6c4e41e1a564b018a3b2a7138a8c 100644 (file)
--- 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: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -110,7 +110,7 @@ msgstr ""
 msgid "Computing audio digest"
 msgstr ""
 
-#: src/lib/image_content.cc:100
+#: src/lib/image_content.cc:104
 msgid "Computing digest"
 msgstr ""
 
@@ -333,9 +333,10 @@ msgid "High quality 3D denoiser"
 msgstr "Riduttore di rumore 3D di alta qualità"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
+#, fuzzy
 msgid ""
-"It is not known what caused this error.  The best idea is to report the "
-"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+"It is not known what caused this error.  Please report the problem to the "
+"DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
 "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un "
 "report del problema alla mailing list di DCP-o-matic (carl@dcpomatic.com)"
@@ -377,15 +378,19 @@ msgstr "Varie"
 msgid "Motion compensating deinterlacer"
 msgstr "Dinterlacciatore con compensazione di movimento"
 
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:449
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:446
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat senza stiramento"
 
+#: src/lib/image_content.cc:49
+msgid "No valid image files were found in the folder."
+msgstr ""
+
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
@@ -562,11 +567,11 @@ msgstr "Altro filtro di deinterlacciamento"
 msgid "You must add some content to the DCP before creating it"
 msgstr "Devi aggiungere dei contenuti al DCP prima di crearlo"
 
-#: src/lib/image_content.cc:68
+#: src/lib/image_content.cc:72
 msgid "[moving images]"
 msgstr ""
 
-#: src/lib/image_content.cc:66
+#: src/lib/image_content.cc:70
 #, fuzzy
 msgid "[still]"
 msgstr "ancora"
@@ -701,7 +706,7 @@ msgstr "persa la chiave %1 tra i valori chiave"
 msgid "missing required setting %1"
 msgstr "persa la regolazione richiesta %1"
 
-#: src/lib/image_content.cc:83
+#: src/lib/image_content.cc:87
 msgid "moving"
 msgstr ""
 
@@ -735,7 +740,7 @@ msgstr "sRGB non linearizzato"
 msgid "seconds"
 msgstr "secondi"
 
-#: src/lib/image_content.cc:81
+#: src/lib/image_content.cc:85
 #, fuzzy
 msgid "still"
 msgstr "ancora"

diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index b3f266e16bfde5d197bf3647d695c88318484e2c..4c8f372bde7c9abc1a4b429b9776a64e0e60db05 100644 (file)
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-03-30 19:39+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -110,7 +110,7 @@ msgstr "Controleer bestaande videodata"
 msgid "Computing audio digest"
 msgstr "Verwerk audio data"
 
-#: src/lib/image_content.cc:100
+#: src/lib/image_content.cc:104
 msgid "Computing digest"
 msgstr "Verwerken..."
 
@@ -326,9 +326,10 @@ msgid "High quality 3D denoiser"
 msgstr "High quality 3D denoiser"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
+#, fuzzy
 msgid ""
-"It is not known what caused this error.  The best idea is to report the "
-"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+"It is not known what caused this error.  Please report the problem to the "
+"DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
 "Dit is een onbekende fout. U kunt deze het beste melden bij de DCP-o-matic "
 "mailing lijst (carl@dcpomatic.com)"
@@ -369,14 +370,18 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Motion compensating deinterlacer"
 
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:449
 msgid "No scale"
 msgstr "Niet vergroten of verkleinen"
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:446
 msgid "No stretch"
 msgstr "Niet uitvullen"
 
+#: src/lib/image_content.cc:49
+msgid "No valid image files were found in the folder."
+msgstr ""
+
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Ruis reductie"
@@ -551,11 +556,11 @@ msgstr "Yet Another Deinterlacing Filter"
 msgid "You must add some content to the DCP before creating it"
 msgstr "U moet wat content toevoegen voor het maken van de DCP"
 
-#: src/lib/image_content.cc:68
+#: src/lib/image_content.cc:72
 msgid "[moving images]"
 msgstr "[bewegend beeld]"
 
-#: src/lib/image_content.cc:66
+#: src/lib/image_content.cc:70
 msgid "[still]"
 msgstr "[still]"
 
@@ -687,7 +692,7 @@ msgstr "ontbrekende key %1 in key-value set"
 msgid "missing required setting %1"
 msgstr "ontbrekende verplichte setting %1"
 
-#: src/lib/image_content.cc:83
+#: src/lib/image_content.cc:87
 msgid "moving"
 msgstr "bewegend"
 
@@ -721,7 +726,7 @@ msgstr "sRGB non-linearised"
 msgid "seconds"
 msgstr "secondes"
 
-#: src/lib/image_content.cc:81
+#: src/lib/image_content.cc:85
 msgid "still"
 msgstr "still"
 

diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 5fc0daa29c0b885d15b8dda625398075dba003cf..1867e3be736bc0e1b7d72591c45b85b559337280 100644 (file)
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -109,7 +109,7 @@ msgstr "Kontrollerar befintligt bilddata"
 msgid "Computing audio digest"
 msgstr "Beräknar audiosammanfattning"
 
-#: src/lib/image_content.cc:100
+#: src/lib/image_content.cc:104
 msgid "Computing digest"
 msgstr "Beräknar sammanfattning"
 
@@ -329,9 +329,10 @@ msgid "High quality 3D denoiser"
 msgstr "Högkvalitets 3D-brusreducering"
 
 #: src/lib/job.cc:111 src/lib/job.cc:121
+#, fuzzy
 msgid ""
-"It is not known what caused this error.  The best idea is to report the "
-"problem to the DCP-o-matic mailing list (carl@dcpomatic.com)"
+"It is not known what caused this error.  Please report the problem to the "
+"DCP-o-matic author (carl@dcpomatic.com)."
 msgstr ""
 "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
 "problemet är till DCP-o-matics mejl-lista (carl@dcpomatic.com)"
@@ -373,15 +374,19 @@ msgstr "Diverse"
 msgid "Motion compensating deinterlacer"
 msgstr "Rörelsekompenserande avflätare"
 
-#: src/lib/video_content.cc:447
+#: src/lib/video_content.cc:449
 msgid "No scale"
 msgstr ""
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:446
 #, fuzzy
 msgid "No stretch"
 msgstr "Flat utan utsträckning"
 
+#: src/lib/image_content.cc:49
+msgid "No valid image files were found in the folder."
+msgstr ""
+
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
 msgstr "Brusreducering"
@@ -558,11 +563,11 @@ msgstr "Yet Another Deinterlacing Filter"
 msgid "You must add some content to the DCP before creating it"
 msgstr "Du måste lägga till något innehåll till DCP:n innan du skapar den"
 
-#: src/lib/image_content.cc:68
+#: src/lib/image_content.cc:72
 msgid "[moving images]"
 msgstr "[rörliga bilder]"
 
-#: src/lib/image_content.cc:66
+#: src/lib/image_content.cc:70
 msgid "[still]"
 msgstr "[stillbild]"
 
@@ -697,7 +702,7 @@ msgid "missing required setting %1"
 msgstr "saknad nödvändig inställning %1"
 
 # Sammanhang?
-#: src/lib/image_content.cc:83
+#: src/lib/image_content.cc:87
 msgid "moving"
 msgstr "rörlig"
 
@@ -731,7 +736,7 @@ msgstr "sRGB icke-linjär"
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/lib/image_content.cc:81
+#: src/lib/image_content.cc:85
 msgid "still"
 msgstr "stillbild"
 

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 85eae1957cf0c76e4bce58cd5f81e9663086213a..9df59c280a5f6637de519ab182e16eca0c20c380 100644 (file)
--- 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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-01-14 19:49+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -97,6 +97,12 @@ msgstr "Über DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
+#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+msgid ""
+"An unknown exception occurred.  Please report this problem to the DCP-o-"
+"matic author (carl@dcpomatic.com)."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:508
 msgid "An unknown exeception occurred."
 msgstr ""
@@ -177,7 +183,7 @@ msgstr ""
 "Das DCP für diesen Film wird etwa %.1f GB groß. Auf dem ausgewählten "
 "Laufwerk sind aber nur %.1f GB frei. Möchten Sie trotzdem weitermachen ?"
 
-#: src/tools/dcpomatic.cc:771
+#: src/tools/dcpomatic.cc:782
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Der DCP-o-matic Download Server ist nicht erreichbar."
 
@@ -189,7 +195,7 @@ msgstr ""
 "Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
 "benutzen ?"
 
-#: src/tools/dcpomatic.cc:766
+#: src/tools/dcpomatic.cc:777
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Es ist keine neue Version des DCP-o-matic verfügbar."
 

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index e26a8221c26f03b5d87158a8a9700181fffec80e..950005b60c7307482a89b7dd97a9c72bcd04c259 100644 (file)
--- 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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+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"
@@ -95,6 +95,12 @@ msgstr "Acerca de DVD-o-matic"
 msgid "Add Film..."
 msgstr "Añadir película..."
 
+#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+msgid ""
+"An unknown exception occurred.  Please report this problem to the DCP-o-"
+"matic author (carl@dcpomatic.com)."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:508
 msgid "An unknown exeception occurred."
 msgstr "Ha ocurrido un error desconocido."
@@ -178,7 +184,7 @@ msgstr ""
 "seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
 "formas?"
 
-#: src/tools/dcpomatic.cc:771
+#: src/tools/dcpomatic.cc:782
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
@@ -189,7 +195,7 @@ msgid ""
 msgstr ""
 "El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
 
-#: src/tools/dcpomatic.cc:766
+#: src/tools/dcpomatic.cc:777
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index b573e5b7d6d329249e70374d7734b8696de2f6c3..fd972b1b92644da28f8cb099064a9e194bf9db27 100644 (file)
--- 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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-04-18 22:54+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -96,6 +96,12 @@ msgstr "À propos de DCP-o-matic"
 msgid "Add Film..."
 msgstr "Ajouter Film..."
 
+#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+msgid ""
+"An unknown exception occurred.  Please report this problem to the DCP-o-"
+"matic author (carl@dcpomatic.com)."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:508
 msgid "An unknown exeception occurred."
 msgstr "Une exception inconnue est arrivée"
@@ -176,7 +182,7 @@ 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:771
+#: src/tools/dcpomatic.cc:782
 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é."
 
@@ -187,7 +193,7 @@ msgid ""
 msgstr ""
 "Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
 
-#: src/tools/dcpomatic.cc:766
+#: src/tools/dcpomatic.cc:777
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Aucune mise à jour disponible pour DCP-o-matic."
 

diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index eb520fc903b38aa99e8eb6c9c4d363fefba95dce..7b886a2b7555d1fe017a7a35e43fd985f18824f2 100644 (file)
--- 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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -95,6 +95,12 @@ msgstr "Su DVD-o-matic"
 msgid "Add Film..."
 msgstr ""
 
+#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+msgid ""
+"An unknown exception occurred.  Please report this problem to the DCP-o-"
+"matic author (carl@dcpomatic.com)."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:508
 msgid "An unknown exeception occurred."
 msgstr ""
@@ -175,7 +181,7 @@ 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:771
+#: src/tools/dcpomatic.cc:782
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Il download server di DCP-o-matic non può essere contattato."
 
@@ -185,7 +191,7 @@ msgid ""
 "use it?"
 msgstr "La cartella %1 esiste già e non è vuota.  Sei sicuro di volerla usare?"
 
-#: src/tools/dcpomatic.cc:766
+#: src/tools/dcpomatic.cc:777
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Non ci sono nuove versioni di DCP-o-matic disponibili."
 

diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 7b5f71060ffbef97cc613d6836ba9be1d6594af9..780535593a99d59ef0b37e86d7120f3c64f55ff1 100644 (file)
--- 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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+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"
@@ -97,6 +97,12 @@ msgstr "Over DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
+#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+msgid ""
+"An unknown exception occurred.  Please report this problem to the DCP-o-"
+"matic author (carl@dcpomatic.com)."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:508
 msgid "An unknown exeception occurred."
 msgstr "Er is een onbekende fout opgetreden."
@@ -177,7 +183,7 @@ 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:771
+#: src/tools/dcpomatic.cc:782
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "De verbinding met de DCP-o-matic download server is niet beschikbaar."
 
@@ -187,7 +193,7 @@ msgid ""
 "use it?"
 msgstr "De map %1 bestaat al en is niet leeg. Wilt u deze toch gebruiken?"
 
-#: src/tools/dcpomatic.cc:766
+#: src/tools/dcpomatic.cc:777
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Er is geen nieuwere versie van DCP-o-matic beschikbaar."
 

diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 8dc8238e8b6c6f0fcf68681f0593e0ce400f693e..95ac054bdfc6c310815dd1708bce65bc6729d0a7 100644 (file)
--- 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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -95,6 +95,12 @@ msgstr "Om DCP-o-matic"
 msgid "Add Film..."
 msgstr ""
 
+#: src/tools/dcpomatic.cc:738 src/tools/dcpomatic.cc:744
+msgid ""
+"An unknown exception occurred.  Please report this problem to the DCP-o-"
+"matic author (carl@dcpomatic.com)."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:508
 msgid "An unknown exeception occurred."
 msgstr ""
@@ -176,7 +182,7 @@ 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:771
+#: src/tools/dcpomatic.cc:782
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
 
@@ -188,7 +194,7 @@ msgstr ""
 "Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
 "den?"
 
-#: src/tools/dcpomatic.cc:766
+#: src/tools/dcpomatic.cc:777
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Det finns inga nya versioner av DCP-o-matic tillgängligt."
 

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 69a2cc916ec09127c8b34bf21c7f34688bf4168e..fe2c8d7ab5266a5c4d9b07b3adbb6ba8ea91e1e7 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -115,6 +115,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        supported_by.Add (wxT ("Frank Cianciolo"));
        supported_by.Add (wxT ("Cinema Clarici"));
        supported_by.Add (wxT ("Adam Colt"));
+       supported_by.Add (wxT ("Matthias Damm"));
        supported_by.Add (wxT ("Andres Fink"));
        supported_by.Add (wxT ("Evan Freeze"));
        supported_by.Add (wxT ("Silvio Giuliano"));

diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index e82ba62f138c6e20d72609efb97ef16d762b8935..9886102217d790c880a29646ea839cb12578691c 100644 (file)
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-01-14 20:00+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -65,10 +65,19 @@ msgstr "3D"
 msgid "3D alternate"
 msgstr ""
 
+#: src/wx/video_panel.cc:200
+msgid "3D left only"
+msgstr ""
+
 #: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D Links/Rechts"
 
+#: src/wx/video_panel.cc:201
+#, fuzzy
+msgid "3D right only"
+msgstr "3D Links/Rechts"
+
 #: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D Oben/Unten"
@@ -105,7 +114,7 @@ msgstr "Ordner hinzufügen..."
 msgid "Add..."
 msgstr "Hinzufügen..."
 
-#: src/wx/about_dialog.cc:107
+#: src/wx/about_dialog.cc:108
 msgid "Artwork by"
 msgstr ""
 
@@ -252,7 +261,7 @@ msgstr "Inhalt"
 msgid "Content Type"
 msgstr "Inhalt Typ"
 
-#: src/wx/video_panel.cc:329
+#: src/wx/video_panel.cc:331
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Inhalt Bildrate %4f\n"
@@ -261,7 +270,7 @@ msgstr "Inhalt Bildrate %4f\n"
 msgid "Content version"
 msgstr "Inhalt Version"
 
-#: src/wx/video_panel.cc:289
+#: src/wx/video_panel.cc:291
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Inhalt Video ist %dx%d (%.2f:1)\n"
@@ -288,12 +297,12 @@ msgstr ""
 msgid "Create in folder"
 msgstr "In Ordner erstellen"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beschnitten zu %dx%d(%.2f:1)\n"
 
-#: src/wx/video_panel.cc:241
+#: src/wx/video_panel.cc:243
 msgid "Custom"
 msgstr "Eigen"
 
@@ -612,7 +621,7 @@ msgstr "JPEG2000 Bandbreite"
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/video_panel.cc:277
+#: src/wx/video_panel.cc:279
 msgid "Multiple content selected"
 msgstr "Mehrere Inhalte ausgewählt"
 
@@ -638,7 +647,7 @@ msgstr "Eine neue Version von DCP-o-matic ist verfügbar."
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Der Ton von Kanal %d wird nicht an das DCP Kanal %d weitergegeben."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
 msgid "None"
 msgstr "Kein"
 
@@ -662,7 +671,7 @@ msgstr "Ausgangs Gamma"
 msgid "Package Type (e.g. OV)"
 msgstr "Paket Typ (e.g. OV)"
 
-#: src/wx/video_panel.cc:322
+#: src/wx/video_panel.cc:324
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Mit Schwarz gefüllt auf %dx%d (%.2f:1)\n"
@@ -765,7 +774,7 @@ msgstr "SMPTE"
 msgid "Scale to"
 msgstr "Skaliere zu"
 
-#: src/wx/video_panel.cc:313
+#: src/wx/video_panel.cc:315
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skaliert auf %dx%d (%.2f:1)\n"
@@ -861,7 +870,7 @@ msgstr "Untertitel Offset"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:146
+#: src/wx/about_dialog.cc:148
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
@@ -881,7 +890,7 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:188
+#: src/wx/about_dialog.cc:190
 #, fuzzy
 msgid "Tested by"
 msgstr "Übersetzt von"
@@ -932,7 +941,7 @@ msgstr "Timing"
 msgid "Top crop"
 msgstr "Oben beschneiden"
 
-#: src/wx/about_dialog.cc:103
+#: src/wx/about_dialog.cc:104
 msgid "Translated by"
 msgstr "Übersetzt von"
 
@@ -1048,7 +1057,7 @@ msgstr ""
 "Ihr DCP hat weniger als 6 Audiokanäle. Das kann auf manchen Projektoren zu "
 "Problemen führen."
 
-#: src/wx/timeline.cc:213
+#: src/wx/timeline.cc:216
 msgid "audio"
 msgstr "Ton"
 
@@ -1073,7 +1082,7 @@ msgstr "ms"
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:236
+#: src/wx/timeline.cc:239
 msgid "still"
 msgstr "Standbild"
 
@@ -1081,7 +1090,7 @@ msgstr "Standbild"
 msgid "times"
 msgstr "Zeiten"
 
-#: src/wx/timeline.cc:234
+#: src/wx/timeline.cc:237
 msgid "video"
 msgstr "Bild"
 

diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index bc457f992c7ff61afb10804230a649248c0cc980..36e9a911077726a64a6edd373d90c05f2c3e7fe3 100644 (file)
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-04-20 12:06-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -64,10 +64,19 @@ msgstr "3D"
 msgid "3D alternate"
 msgstr "3D alterno"
 
+#: src/wx/video_panel.cc:200
+msgid "3D left only"
+msgstr ""
+
 #: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D izquierda/derecha"
 
+#: src/wx/video_panel.cc:201
+#, fuzzy
+msgid "3D right only"
+msgstr "3D izquierda/derecha"
+
 #: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D arriba/abajo"
@@ -104,7 +113,7 @@ msgstr "Añadir carpeta..."
 msgid "Add..."
 msgstr "Añadir..."
 
-#: src/wx/about_dialog.cc:107
+#: src/wx/about_dialog.cc:108
 msgid "Artwork by"
 msgstr "Grafismo de"
 
@@ -244,7 +253,7 @@ msgstr "Contenido"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: src/wx/video_panel.cc:329
+#: src/wx/video_panel.cc:331
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Velocidad del contenido %.4f\n"
@@ -253,7 +262,7 @@ msgstr "Velocidad del contenido %.4f\n"
 msgid "Content version"
 msgstr "Versión del contenido"
 
-#: src/wx/video_panel.cc:289
+#: src/wx/video_panel.cc:291
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "El video es %dx%d (%.2f:1)\n"
@@ -280,12 +289,12 @@ msgstr "País"
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Recortado a %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:241
+#: src/wx/video_panel.cc:243
 msgid "Custom"
 msgstr "Personalizado"
 
@@ -598,7 +607,7 @@ msgstr "Ancho de banda JPEG2000 máximo"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:277
+#: src/wx/video_panel.cc:279
 msgid "Multiple content selected"
 msgstr "Varios contenidos seleccionados"
 
@@ -624,7 +633,7 @@ msgstr "Nuevas versiones disponibles de DCP-o-matic."
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "No pasará audio del canal de origen %d al canal %d del DCP."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
 msgid "None"
 msgstr "Ninguno"
 
@@ -648,7 +657,7 @@ msgstr "Gamma de salida"
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/video_panel.cc:322
+#: src/wx/video_panel.cc:324
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Completado con negro hasta %dx%d (%.2f:1)\n"
@@ -750,7 +759,7 @@ msgstr "SMPTE"
 msgid "Scale to"
 msgstr "Redimensionar a"
 
-#: src/wx/video_panel.cc:313
+#: src/wx/video_panel.cc:315
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Redimensionado a %dx%d (%.2f:1)\n"
@@ -843,7 +852,7 @@ msgstr "Desplazamiento del subtítulo en Y"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:146
+#: src/wx/about_dialog.cc:148
 msgid "Supported by"
 msgstr "Soportado por"
 
@@ -863,7 +872,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:188
+#: src/wx/about_dialog.cc:190
 msgid "Tested by"
 msgstr "Comprobado por"
 
@@ -912,7 +921,7 @@ msgstr "Tiempo"
 msgid "Top crop"
 msgstr "Recortar arriba"
 
-#: src/wx/about_dialog.cc:103
+#: src/wx/about_dialog.cc:104
 msgid "Translated by"
 msgstr "Traducido por"
 
@@ -1027,7 +1036,7 @@ msgstr ""
 "Tu DCP tiene menos de 6 canales de audio. Esto puede causar problemas con "
 "algunos proyectores."
 
-#: src/wx/timeline.cc:213
+#: src/wx/timeline.cc:216
 msgid "audio"
 msgstr "audio"
 
@@ -1052,7 +1061,7 @@ msgstr "ms"
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:236
+#: src/wx/timeline.cc:239
 msgid "still"
 msgstr "fijo"
 
@@ -1060,7 +1069,7 @@ msgstr "fijo"
 msgid "times"
 msgstr "veces"
 
-#: src/wx/timeline.cc:234
+#: src/wx/timeline.cc:237
 msgid "video"
 msgstr "vídeo"
 

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index ee75de991a3f5b8c764af61bb924dc90c9173452..744c59d1f4b5be338191da6c02527df967723ec9 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-04-18 22:50+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -65,10 +65,19 @@ msgstr "3D"
 msgid "3D alternate"
 msgstr "3D alternatif"
 
+#: src/wx/video_panel.cc:200
+msgid "3D left only"
+msgstr ""
+
 #: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D gauche/droite"
 
+#: src/wx/video_panel.cc:201
+#, fuzzy
+msgid "3D right only"
+msgstr "3D gauche/droite"
+
 #: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D dessus/dessous"
@@ -105,7 +114,7 @@ msgstr "Ajout dossier..."
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: src/wx/about_dialog.cc:107
+#: src/wx/about_dialog.cc:108
 msgid "Artwork by"
 msgstr "Thème par"
 
@@ -248,7 +257,7 @@ msgstr "Contenu"
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: src/wx/video_panel.cc:329
+#: src/wx/video_panel.cc:331
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Cadence du contenu %.4f\n"
@@ -257,7 +266,7 @@ msgstr "Cadence du contenu %.4f\n"
 msgid "Content version"
 msgstr "Version du contenu"
 
-#: src/wx/video_panel.cc:289
+#: src/wx/video_panel.cc:291
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Le contenu vidéo est %dx%d (%.2f:1)\n"
@@ -284,12 +293,12 @@ msgstr "Pays"
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Découpe de %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:241
+#: src/wx/video_panel.cc:243
 msgid "Custom"
 msgstr "Personnalisé"
 
@@ -601,7 +610,7 @@ msgstr "Qualité JPEG2000 Maxi"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:277
+#: src/wx/video_panel.cc:279
 msgid "Multiple content selected"
 msgstr "Contenus multiples sélectionnés"
 
@@ -627,7 +636,7 @@ msgstr "De nouvelles versions de DCP-o-matic sont disponibles."
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Aucun son ne passera du canal audio %d au canal %d du DCP."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
 msgid "None"
 msgstr "Aucun"
 
@@ -651,7 +660,7 @@ msgstr "Gamma de sortie"
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/video_panel.cc:322
+#: src/wx/video_panel.cc:324
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
@@ -753,7 +762,7 @@ msgstr "SMPTE"
 msgid "Scale to"
 msgstr "Mise à l'échelle"
 
-#: src/wx/video_panel.cc:313
+#: src/wx/video_panel.cc:315
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Mis à l'échelle de %dx%d (%.2f:1)\n"
@@ -846,7 +855,7 @@ msgstr "Position Verticale"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:146
+#: src/wx/about_dialog.cc:148
 msgid "Supported by"
 msgstr "Soutenu par"
 
@@ -866,7 +875,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version Test"
 
-#: src/wx/about_dialog.cc:188
+#: src/wx/about_dialog.cc:190
 msgid "Tested by"
 msgstr "Testé par"
 
@@ -916,7 +925,7 @@ msgstr "Durée"
 msgid "Top crop"
 msgstr "Découpe haut"
 
-#: src/wx/about_dialog.cc:103
+#: src/wx/about_dialog.cc:104
 msgid "Translated by"
 msgstr "Traduit par"
 
@@ -1031,7 +1040,7 @@ msgstr ""
 "Votre DCP a moins de 6 canaux audio.  Cela peut créer des problèmes de "
 "lecture sur certains projecteurs."
 
-#: src/wx/timeline.cc:213
+#: src/wx/timeline.cc:216
 msgid "audio"
 msgstr "audio"
 
@@ -1056,7 +1065,7 @@ msgstr "ms"
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:236
+#: src/wx/timeline.cc:239
 msgid "still"
 msgstr "fixe"
 
@@ -1064,7 +1073,7 @@ msgstr "fixe"
 msgid "times"
 msgstr "fois"
 
-#: src/wx/timeline.cc:234
+#: src/wx/timeline.cc:237
 msgid "video"
 msgstr "vidéo"
 

diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 9fe88336049ed9dc49f3140d61c40c388065d7d5..065aa72980c2ba358f75e00060b2da9671ac871a 100644 (file)
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -63,10 +63,18 @@ msgstr ""
 msgid "3D alternate"
 msgstr ""
 
+#: src/wx/video_panel.cc:200
+msgid "3D left only"
+msgstr ""
+
 #: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr ""
 
+#: src/wx/video_panel.cc:201
+msgid "3D right only"
+msgstr ""
+
 #: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr ""
@@ -103,7 +111,7 @@ msgstr "Aggiungi cartella"
 msgid "Add..."
 msgstr "Aggiungi..."
 
-#: src/wx/about_dialog.cc:107
+#: src/wx/about_dialog.cc:108
 msgid "Artwork by"
 msgstr ""
 
@@ -250,7 +258,7 @@ msgstr "Sorgente"
 msgid "Content Type"
 msgstr "Tipo di sorgente"
 
-#: src/wx/video_panel.cc:329
+#: src/wx/video_panel.cc:331
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Freq. fotogrammi sorgente %.4f\n"
@@ -259,7 +267,7 @@ msgstr "Freq. fotogrammi sorgente %.4f\n"
 msgid "Content version"
 msgstr "Tipo di sorgente"
 
-#: src/wx/video_panel.cc:289
+#: src/wx/video_panel.cc:291
 #, fuzzy, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Il video originale è %dx%d (%.2f:1)\n"
@@ -286,12 +294,12 @@ msgstr ""
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Tagliato da %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:241
+#: src/wx/video_panel.cc:243
 msgid "Custom"
 msgstr ""
 
@@ -613,7 +621,7 @@ msgstr "Banda passante JPEG2000"
 msgid "Mbit/s"
 msgstr ""
 
-#: src/wx/video_panel.cc:277
+#: src/wx/video_panel.cc:279
 msgid "Multiple content selected"
 msgstr "Molteplici sorgenti selezionate"
 
@@ -639,7 +647,7 @@ msgstr "Una nuova versione di DCP-o-matic è disponibile."
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "Nessun audio sarà passato dal canale %d sorgente al canale %d del DCP"
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
 msgid "None"
 msgstr "Nessuno"
 
@@ -663,7 +671,7 @@ msgstr "Gamma in uscita"
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/video_panel.cc:322
+#: src/wx/video_panel.cc:324
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Riempito con nero a %dx%d (%.2f:1)\n"
@@ -767,7 +775,7 @@ msgstr ""
 msgid "Scale to"
 msgstr "Scala a"
 
-#: src/wx/video_panel.cc:313
+#: src/wx/video_panel.cc:315
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Scalato a %dx%d (%.2f:1)\n"
@@ -861,7 +869,7 @@ msgstr "Spostamento Y dei Sottotitoli"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:146
+#: src/wx/about_dialog.cc:148
 msgid "Supported by"
 msgstr ""
 
@@ -882,7 +890,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:188
+#: src/wx/about_dialog.cc:190
 msgid "Tested by"
 msgstr ""
 
@@ -931,7 +939,7 @@ msgstr ""
 msgid "Top crop"
 msgstr "Taglio in alto"
 
-#: src/wx/about_dialog.cc:103
+#: src/wx/about_dialog.cc:104
 msgid "Translated by"
 msgstr ""
 
@@ -1048,7 +1056,7 @@ msgstr ""
 "Il vostro DCP ha meno di 6 canali audio. Questo può causare problemi su "
 "alcuni proiettori."
 
-#: src/wx/timeline.cc:213
+#: src/wx/timeline.cc:216
 #, fuzzy
 msgid "audio"
 msgstr "Audio"
@@ -1074,7 +1082,7 @@ msgstr "ms"
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:236
+#: src/wx/timeline.cc:239
 msgid "still"
 msgstr ""
 
@@ -1082,7 +1090,7 @@ msgstr ""
 msgid "times"
 msgstr ""
 
-#: src/wx/timeline.cc:234
+#: src/wx/timeline.cc:237
 #, fuzzy
 msgid "video"
 msgstr "Video"

diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index ba1ac05248a684a7fdb8454e777af06d76e4b1f0..db0d72e502bf5f34f0786bc9fd7802c1f3561213 100644 (file)
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/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-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-03-30 19:40+0100\n"
 "Last-Translator: Theo Kooijmans <tkooijmans@universaldv.nl>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -65,10 +65,19 @@ msgstr "3D"
 msgid "3D alternate"
 msgstr "3D alternate"
 
+#: src/wx/video_panel.cc:200
+msgid "3D left only"
+msgstr ""
+
 #: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D links/rechts"
 
+#: src/wx/video_panel.cc:201
+#, fuzzy
+msgid "3D right only"
+msgstr "3D links/rechts"
+
 #: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D boven/beneden"
@@ -105,7 +114,7 @@ msgstr "Voeg map toe..."
 msgid "Add..."
 msgstr "Toevoegen.."
 
-#: src/wx/about_dialog.cc:107
+#: src/wx/about_dialog.cc:108
 msgid "Artwork by"
 msgstr "Artwork door"
 
@@ -250,7 +259,7 @@ msgstr "Content"
 msgid "Content Type"
 msgstr "Content Type"
 
-#: src/wx/video_panel.cc:329
+#: src/wx/video_panel.cc:331
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Content frame rate %.4f\n"
@@ -259,7 +268,7 @@ msgstr "Content frame rate %.4f\n"
 msgid "Content version"
 msgstr "Content versie"
 
-#: src/wx/video_panel.cc:289
+#: src/wx/video_panel.cc:291
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Content video is %dx%d (%.2f:1)\n"
@@ -286,12 +295,12 @@ msgstr "Land"
 msgid "Create in folder"
 msgstr "Maak in map"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Cropped naar %dx%d (%.2f:1)\n"
 
-#: src/wx/video_panel.cc:241
+#: src/wx/video_panel.cc:243
 msgid "Custom"
 msgstr "aangepast"
 
@@ -603,7 +612,7 @@ msgstr "Maximum JPEG2000 bandbreedte"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/video_panel.cc:277
+#: src/wx/video_panel.cc:279
 msgid "Multiple content selected"
 msgstr "Meedere content geselecteerd"
 
@@ -631,7 +640,7 @@ msgstr ""
 "Er wordt geen audio van het content kanaal %d doorgestuurd naar DCP kanaal "
 "%d."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
 msgid "None"
 msgstr "Geen"
 
@@ -655,7 +664,7 @@ msgstr "Output gamma"
 msgid "Package Type (e.g. OV)"
 msgstr "Package Type (e.g. OV)"
 
-#: src/wx/video_panel.cc:322
+#: src/wx/video_panel.cc:324
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Opgevuld met zwart tot %dx%d (%.2f:1)\n"
@@ -757,7 +766,7 @@ msgstr "SMPTE"
 msgid "Scale to"
 msgstr "Schaal tot"
 
-#: src/wx/video_panel.cc:313
+#: src/wx/video_panel.cc:315
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Geschaald naar %dx%d (%.2f:1)\n"
@@ -850,7 +859,7 @@ msgstr "Ondertitel Y offset"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:146
+#: src/wx/about_dialog.cc:148
 msgid "Supported by"
 msgstr "Ondersteund door"
 
@@ -870,7 +879,7 @@ msgstr "Grondgebied (vb NL)"
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:188
+#: src/wx/about_dialog.cc:190
 msgid "Tested by"
 msgstr "Getest door"
 
@@ -920,7 +929,7 @@ msgstr "Timing"
 msgid "Top crop"
 msgstr "Top crop"
 
-#: src/wx/about_dialog.cc:103
+#: src/wx/about_dialog.cc:104
 msgid "Translated by"
 msgstr "Vertaald door"
 
@@ -1034,7 +1043,7 @@ msgstr ""
 "Uw DCP heeft minder dan 6 audio kanalen. This kan problemen geven op sommige "
 "projectors."
 
-#: src/wx/timeline.cc:213
+#: src/wx/timeline.cc:216
 msgid "audio"
 msgstr "audio"
 
@@ -1059,7 +1068,7 @@ msgstr "ms"
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:236
+#: src/wx/timeline.cc:239
 msgid "still"
 msgstr "still"
 
@@ -1067,6 +1076,6 @@ msgstr "still"
 msgid "times"
 msgstr "tijden"
 
-#: src/wx/timeline.cc:234
+#: src/wx/timeline.cc:237
 msgid "video"
 msgstr "video"

diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 69442b427e1312dc98db24410a1fdcf7821016c4..0a75bab6d87d1ab440932769ef2a667a1380d5ed 100644 (file)
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-31 16:10+0100\n"
+"POT-Creation-Date: 2014-04-29 09:14+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -64,10 +64,19 @@ msgstr "3D"
 msgid "3D alternate"
 msgstr ""
 
+#: src/wx/video_panel.cc:200
+msgid "3D left only"
+msgstr ""
+
 #: src/wx/video_panel.cc:197
 msgid "3D left/right"
 msgstr "3D left/right"
 
+#: src/wx/video_panel.cc:201
+#, fuzzy
+msgid "3D right only"
+msgstr "3D left/right"
+
 #: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
 msgstr "3D top/bottom"
@@ -104,7 +113,7 @@ msgstr "Lägg till folder..."
 msgid "Add..."
 msgstr "Lägg till..."
 
-#: src/wx/about_dialog.cc:107
+#: src/wx/about_dialog.cc:108
 msgid "Artwork by"
 msgstr ""
 
@@ -252,7 +261,7 @@ msgstr "Innehåll"
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: src/wx/video_panel.cc:329
+#: src/wx/video_panel.cc:331
 #, c-format
 msgid "Content frame rate %.4f\n"
 msgstr "Innehållets bildhastighet %.4f\n"
@@ -261,7 +270,7 @@ msgstr "Innehållets bildhastighet %.4f\n"
 msgid "Content version"
 msgstr "Innehållsversion"
 
-#: src/wx/video_panel.cc:289
+#: src/wx/video_panel.cc:291
 #, c-format
 msgid "Content video is %dx%d (%.2f:1)\n"
 msgstr "Original-videon är %dx%d (%.2f:1)\n"
@@ -288,13 +297,13 @@ msgstr ""
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
-#: src/wx/video_panel.cc:301
+#: src/wx/video_panel.cc:303
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
 msgstr "Beskuren till %dx%d (%.2f:1)\n"
 
 # sammanhang?
-#: src/wx/video_panel.cc:241
+#: src/wx/video_panel.cc:243
 msgid "Custom"
 msgstr "Special"
 
@@ -616,7 +625,7 @@ msgid "Mbit/s"
 msgstr ""
 
 # Låter mysko
-#: src/wx/video_panel.cc:277
+#: src/wx/video_panel.cc:279
 msgid "Multiple content selected"
 msgstr "Flera innehåll valda"
 
@@ -644,7 +653,7 @@ msgstr ""
 "Ingen audio kommer att överföras från innehållskanalen %d till DCP-kanalen "
 "%d."
 
-#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
+#: src/wx/video_panel.cc:152 src/wx/video_panel.cc:248
 msgid "None"
 msgstr "Inget"
 
@@ -668,7 +677,7 @@ msgstr "Utdata gamma"
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/video_panel.cc:322
+#: src/wx/video_panel.cc:324
 #, c-format
 msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Svarta kanter tillagda för %dx%d (%.2f:1)\n"
@@ -772,7 +781,7 @@ msgstr "SMPTE"
 msgid "Scale to"
 msgstr "Skala om till"
 
-#: src/wx/video_panel.cc:313
+#: src/wx/video_panel.cc:315
 #, c-format
 msgid "Scaled to %dx%d (%.2f:1)\n"
 msgstr "Skalad till %dx%d (%.2f:1)\n"
@@ -869,7 +878,7 @@ msgstr "Undertext Förskjutning"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:146
+#: src/wx/about_dialog.cc:148
 msgid "Supported by"
 msgstr "Stöd från"
 
@@ -889,7 +898,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:188
+#: src/wx/about_dialog.cc:190
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"
@@ -940,7 +949,7 @@ msgstr "Tajming"
 msgid "Top crop"
 msgstr "Övre beskärning"
 
-#: src/wx/about_dialog.cc:103
+#: src/wx/about_dialog.cc:104
 msgid "Translated by"
 msgstr "Översatt av"
 
@@ -1057,7 +1066,7 @@ msgstr ""
 "Din DCP har mindre än 6 audiokanaler. Detta kan medföra problem på vissa "
 "projektorer."
 
-#: src/wx/timeline.cc:213
+#: src/wx/timeline.cc:216
 msgid "audio"
 msgstr "audio"
 
@@ -1082,7 +1091,7 @@ msgstr "ms"
 msgid "s"
 msgstr "s"
 
-#: src/wx/timeline.cc:236
+#: src/wx/timeline.cc:239
 msgid "still"
 msgstr "stillbild"
 
@@ -1091,7 +1100,7 @@ msgstr "stillbild"
 msgid "times"
 msgstr "tider"
 
-#: src/wx/timeline.cc:234
+#: src/wx/timeline.cc:237
 msgid "video"
 msgstr "video"
 

diff --git a/wscript b/wscript
index 64026191e324f25b64c58ebbc4409e51b801960e..1abaf5c2fc4ce579354d3914ef088aeb2446d9c9 100644 (file)
--- a/wscript
+++ b/wscript
@@ -44,12 +44,12 @@ def dynamic_ffmpeg(conf):
 
 def static_openjpeg(conf):
     conf.check_cfg(package='libopenjpeg', args='--cflags', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
-    conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.1', mandatory=True)
+    conf.check_cfg(package='libopenjpeg', args='--cflags', max_version='1.5.2', mandatory=True)
     conf.env.STLIB_OPENJPEG = ['openjpeg']
 
 def dynamic_openjpeg(conf):
     conf.check_cfg(package='libopenjpeg', args='--cflags --libs', atleast_version='1.5.0', uselib_store='OPENJPEG', mandatory=True)
-    conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.1', mandatory=True)
+    conf.check_cfg(package='libopenjpeg', args='--cflags --libs', max_version='1.5.2', mandatory=True)
 
 def static_dcp(conf, static_boost, static_xmlpp, static_xmlsec, static_ssh):
     conf.check_cfg(package='libdcp-1.0', atleast_version='0.92', args='--cflags', uselib_store='DCP', mandatory=True)