Merge master.

diff --git a/ChangeLog b/ChangeLog
index 1f84ff13a1364cdb3e379edde921d8166f9ed2c9..68383d39dff7be7c3031e88633b3da2155a5b74e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,7 @@
 
        * A variety of changes were made on the 2.0 branch
        but not documented in the ChangeLog.  Most sigificantly:
-       
+
        - DCP import
        - Creation of DCPs with proper XML subtitles
        - Import of .srt and .xml subtitles
@@ -12,6 +12,25 @@
 
        * Add subtitle view.
 
+2014-07-16  Carl Hetherington  <cth@carlh.net>
+
+       * Updates to de_DE from Carsten Kurz.
+
+       * Limit allowed KDM types based on Interop/SMPTE setting
+       of DCP (#385).
+
+       * Updates to fr_FR from Grégoire Ausina.
+
+2014-07-14  Carl Hetherington  <cth@carlh.net>
+
+       * Bump libdcp to get a new version which writes
+       <Hash> values to CPLs.
+
+2014-07-10  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.72.2 released.
+>>>>>>> origin/master
+
 2014-07-10  Carl Hetherington  <cth@carlh.net>
 
        * Try to fix corruption of KDM email setting in

diff --git a/cscript b/cscript
index 0c27e59fedae3b70601061eca359d0f7d499acb0..2ac5fea9128a267aa7b6c2d22bc8e58eaec1cf25 100644 (file)
--- a/cscript
+++ b/cscript
@@ -169,7 +169,10 @@ def build(target, options):
             if target.version == 'unstable':
                 cmd += ' --debian-unstable'
         elif target.distro == 'centos':
-            cmd += ' --target-centos'
+            if target.version == '6.5':
+                cmd += ' --target-centos-6 --disable-tests'
+            elif target.version == '7':
+                cmd += ' --target-centos-7'
 
     target.command(cmd)
     target.command('./waf')

diff --git a/debian/changelog b/debian/changelog
index 09662e58b5b27ba453f855894c351f0d076f9919..7a82f85e9cfce5484c199ed1df4d9bc3552b085e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.72.1-1) UNRELEASED; urgency=low
+dcpomatic (1.72.2-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -166,8 +166,9 @@ dcpomatic (1.72.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 10 Jul 2014 15:37:26 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Thu, 10 Jul 2014 21:27:55 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/platform/linux/dcpomatic.spec.in b/platform/linux/dcpomatic.spec.in
index 46a0d1ce4fd89d86767e63c93e0f142173af60bc..f39c2cbd8dbca8befbd515ac74bd645f56bf6609 100644 (file)
--- a/platform/linux/dcpomatic.spec.in
+++ b/platform/linux/dcpomatic.spec.in
@@ -1,6 +1,6 @@
 Summary:A program that generates Digital Cinema Packages (DCPs) from video and audio files
 Name:dcpomatic
-Version:@version@
+Version:@VERSION@
 Release:1%{?dist}
 License:GPL
 Group:Applications/Multimedia
@@ -49,15 +49,15 @@ digital projectors.
 %{_datadir}/locale/nl_NL/LC_MESSAGES/libdcpomatic.mo
 
 %prep
-rm -rf $RPM_BUILD_DIR/dcpomatic-@version@
-tar xjf $RPM_SOURCE_DIR/dcpomatic-@version@.tar.bz2
+rm -rf $RPM_BUILD_DIR/dcpomatic-@VERSION@
+tar xjf $RPM_SOURCE_DIR/dcpomatic-@VERSION@.tar.bz2
 %build
-cd dcpomatic-@version@
+cd dcpomatic-@VERSION@
 export PKG_CONFIG_PATH=/home/carl/lib/pkgconfig:/usr/local/lib/pkgconfig
-CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos
+CXXFLAGS="-I/home/carl/include" LDFLAGS="-L/home/carl/lib" ./waf configure --prefix=%{buildroot}/usr --install-prefix=/usr --target-centos-@CENTOS_VERSION@ --disable-tests
 ./waf
 %install
-cd dcpomatic-@version@
+cd dcpomatic-@VERSION@
 ./waf install
 
 %post

diff --git a/platform/linux/wscript b/platform/linux/wscript
index fe6f4e2db10a9a77aa16e4bb3d95463479097790..3aab4f7fb349120fb85f96ec2f27f6b35581a941 100644 (file)
--- a/platform/linux/wscript
+++ b/platform/linux/wscript
@@ -1,25 +1,30 @@
 def build(bld):
-    d = { 'INSTALL_PREFIX' : bld.env.INSTALL_PREFIX }
-    d = { 'VERSION' : bld.env.VERSION }
-
     obj = bld(features='subst')
     obj.source = 'dcpomatic.desktop.in'
     obj.target = 'dcpomatic.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic_batch.desktop.in'
     obj.target = 'dcpomatic_batch.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic_server.desktop.in'
     obj.target = 'dcpomatic_server.desktop'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
 
     obj = bld(features='subst')
     obj.source = 'dcpomatic.spec.in'
     obj.target = 'dcpomatic.spec'
-    obj.dict = d
+    obj.INSTALL_PREFIX = bld.env.INSTALL_PREFIX
+    obj.VERSION = bld.env.VERSION
+    if bld.env.TARGET_CENTOS_6:
+        obj.CENTOS_VERSION = '6'
+    elif bld.env.TARGET_CENTOS_7:
+        obj.CENTOS_VERSION = '7'
 
     bld.install_files('${PREFIX}/share/applications', ['dcpomatic.desktop', 'dcpomatic_batch.desktop', 'dcpomatic_server.desktop'])

diff --git a/platform/windows/wscript b/platform/windows/wscript
index 65989300b5d22d3e07f11e7a4575a5e7746adaff..19c204f6264c6506095d62a18f93c0110f8e8276 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -132,26 +132,32 @@ SetOutPath "$INSTDIR\\locale\\fr\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/fr_FR/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/fr_FR/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/fr_FR/dcpomatic.mo"
+File "%static_deps%/share/locale/fr/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\it\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/it_IT/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/it_IT/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/it_IT/dcpomatic.mo"
+File "%static_deps%/share/locale/it/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\es\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/es_ES/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/es_ES/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/es_ES/dcpomatic.mo"
+File "%static_deps%/share/locale/es/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\sv\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/sv_SE/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/sv_SE/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/sv_SE/dcpomatic.mo"
+File "%static_deps%/share/locale/sv/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\de\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/de_DE/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/de_DE/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/de_DE/dcpomatic.mo"
+File "%static_deps%/share/locale/de/LC_MESSAGES/wxstd.mo"
 SetOutPath "$INSTDIR\\locale\\nl\\LC_MESSAGES"
 File "%binaries%/src/lib/mo/nl_NL/libdcpomatic.mo"
 File "%binaries%/src/wx/mo/nl_NL/libdcpomatic-wx.mo"
 File "%binaries%/src/tools/mo/nl_NL/dcpomatic.mo"
+File "%static_deps%/share/locale/nl/LC_MESSAGES/wxstd.mo"
 
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "DisplayName" "DCP-o-matic (remove only)"
 WriteRegStr HKLM "Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DCP-o-matic" "UninstallString" "$INSTDIR\\Uninstall.exe"

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 8137b24c10f1c4a45b71cdf143b71e7cd64a00ea..e959fb638535fa18819ec3135f7f91b9ba797667 100644 (file)
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-24 14:53+0100\n"
-"PO-Revision-Date: 2014-07-02 17:01+0100\n"
+"PO-Revision-Date: 2014-07-13 02:32+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -169,11 +169,12 @@ msgstr "Zu verbindende Inhalte müssen die gleiche Bildrate haben."
 
 #: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same video frame type."
-msgstr "Zu verbindende Inhalte müssen die gleiche Bildart (z.B. 2D) haben."
+msgstr "Zu verbindende Inhalte müssen den gleichen Bildtyp (z.B. 2D) haben."
 
 #: src/lib/ffmpeg_content.cc:116
 msgid "Content to be joined must use the same audio stream."
-msgstr "Zu verbindende Inhalte müssen die gleiche Tonspurart verwenden."
+msgstr ""
+"Zu verbindende Inhalte müssen die gleiche Tonspurkonfiguration verwenden."
 
 #: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same subtitle stream."
@@ -257,7 +258,7 @@ msgid ""
 msgstr ""
 "Sehr geehrter Vorfuehrer,\n"
 "\n"
-"Im Anhang finden Sie die KDM für den Film $CPL_NAME.\n"
+"Im Anhang finden Sie die KDM fuer den Film $CPL_NAME.\n"
 "\n"
 "Der Schluessel ist vom $START_TIME bis zum $END_TIME gueltig fuer:\n"
 "\n"
@@ -584,7 +585,7 @@ msgstr "Darf keine Schrägstriche enthalten"
 
 #: src/lib/util.cc:530
 msgid "connect timed out"
-msgstr "Zeit zur Verbindung abgelaufen"
+msgstr "Zeit für Verbindung abgelaufen"
 
 #: src/lib/scp_dcp_job.cc:128
 msgid "connecting"

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 6cef1b3dc9044d8b45e0d3445afb2dd6846d6769..c781704a10f8042e418c97d63b4129c42489f0a0 100644 (file)
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-24 14:53+0100\n"
-"PO-Revision-Date: 2014-06-20 15:53+0100\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2014-07-14 12:04+0100\n"
+"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.6.6\n"
 
 #: src/lib/sndfile_content.cc:61
 msgid "%1 [audio]"
@@ -27,7 +27,7 @@ msgstr "%1 [vidéo]"
 
 #: src/lib/sndfile_content.cc:82
 msgid "%1 channels, %2kHz, %3 samples"
-msgstr "%1 canaux, %2kHz, %3 samples"
+msgstr "%1 canaux, %2kHz, %3 échantillons"
 
 #: src/lib/ffmpeg_content.cc:246
 msgid "%1 frames; %2 frames per second"
@@ -79,7 +79,7 @@ msgstr "Analyse audio"
 
 #: src/lib/scaler.cc:64
 msgid "Area"
-msgstr "Area"
+msgstr "Surface"
 
 #: src/lib/scaler.cc:62
 msgid "Bicubic"
@@ -135,8 +135,7 @@ msgstr "Le contenu à ajouter doit avoir le même type de conversion couleur"
 
 #: src/lib/video_content.cc:136
 msgid "Content to be joined must have the same crop."
-msgstr ""
-"le contenu à ajouter doit avoir les mêmes valeurs de \"crop\" ou découpage"
+msgstr "le contenu à ajouter doit avoir les mêmes valeurs de rognage"
 
 #: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same picture size."
@@ -192,9 +191,8 @@ msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
 #: src/lib/image_proxy.cc:128
-#, fuzzy
 msgid "Could not decode image file"
-msgstr "Écriture vers fichier distant (%1) impossible"
+msgstr "Impossible de décoder le ficher image"
 
 #: src/lib/job.cc:90
 msgid "Could not open %1"
@@ -206,7 +204,7 @@ msgstr "Ouverture de %1 pour envoi impossible"
 
 #: src/lib/internet.cc:72
 msgid "Could not open downloaded ZIP file"
-msgstr "Ouverture du fichier Zip impossible"
+msgstr "Ouverture du fichier Zip téléchargé impossible"
 
 #: src/lib/scp_dcp_job.cc:154
 msgid "Could not start SCP session (%1)"
@@ -221,15 +219,16 @@ msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "Le DCP sera lu à %1%% de la vitesse du contenu source.\n"
 
 #: src/lib/frame_rate_change.cc:81
-#, fuzzy
 msgid "DCP will use every other frame of the content.\n"
-msgstr "Le DCP utilisera une image sur deux de la source.\n"
+msgstr "Le DCP utilisera les autres images de la source.\n"
 
 #: src/lib/job.cc:91
 msgid ""
 "DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
 "an unexpected format."
-msgstr "DCP-o-matic ne peut pas ouvrir le fichier %1"
+msgstr ""
+"DCP-o-matic ne peut pas ouvrir le fichier %1. Soit il n'existe pas, soit il "
+"n'est pas au bon format."
 
 #: src/lib/ffmpeg_content.cc:93
 msgid ""
@@ -254,6 +253,17 @@ msgid ""
 "Best regards,\n"
 "DCP-o-matic"
 msgstr ""
+"Cher projectionniste\n"
+"\n"
+"Veuillez trouver les fichiers KDMs attachés pour $CPL_NAME.\n"
+"\n"
+"Cinema: $CINEMA_NAME\n"
+"Ecran(s): $SCREENS\n"
+"\n"
+"Les KDMs sont valides du $START_TIME au $END_TIME.\n"
+"\n"
+"Cordialement,\n"
+"DCP-o-matic"
 
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP650 and CP750"
@@ -305,7 +315,7 @@ msgstr "Flat"
 
 #: src/lib/ratio.cc:43
 msgid "Full frame"
-msgstr "Pleine matrice"
+msgstr "Full frame"
 
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
@@ -313,7 +323,7 @@ msgstr "Gaussien"
 
 #: src/lib/filter.cc:68
 msgid "Gradient debander"
-msgstr "Corrections des bandes du dégradé"
+msgstr "Corrections des bandes par dégradé"
 
 #: src/lib/util.cc:755
 msgid "Hearing impaired"
@@ -377,7 +387,7 @@ msgstr "Sans déformation"
 
 #: src/lib/image_content.cc:50
 msgid "No valid image files were found in the folder."
-msgstr ""
+msgstr "Aucun fichier image valide dans ce dossier."
 
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
@@ -389,11 +399,11 @@ msgstr "OK (processus %1)"
 
 #: src/lib/content.cc:102
 msgid "Only the first piece of content to be joined can have a start trim."
-msgstr "Seul le premier contenu à ajouter peut avoir un coupure de début."
+msgstr "Seul le premier contenu à ajouter peut être rogné au point d'entrée."
 
 #: src/lib/content.cc:106
 msgid "Only the last piece of content to be joined can have an end trim."
-msgstr "Seul le dernier contenu à ajouter peut avoir une coupure en fin."
+msgstr "Seul le dernier contenu à ajouter peut être rogné au point de sortie."
 
 #: src/lib/job.cc:103
 msgid "Out of memory"
@@ -472,8 +482,8 @@ msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
 msgstr ""
-"Le disque contenant le film est plein. Libérez de l'espace et essayez à "
-"nouveau."
+"Le disque contenant le film est presque plein. Libérez de l'espace et "
+"essayez à nouveau."
 
 #: src/lib/job.cc:103
 msgid "There was not enough memory to do this."
@@ -494,7 +504,7 @@ msgid ""
 "create a new Film, re-add your content and set it up again.  Sorry!"
 msgstr ""
 "Ce projet a été créé avec une ancienne version de DCP-o-matic, chargement "
-"impossible. Créez un nouveau projet, ajoutez du contenu et  reparamétrez. "
+"impossible. Créez un nouveau projet, ajoutez du contenu et reparamétrez. "
 "Désolé !"
 
 #: src/lib/dcp_content_type.cc:46
@@ -515,7 +525,7 @@ msgstr "Contenu de fichier ZIP non géré."
 
 #: src/lib/image_proxy.cc:174
 msgid "Unexpected image type received by server"
-msgstr ""
+msgstr "Type d'image non conforme reçu par le serveur"
 
 #: src/lib/job.cc:120
 msgid "Unknown error"
@@ -685,7 +695,7 @@ msgstr "minutes"
 
 #: src/lib/util.cc:671
 msgid "missing key %1 in key-value set"
-msgstr "clé %1 non sélectionnée"
+msgstr "clé %1 manquante dans le réglage"
 
 #: src/lib/exceptions.cc:54
 msgid "missing required setting %1"

diff --git a/src/lib/wscript b/src/lib/wscript
index 66a25be0af71bd187641087d9215205555b97e4b..7d74d462ce90719b7c839525aeed9c19c1c88208 100644 (file)
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -104,7 +104,7 @@ def build(bld):
                  AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE 
                  BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME BOOST_SIGNALS2
                  SNDFILE OPENJPEG POSTPROC TIFF MAGICK SSH DCP CXML GLIB LZMA XML++
-                 CURL ZIP QUICKMAIL PANGOMM CAIROMM
+                 CURL ZIP QUICKMAIL PANGOMM CAIROMM XMLSEC
                  """
 
     if bld.env.TARGET_OSX:
@@ -116,7 +116,7 @@ def build(bld):
         obj.uselib += ' WINSOCK2 BFD DBGHELP IBERTY SHLWAPI MSWSOCK BOOST_LOCALE'
         obj.source += ' stack.cpp'
     if bld.env.BUILD_STATIC:
-        obj.uselib += ' XML++'
+        obj.uselib += ' XMLPP'
 
     obj.target = 'dcpomatic'
 

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index ba259fd65ce6a26edec0a97c2616d2b9a5191751..8742e307ef257e139207b3edbfd6d504a20a5754 100644 (file)
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-24 14:53+0100\n"
-"PO-Revision-Date: 2014-07-02 17:02+0100\n"
+"PO-Revision-Date: 2014-07-13 03:04+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -30,7 +30,7 @@ msgstr "&Projekt hinzufügen"
 
 #: src/tools/dcpomatic.cc:243
 msgid "&Content"
-msgstr "&Quelle"
+msgstr "&Quelle..."
 
 #: src/tools/dcpomatic.cc:241
 msgid "&Edit"
@@ -186,11 +186,11 @@ msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
 #: src/tools/dcpomatic.cc:219
 msgid "Scale to fit &height"
-msgstr "Skalieren auf &Höhe DCI-Container"
+msgstr "...skalieren auf &Höhe DCI-Container"
 
 #: src/tools/dcpomatic.cc:218
 msgid "Scale to fit &width"
-msgstr "Skalieren auf &Breite DCI-Container"
+msgstr "...skalieren auf &Breite DCI-Container"
 
 #: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:170
 msgid "Select film to open"

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index fca31b0b5d3ec64c9b9275d28fdd5e7515945a4f..f1f5fc9241ecc676882af56aec7b1f46e9de6d95 100644 (file)
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-24 14:53+0100\n"
-"PO-Revision-Date: 2014-06-20 15:57+0100\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2014-07-14 10:43+0100\n"
+"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.6.6\n"
 
 #: src/tools/dcpomatic.cc:370
 msgid "%1 already exists as a file, so you cannot use it for a new film."
@@ -28,7 +28,7 @@ msgstr "&Ajouter Film..."
 
 #: src/tools/dcpomatic.cc:243
 msgid "&Content"
-msgstr "&Adaptation"
+msgstr "&Contenu"
 
 #: src/tools/dcpomatic.cc:241
 msgid "&Edit"
@@ -76,7 +76,7 @@ msgstr "&Enregistrer"
 
 #: src/tools/dcpomatic.cc:224
 msgid "&Send DCP to TMS"
-msgstr "&Envoyer le DCP dans le TMS"
+msgstr "&Envoyer le DCP au TMS"
 
 #: src/tools/dcpomatic.cc:245
 msgid "&Tools"
@@ -90,7 +90,7 @@ msgstr ""
 
 #: src/tools/dcpomatic.cc:236 src/tools/dcpomatic_batch.cc:53
 msgid "About"
-msgstr "A Propos"
+msgstr "A propos"
 
 #: src/tools/dcpomatic.cc:234
 msgid "About DCP-o-matic"
@@ -105,16 +105,16 @@ msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
-"Erreur indeterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
+"Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
 #: src/tools/dcpomatic.cc:484
 msgid "An unknown exeception occurred."
-msgstr "Une exception inconnue est arrivée"
+msgstr "Exception inconnue"
 
 #: src/tools/dcpomatic.cc:480
 msgid "CPL's content is not encrypted."
-msgstr "Le contenu du DCP n'est pas crypté."
+msgstr "Le contenu du CPL n'est pas crypté."
 
 #: src/tools/dcpomatic.cc:230
 msgid "Check for updates"
@@ -144,7 +144,7 @@ msgstr "DCP-o-matic"
 
 #: src/tools/dcpomatic_batch.cc:139 src/tools/dcpomatic_batch.cc:240
 msgid "DCP-o-matic Batch Converter"
-msgstr "DCP-o-matic - Convertisseur Batch"
+msgstr "DCP-o-matic - Convertisseur par lots"
 
 #: src/tools/dcpomatic.cc:229
 msgid "Encoding servers..."
@@ -160,7 +160,7 @@ msgstr "Création de DCP libre et open-source à partir de presque tout."
 
 #: src/tools/dcpomatic.cc:228
 msgid "Hints..."
-msgstr "Avertissements..."
+msgstr "Conseils..."
 
 #: src/tools/dcpomatic.cc:223
 msgid "Make &KDMs..."
@@ -197,8 +197,8 @@ msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
 "using only has %.1f Gb available.  Do you want to continue anyway?"
 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?"
+"Le DCP de ce film pèsera environ %.1f Go. Le disque que vous utilisez n'a "
+"que %.1f Go disponible(s). Souhaitez-vous continuer?"
 
 #: src/tools/dcpomatic.cc:804
 msgid "The DCP-o-matic download server could not be contacted."

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index b8eecc90a59d889d4e375c3d896a4f1537097b57..9c7857c1e72c1dc6fddb8d6465446b651bc625fd 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -106,6 +106,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        translated_by.Add (wxT ("Theo Kooijmans"));
        translated_by.Add (wxT ("Max Aeschlimann"));
        translated_by.Add (wxT ("Carsten Kurz"));
+       translated_by.Add (wxT ("Grégoire Ausina"));
        add_section (_("Translated by"), translated_by);
 
        wxArrayString artwork_by;

diff --git a/src/wx/kdm_dialog.cc b/src/wx/kdm_dialog.cc
index 0fdb1fe5051eda24adf941bde7eeafbc287ddddf..6ef630eff39f5a29cb39a88ed7cb8952e8698d26 100644 (file)
--- a/src/wx/kdm_dialog.cc
+++ b/src/wx/kdm_dialog.cc
@@ -161,9 +161,11 @@ KDMDialog::KDMDialog (wxWindow* parent, boost::shared_ptr<const Film> film)
 
        add_label_to_sizer (table, this, _("KDM type"), true);
        _type = new wxChoice (this, wxID_ANY);
-       _type->Append ("Modified Transitional 1");
-       _type->Append ("DCI Any");
-       _type->Append ("DCI Specific");
+       _type->Append ("Modified Transitional 1", ((void *) libdcp::KDM::MODIFIED_TRANSITIONAL_1));
+       if (!film->interop ()) {
+               _type->Append ("DCI Any", ((void *) libdcp::KDM::DCI_ANY));
+               _type->Append ("DCI Specific", ((void *) libdcp::KDM::DCI_SPECIFIC));
+       }
        table->Add (_type, 1, wxEXPAND);
        _type->SetSelection (0);
 
@@ -491,16 +493,7 @@ KDMDialog::write_to () const
 dcp::Formulation
 KDMDialog::formulation () const
 {
-       switch (_type->GetSelection()) {
-       case 0:
-               return dcp::MODIFIED_TRANSITIONAL_1;
-       case 1:
-               return dcp::DCI_ANY;
-       case 2:
-               return dcp::DCI_SPECIFIC;
-       default:
-               assert (false);
-       }
+       return (dcp::KDM::Formulation) reinterpret_cast<long int> (_type->GetClientData (_type->GetSelection()));
 }
 
 void

diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 943da177d7dab8361bf596fb3528f320e8f755ef..eb1b8db3f759d8151fac0a2086004131d680cf9b 100644 (file)
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-24 14:53+0100\n"
-"PO-Revision-Date: 2014-07-02 17:06+0100\n"
+"PO-Revision-Date: 2014-07-13 03:08+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -357,7 +357,7 @@ msgstr "Standard JPEG2000 Datenrate"
 
 #: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
-msgstr "Standard Ton Verzögerung"
+msgstr "Standard Ton Verzögerung (+/-)"
 
 #: src/wx/config_dialog.cc:270
 msgid "Default container"
@@ -446,15 +446,15 @@ msgstr "Bearbeiten..."
 
 #: src/wx/cinema_dialog.cc:31
 msgid "Email address for KDM delivery"
-msgstr "Absender Email Adresse"
+msgstr "KDM Empfänger Email Adresse"
 
 #: src/wx/servers_list_dialog.cc:30
 msgid "Encoding Servers"
-msgstr "Enkodier Server"
+msgstr "Encoding Server"
 
 #: src/wx/film_editor.cc:162
 msgid "Encrypted"
-msgstr "Verschlüsselt (-> KDM Erstellung)"
+msgstr "Verschlüsselt (->für KDM Erstellung)"
 
 #: src/wx/config_dialog.cc:790
 msgid "Errors"
@@ -602,7 +602,7 @@ msgstr "Zeitfenster"
 
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
-msgstr "Lücken automatisch schließen"
+msgstr "Lücken in Zeitleiste automatisch schließen"
 
 #: src/wx/audio_mapping_view.cc:277
 msgid "L"
@@ -662,7 +662,7 @@ msgstr "Matrix"
 
 #: src/wx/config_dialog.cc:772
 msgid "Maximum JPEG2000 bandwidth"
-msgstr "Maximale JPEG2000 Datenrate(Vorsicht!)"
+msgstr "Maximale JPEG2000 Datenrate (Vorsicht!)"
 
 #: src/wx/config_dialog.cc:283 src/wx/config_dialog.cc:776
 #: src/wx/film_editor.cc:185
@@ -836,11 +836,11 @@ msgstr "SMPTE"
 
 #: src/wx/subtitle_panel.cc:62
 msgid "Scale"
-msgstr "Skalierer"
+msgstr "Größe"
 
 #: src/wx/video_panel.cc:132
 msgid "Scale to"
-msgstr "Skaliere zu"
+msgstr "Skaliere auf"
 
 #: src/wx/video_panel.cc:316
 #, c-format
@@ -849,7 +849,7 @@ msgstr "Skaliert auf %dx%d (%.2f:1)\n"
 
 #: src/wx/film_editor.cc:195
 msgid "Scaler"
-msgstr "Skalierer"
+msgstr "Skalierverfahren"
 
 #: src/wx/kdm_dialog.cc:60
 msgid "Screens"
@@ -885,7 +885,7 @@ msgstr "Server Seriennummer"
 
 #: src/wx/config_dialog.cc:434
 msgid "Servers"
-msgstr "Server"
+msgstr "Encoding Server"
 
 #: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
@@ -921,7 +921,7 @@ msgstr "Standard"
 
 #: src/wx/audio_panel.cc:81 src/wx/subtitle_panel.cc:70
 msgid "Stream"
-msgstr "Tonspur"
+msgstr "Spur"
 
 #: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Studio (e.g. TCF)"
@@ -1171,7 +1171,7 @@ msgstr "Standbild"
 
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
-msgstr "Zeiten"
+msgstr "mal"
 
 #: src/wx/timeline.cc:241
 msgid "video"

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 766bd3ad3f56cef828d66bc1db7553e26ac464da..8a784a0a671c1e07b7114baf13f6a5e8c0253e1b 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-24 14:53+0100\n"
-"PO-Revision-Date: 2014-06-20 16:08+0100\n"
-"Last-Translator: \n"
+"PO-Revision-Date: 2014-07-14 11:27+0100\n"
+"Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.6.3\n"
+"X-Generator: Poedit 1.6.6\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 #: src/wx/subtitle_panel.cc:66
@@ -156,11 +156,11 @@ msgstr ""
 #: src/wx/job_wrapper.cc:38
 #, c-format
 msgid "Bad setting for %s (%s)"
-msgstr "Mauvais paramètre pour %s (%s)"
+msgstr "Mauvais réglage pour %s (%s)"
 
 #: src/wx/video_panel.cc:121
 msgid "Bottom crop"
-msgstr "Découpe bas"
+msgstr "Rogner en bas"
 
 #: src/wx/dir_picker_ctrl.cc:37 src/wx/kdm_dialog.cc:134
 msgid "Browse..."
@@ -176,16 +176,15 @@ msgstr "Ar.D"
 
 #: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
-msgstr "Je souhaite utiliser ce volume"
+msgstr "Mais je dois mixer"
 
 #: src/wx/audio_mapping_view.cc:285
 msgid "C"
 msgstr "C"
 
 #: src/wx/config_dialog.cc:677
-#, fuzzy
 msgid "CC address"
-msgstr "Adresse IP"
+msgstr "Adresse CC"
 
 #: src/wx/kdm_dialog.cc:125 src/wx/kdm_dialog.cc:131
 msgid "CPL"
@@ -262,9 +261,8 @@ msgid "Colour conversion"
 msgstr "Espace Couleurs"
 
 #: src/wx/config_dialog.cc:793
-#, fuzzy
 msgid "Config|Timing"
-msgstr "Durée"
+msgstr "Configuration|Temps"
 
 #: src/wx/film_editor.cc:134
 msgid "Container"
@@ -307,9 +305,9 @@ msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
 #: src/wx/screen_dialog.cc:95
-#, fuzzy, c-format
+#, c-format
 msgid "Could not read certificate file (%s)"
-msgstr "Ouverture du contenu impossible (%s)"
+msgstr "Lecture du ficher de certificat (%s) impossible"
 
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
@@ -322,7 +320,7 @@ msgstr "Créer dans le dossier"
 #: src/wx/video_panel.cc:304
 #, c-format
 msgid "Cropped to %dx%d (%.2f:1)\n"
-msgstr "Découpe de %dx%d (%.2f:1)\n"
+msgstr "Rognage de %dx%d (%.2f:1)\n"
 
 #: src/wx/video_panel.cc:244
 msgid "Custom"
@@ -359,7 +357,7 @@ msgstr "Qualité JPEG2000 par défaut"
 
 #: src/wx/config_dialog.cc:288
 msgid "Default audio delay"
-msgstr "Délais audio par défaut"
+msgstr "Délai audio par défaut"
 
 #: src/wx/config_dialog.cc:270
 msgid "Default container"
@@ -390,9 +388,8 @@ msgid "Defaults"
 msgstr "Par défaut"
 
 #: src/wx/audio_panel.cc:67
-#, fuzzy
 msgid "Delay"
-msgstr "Délai audio"
+msgstr "Délai"
 
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
@@ -509,9 +506,8 @@ msgid "From"
 msgstr "À partir du"
 
 #: src/wx/config_dialog.cc:673
-#, fuzzy
 msgid "From address"
-msgstr "Adresse IP"
+msgstr "Adresse source"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Full"
@@ -523,7 +519,7 @@ msgstr "Durée totale"
 
 #: src/wx/audio_panel.cc:52
 msgid "Gain"
-msgstr ""
+msgstr "Gain"
 
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
@@ -548,7 +544,7 @@ msgstr "HI"
 
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
-msgstr "Avertissements"
+msgstr "Conseils"
 
 #: src/wx/servers_list_dialog.cc:40
 msgid "Host"
@@ -564,7 +560,7 @@ msgstr "Hz"
 
 #: src/wx/gain_calculator_dialog.cc:29
 msgid "I want to play this back at fader"
-msgstr "Je veux le jouer à ce volume"
+msgstr "Je veux lire avec une table de mixage"
 
 #: src/wx/config_dialog.cc:562
 msgid "IP address"
@@ -580,7 +576,7 @@ msgstr "Nom ISDCF"
 
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
-msgstr "Gamma entrée"
+msgstr "gamma source"
 
 #: src/wx/film_editor.cc:228
 msgid "Interop"
@@ -599,13 +595,12 @@ msgid "KDM Email"
 msgstr "e-mail KDM"
 
 #: src/wx/kdm_dialog.cc:99
-#, fuzzy
 msgid "KDM|Timing"
-msgstr "Durée"
+msgstr "KDM|Temps"
 
 #: src/wx/film_editor.cc:297
 msgid "Keep video in sequence"
-msgstr "Garder la vidéo"
+msgstr "Conserver la vidéo dans la séquence"
 
 #: src/wx/audio_mapping_view.cc:277
 msgid "L"
@@ -617,7 +612,7 @@ msgstr "CG"
 
 #: src/wx/video_panel.cc:88
 msgid "Left crop"
-msgstr "Découpe gauche"
+msgstr "Rogner à gauche"
 
 #: src/wx/audio_mapping_view.cc:289
 msgid "Lfe"
@@ -625,7 +620,7 @@ msgstr "BF"
 
 #: src/wx/colour_conversion_editor.cc:49
 msgid "Linearise input gamma curve for low values"
-msgstr "Lisser la courbe gamma d'entrée pour les bas niveaux"
+msgstr "Courbe gamma d'entrée linéaire pour les bas niveaux"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
@@ -713,7 +708,7 @@ msgstr "Autre"
 
 #: src/wx/config_dialog.cc:654
 msgid "Outgoing mail server"
-msgstr "Serveurs de messagerie sortante"
+msgstr "Serveurs de messagerie sortant"
 
 #: src/wx/kdm_dialog.cc:156
 msgid "Output"
@@ -811,7 +806,7 @@ msgstr "Répéter..."
 
 #: src/wx/config_dialog.cc:684
 msgid "Reset to default text"
-msgstr ""
+msgstr "texte par défaut"
 
 #: src/wx/film_editor.cc:175
 msgid "Resolution"
@@ -827,7 +822,7 @@ msgstr "Cliquez droit pour modifier le gain."
 
 #: src/wx/video_panel.cc:99
 msgid "Right crop"
-msgstr "Découpe droite"
+msgstr "Rogner à droite"
 
 #: src/wx/audio_mapping_view.cc:297
 msgid "Rs"
@@ -879,9 +874,8 @@ msgid "Server"
 msgstr "Serveur"
 
 #: src/wx/screen_dialog.cc:41
-#, fuzzy
 msgid "Server manufacturer"
-msgstr "Numéro de Série du Serveur"
+msgstr "Constructeur du serveur"
 
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
@@ -897,11 +891,11 @@ msgstr "Sélection"
 
 #: src/wx/config_dialog.cc:86
 msgid "Set language"
-msgstr "Selectionnez la langue"
+msgstr "Sélectionnez la langue"
 
 #: src/wx/audio_panel.cc:48
 msgid "Show Audio..."
-msgstr "Analyser le son..."
+msgstr "Afficher le son..."
 
 #: src/wx/film_editor.cc:158
 msgid "Signed"
@@ -913,7 +907,7 @@ msgstr "Lissage"
 
 #: src/wx/timeline_dialog.cc:38
 msgid "Snap"
-msgstr "Echnager"
+msgstr "Magnetisme"
 
 #: src/wx/update_dialog.cc:43
 msgid "Stable version "
@@ -949,11 +943,11 @@ msgstr "TMS"
 
 #: src/wx/config_dialog.cc:566
 msgid "Target path"
-msgstr "Chemin d'accès"
+msgstr "Chemin cible"
 
 #: src/wx/isdcf_metadata_dialog.cc:56
 msgid "Temp version"
-msgstr "Version Temp"
+msgstr "Version temporaire"
 
 #: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
@@ -961,7 +955,7 @@ msgstr "Territoire (ex. FR)"
 
 #: src/wx/update_dialog.cc:48
 msgid "Test version "
-msgstr "Version Test"
+msgstr "Version test"
 
 #: src/wx/about_dialog.cc:198
 msgid "Tested by"
@@ -974,7 +968,7 @@ msgid ""
 "missing content."
 msgstr ""
 "Les fichiers de contenu que vous avez spécifiés ne sont pas les mêmes que "
-"ceux detectés comme manquants. Vous pouvez réessayer avec les contenus "
+"ceux détectés comme manquants. Vous pouvez réessayer avec les contenus "
 "corrects ou supprimer les contenus manquants."
 
 #: src/wx/hints_dialog.cc:97
@@ -1010,13 +1004,12 @@ msgid "Timeline..."
 msgstr "Timeline..."
 
 #: src/wx/timing_panel.cc:35
-#, fuzzy
 msgid "Timing|Timing"
-msgstr "Durée"
+msgstr "Temps|Temps"
 
 #: src/wx/video_panel.cc:110
 msgid "Top crop"
-msgstr "Découpe haut"
+msgstr "Rogner en haut"
 
 #: src/wx/about_dialog.cc:105
 msgid "Translated by"
@@ -1024,11 +1017,11 @@ msgstr "Traduit par"
 
 #: src/wx/timing_panel.cc:49
 msgid "Trim from end"
-msgstr "Exclure à la fin"
+msgstr "Rogner par la fin"
 
 #: src/wx/timing_panel.cc:46
 msgid "Trim from start"
-msgstr "Exclure au début"
+msgstr "Rogner au début"
 
 #: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:75
 msgid "Type"
@@ -1052,7 +1045,7 @@ msgstr "Monter"
 
 #: src/wx/update_dialog.cc:27
 msgid "Update"
-msgstr "Mise à jour."
+msgstr "Mise à jour"
 
 #: src/wx/film_editor.cc:128
 msgid "Use ISDCF name"
@@ -1060,7 +1053,7 @@ msgstr "Utiliser le nom ISDCF"
 
 #: src/wx/config_dialog.cc:450
 msgid "Use all servers"
-msgstr "Utiliser tous les serveurs."
+msgstr "Utiliser tous les serveurs"
 
 #: src/wx/film_editor.cc:152
 msgid "Use best"
@@ -1104,11 +1097,11 @@ msgstr "Développé par"
 
 #: src/wx/subtitle_panel.cc:44
 msgid "X Offset"
-msgstr "Position Horizontale"
+msgstr "Position horizontale"
 
 #: src/wx/subtitle_panel.cc:53
 msgid "Y Offset"
-msgstr "Position Verticale"
+msgstr "Position verticale"
 
 #: src/wx/hints_dialog.cc:90
 #, c-format
@@ -1134,7 +1127,7 @@ msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
 msgstr ""
-"Votre DCP poss��de un nombre impair de canaux audio.  Cela peut créer des "
+"Votre DCP poss��de un nombre impair de canaux audio.  Cela peut créer des "
 "problèmes de lecture."
 
 #: src/wx/hints_dialog.cc:70

diff --git a/src/wx/wscript b/src/wx/wscript
index 26c8b93041975f8487b7e8095d12023e36430f4e..719496ae702a9d190aaea309a5d76e912ca8443a 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -69,6 +69,9 @@ def configure(conf):
             conf.env.LIB_WXWIDGETS.append('Xxf86vm')
             conf.env.LIB_WXWIDGETS.append('Xext')
             conf.env.LIB_WXWIDGETS.append('X11')
+
+        if conf.env.TARGET_CENTOS_7:
+            conf.env.LIB_WXWIDGETS.append('Xxf86vm')
  
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()

diff --git a/wscript b/wscript
index df839a96befcd1087d2ad00c445ac71fb077d9b4..681654bb8d0acd4fd571866bee3d02fcdedba0e8 100644 (file)
--- a/wscript
+++ b/wscript
@@ -11,10 +11,12 @@ def options(opt):
 
     opt.add_option('--enable-debug',      action='store_true', default=False, help='build with debugging information and without optimisation')
     opt.add_option('--disable-gui',       action='store_true', default=False, help='disable building of GUI tools')
+    opt.add_option('--disable-tests',     action='store_true', default=False, help='disable building of tests')
     opt.add_option('--target-windows',    action='store_true', default=False, help='set up to do a cross-compile to make a Windows package')
     opt.add_option('--target-debian',     action='store_true', default=False, help='set up to compile for a Debian/Ubuntu package')
     opt.add_option('--debian-unstable',   action='store_true', default=False, help='add extra libraries to static-build correctly on Debian unstable')
-    opt.add_option('--target-centos',     action='store_true', default=False, help='set up to compile for a Centos package')
+    opt.add_option('--target-centos-6',   action='store_true', default=False, help='set up to compile for a Centos 6.5 package')
+    opt.add_option('--target-centos-7',   action='store_true', default=False, help='set up to compile for a Centos 7 package')
     opt.add_option('--magickpp-config',   action='store',      default='Magick++-config', help='path to Magick++-config')
     opt.add_option('--wx-config',         action='store',      default='wx-config', help='path to wx-config')
     opt.add_option('--address-sanitizer', action='store_true', default=False, help='build with address sanitizer')
@@ -56,7 +58,11 @@ def dynamic_openjpeg(conf):
     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):
+<<<<<<< HEAD
     conf.check_cfg(package='libdcp-1.0', atleast_version='0.95', args='--cflags', uselib_store='DCP', mandatory=True)
+=======
+    conf.check_cfg(package='libdcp', atleast_version='0.96', args='--cflags', uselib_store='DCP', mandatory=True)
+>>>>>>> origin/master
     conf.env.DEFINES_DCP = [f.replace('\\', '') for f in conf.env.DEFINES_DCP]
     conf.env.STLIB_DCP = ['dcp-1.0', 'asdcp-libdcp-1.0', 'kumu-libdcp-1.0']
     conf.env.LIB_DCP = ['glibmm-2.4', 'ssl', 'crypto', 'bz2', 'xslt']
@@ -163,14 +169,16 @@ def configure(conf):
     # conf.options -> conf.env
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
+    conf.env.DISABLE_TESTS = conf.options.disable_tests
     conf.env.TARGET_DEBIAN = conf.options.target_debian
     conf.env.DEBIAN_UNSTABLE = conf.options.debian_unstable
-    conf.env.TARGET_CENTOS = conf.options.target_centos
+    conf.env.TARGET_CENTOS_6 = conf.options.target_centos_6
+    conf.env.TARGET_CENTOS_7 = conf.options.target_centos_7
     conf.env.VERSION = VERSION
     conf.env.TARGET_OSX = sys.platform == 'darwin'
     conf.env.TARGET_LINUX = not conf.env.TARGET_WINDOWS and not conf.env.TARGET_OSX
     # true if we should build dcpomatic/libdcpomatic/libdcpomatic-wx statically
-    conf.env.BUILD_STATIC = conf.options.target_debian or conf.options.target_centos
+    conf.env.BUILD_STATIC = conf.options.target_debian or conf.options.target_centos_6 or conf.options.target_centos_7
     if conf.options.install_prefix is None:
         conf.env.INSTALL_PREFIX = conf.env.PREFIX
     else:
@@ -218,8 +226,8 @@ def configure(conf):
     # POSIX
     if conf.env.TARGET_LINUX or conf.env.TARGET_OSX:
         conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX')
-        conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX'])
-        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['PREFIX'])
+        conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['INSTALL_PREFIX'])
+        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['INSTALL_PREFIX'])
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
         conf.env.append_value('LINKFLAGS', '-pthread')
@@ -249,7 +257,7 @@ def configure(conf):
     if conf.env.TARGET_DEBIAN:
         conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True)
         conf.env.STLIB_CXML = ['cxml']
-        conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True)
+        conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)
         conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
         conf.env.STLIB_QUICKMAIL = ['quickmail']
         static_ffmpeg(conf)
@@ -257,7 +265,8 @@ def configure(conf):
         static_dcp(conf, False, False, False, False)
         dynamic_boost(conf, boost_lib_suffix, boost_thread)
 
-    if conf.env.TARGET_CENTOS:
+    if conf.env.TARGET_CENTOS_6:
+        # Centos 6.5's boost is too old, so we build a new version statically in the chroot
         conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs-only-L', uselib_store='CXML', mandatory=True)
         conf.env.STLIB_CXML = ['cxml', 'boost_filesystem']
         conf.check_cfg(package='libcurl', args='--cflags --libs-only-L', uselib_store='CURL', mandatory=True)
@@ -270,8 +279,22 @@ def configure(conf):
         static_dcp(conf, True, True, True, True)
         static_boost(conf, boost_lib_suffix)
 
+    if conf.env.TARGET_CENTOS_7:
+        # Centos 7's boost is ok so we link it dynamically
+        conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags', uselib_store='CXML', mandatory=True)
+        conf.env.STLIB_CXML = ['cxml']
+        conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
+        conf.env.STLIB_QUICKMAIL = ['quickmail']
+        conf.env.LIB_SSH = ['gssapi_krb5']
+        conf.env.LIB_XMLPP = ['xml2']
+        conf.env.LIB_XMLSEC = ['ltdl']
+        static_ffmpeg(conf)
+        static_openjpeg(conf)
+        static_dcp(conf, False, True, True, True)
+        dynamic_boost(conf, boost_lib_suffix, boost_thread)
+
     if conf.env.TARGET_WINDOWS:
-        conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True)
+        conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)
         conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
         conf.check_cxx(fragment="""
                                #include <boost/locale.hpp>\n
@@ -288,9 +311,9 @@ def configure(conf):
         dynamic_ssh(conf)
 
     # Not packaging; just a straight build
-    if not conf.env.TARGET_WINDOWS and not conf.env.TARGET_DEBIAN and not conf.env.TARGET_CENTOS:
+    if not conf.env.TARGET_WINDOWS and not conf.env.TARGET_DEBIAN and not conf.env.TARGET_CENTOS_6 and not conf.env.TARGET_CENTOS_7:
         conf.check_cfg(package='libcxml', atleast_version='0.08', args='--cflags --libs', uselib_store='CXML', mandatory=True)
-        conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XML++', mandatory=True)
+        conf.check_cfg(package='libxml++-2.6', args='--cflags --libs', uselib_store='XMLPP', mandatory=True)
         conf.check_cfg(package='libcurl', args='--cflags --libs', uselib_store='CURL', mandatory=True)
         dynamic_quickmail(conf)
         dynamic_boost(conf, boost_lib_suffix, boost_thread)
@@ -325,13 +348,15 @@ def configure(conf):
     conf.define('DATADIR', datadir)
 
     conf.recurse('src')
-    conf.recurse('test')
+    if not conf.env.DISABLE_TESTS:
+        conf.recurse('test')
 
 def build(bld):
     create_version_cc(VERSION, bld.env.CXXFLAGS)
 
     bld.recurse('src')
-    bld.recurse('test')
+    if not bld.env.DISABLE_TESTS:
+        bld.recurse('test')
     if bld.env.TARGET_WINDOWS:
         bld.recurse('platform/windows')
     if bld.env.TARGET_LINUX: