Merge.

diff --git a/ChangeLog b/ChangeLog
index 48103c7943ff102b73ddaccbad9312cfe9b38450..bccd9ac4a7abce8c5ea27280a47ec093e99ee605 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-02-04  Carl Hetherington  <cth@carlh.net>
+
+       * Updated de_DE translation from Carsten Kurz.
+
 2016-02-02  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.6.18 released.

diff --git a/cscript b/cscript
index 46e289821c6fb001b60e252407f8f4e6eafc3a3d..f5c94f720c04f494867076d6694b40ad69217cd9 100644 (file)
--- a/cscript
+++ b/cscript
@@ -253,7 +253,7 @@ def make_spec(filename, version, target):
     print('tar xjf $RPM_SOURCE_DIR/dcpomatic-%s.tar.bz2' % version, file=f)
     print('%build', file=f)
     print('cd dcpomatic-%s' % version, file=f)
-    print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:/usr/local/lib/pkgconfig' % target.directory, file=f)
+    print('export PKG_CONFIG_PATH=%s/lib/pkgconfig:%s/lib64/pkgconfig:/usr/local/lib/pkgconfig' % (target.directory, target.directory), file=f)
     print('CXXFLAGS="-I%s/include" LDFLAGS="-L%s/lib" ./waf configure --prefix=%%{buildroot}/usr --install-prefix=/usr %s' % (target.directory, target.directory, configure_options(target)), file=f)
     print('./waf', file=f)
     print('%install', file=f)
@@ -279,9 +279,9 @@ def dependencies(target):
     else:
         ffmpeg_options = {}
 
-    return (('ffmpeg-cdist', 'b559555', ffmpeg_options),
-            ('libdcp', 'e33e3b8'),
-            ('libsub', '1e26169'))
+    return (('ffmpeg-cdist', '96d67de', ffmpeg_options),
+            ('libdcp', '0aafcc5'),
+            ('libsub', '0bddbf8'))
 
 def configure_options(target):
     opt = ''
@@ -387,11 +387,11 @@ def package(target, version):
         return package_windows(target)
     elif target.platform == 'linux':
         if target.bits == 32:
-           cpu = 'i386'
+            cpu = 'i386'
         else:
-            cpu        = 'amd64'
+            cpu = 'amd64'
 
-       if target.distro == 'debian' or target.distro == 'ubuntu':
+        if target.distro == 'debian' or target.distro == 'ubuntu':
             return package_debian(target, cpu, version)
         elif target.distro == 'centos' or target.distro == 'fedora':
             return package_rpm(target, cpu, version)
@@ -403,7 +403,7 @@ def make_pot(target):
     target.command('./waf pot')
     return [os.path.abspath('build/src/lib/libdcpomatic.pot'),
             os.path.abspath('build/src/wx/libdcpomatic-wx.pot'),
-           os.path.abspath('build/src/tools/dcpomatic.pot')]
+            os.path.abspath('build/src/tools/dcpomatic.pot')]
 
 def make_manual(target):
     os.chdir('doc/manual')

diff --git a/platform/windows/wscript b/platform/windows/wscript
index a140228567d4f54bd580f8aba9f0f3d4b7dadafb..3aafd4bb98c4e0d02bf7afeae9f18aa1d2c77251 100644 (file)
--- a/platform/windows/wscript
+++ b/platform/windows/wscript
@@ -124,8 +124,8 @@ File "%static_deps%/lib/icuuc52.dll"
 File "%static_deps%/lib/icudt52.dll"
 File "%static_deps%/lib/icuin52.dll"
 
-File "%cdist_deps%/bin/asdcp-libdcp-1.0.dll"
-File "%cdist_deps%/bin/kumu-libdcp-1.0.dll"
+File "%cdist_deps%/bin/asdcp-cth.dll"
+File "%cdist_deps%/bin/kumu-cth.dll"
 File "%cdist_deps%/bin/avcodec-56.dll"
 File "%cdist_deps%/bin/avfilter-5.dll"
 File "%cdist_deps%/bin/avformat-56.dll"
@@ -138,8 +138,6 @@ File "%cdist_deps%/bin/libopenjp2.dll"
 File "%cdist_deps%/bin/swscale-3.dll"
 File "%cdist_deps%/bin/cxml-0.dll"
 File "%cdist_deps%/bin/sub-1.0.dll"
-File "%cdist_deps%/bin/asdcp-libsub-1.0.dll"
-File "%cdist_deps%/bin/kumu-libsub-1.0.dll"
 File "%cdist_deps%/bin/ffprobe.exe"
     """, file=f)
 

diff --git a/src/lib/ffmpeg_content.cc b/src/lib/ffmpeg_content.cc
index ba799be72f0aad6f84c852481da897a7c1104a76..b47116bdcbb87f17761141e42521defb1888a00b 100644 (file)
--- a/src/lib/ffmpeg_content.cc
+++ b/src/lib/ffmpeg_content.cc
@@ -131,10 +131,18 @@ FFmpegContent::FFmpegContent (shared_ptr<const Film> film, vector<boost::shared_
                }
        }
 
+       /* XXX: should probably check that more of the stuff below is the same in *this and ref */
+
        _subtitle_streams = ref->subtitle_streams ();
        _subtitle_stream = ref->subtitle_stream ();
        _audio_streams = ref->ffmpeg_audio_streams ();
        _first_video = ref->_first_video;
+       _filters = ref->_filters;
+       _color_range = ref->_color_range;
+       _color_primaries = ref->_color_primaries;
+       _color_trc = ref->_color_trc;
+       _colorspace = ref->_colorspace;
+       _bits_per_pixel = ref->_bits_per_pixel;
 }
 
 void

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index bf6f7b4c3bee4e2e7d31f01ca7a84d177493d991..c71373340075e1ad774ab4be9630fa5688cb136b 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: 2016-01-10 02:45+0000\n"
-"PO-Revision-Date: 2016-01-29 03:45+0100\n"
+"PO-Revision-Date: 2016-02-03 23:42+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: de\n"
@@ -157,7 +157,7 @@ msgstr "Überprüfe bestehende Bilddateien"
 
 #: src/lib/ffmpeg_content.cc:427
 msgid "Colour primaries"
-msgstr "Grundfarbezug ('primaries')"
+msgstr "Grundfarbbezug ('primaries')"
 
 #. / TRANSLATORS: this means that the range of pixel values used in this
 #. / file is unknown (not specified in the file).
@@ -684,7 +684,7 @@ msgstr ""
 
 #: src/lib/job.cc:145
 msgid "Out of memory"
-msgstr "Zuwenig Speicher"
+msgstr "Zu wenig Speicher"
 
 #: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
@@ -740,7 +740,7 @@ msgid ""
 "to 'split by video content'."
 msgstr ""
 "Aktlängen im Projekt unterscheiden sich von DCP; Aktunterteilung wurde auf "
-"Inhaltssegmentgrenzen gesetzt"
+"Inhalts-Segmentgrenzen gesetzt"
 
 #: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:484
 msgid "Right"

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index ac1da7309d9c9fb1a966cdee42aac117b7ced842..ad0cae225b2613ad17c6718bdc1dd789bbdbbe53 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: 2016-01-10 02:45+0000\n"
-"PO-Revision-Date: 2016-01-29 01:32+0100\n"
+"PO-Revision-Date: 2016-02-04 00:28+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:827
 msgid "&Content"
-msgstr "&Quelle..."
+msgstr "&Schnellskalierung..."
 
 #: src/tools/dcpomatic.cc:825 src/tools/dcpomatic_batch.cc:81
 msgid "&Edit"
@@ -131,7 +131,7 @@ msgstr "Auf Updates überprüfen..."
 
 #: src/tools/dcpomatic.cc:528
 msgid "Could not find batch converter."
-msgstr "Batchconverter nicht gestartet!?"
+msgstr "Batchkonverter nicht gestartet!?"
 
 #: src/tools/dcpomatic.cc:995 src/tools/dcpomatic_batch.cc:326
 msgid "Could not load film %1 (%2)"
@@ -218,11 +218,11 @@ msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
 
 #: src/tools/dcpomatic.cc:797
 msgid "Scale to fit &height"
-msgstr "Skalierungsbezug ist &Höhe DCI-Container (Standard)"
+msgstr "Container vertikal füllen (evtl. seitlicher Beschnitt!)"
 
 #: src/tools/dcpomatic.cc:796
 msgid "Scale to fit &width"
-msgstr "Skalierungsbezug ist &Breite DCI-Container"
+msgstr "Container horizontal füllen (evtl. vertikaler Beschnitt!)"
 
 #: src/tools/dcpomatic.cc:361 src/tools/dcpomatic_batch.cc:213
 msgid "Select film to open"

diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index d2f0ca7ed1c68a90c44e40ac0d0786eb0fdcf4f8..97e31231c4461e5590770626c3d30e06a1ca793d 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: 2016-01-10 02:45+0000\n"
-"PO-Revision-Date: 2016-01-29 03:52+0100\n"
+"PO-Revision-Date: 2016-02-04 00:57+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: DCP-o-matic translators\n"
 "Language: de\n"
@@ -133,7 +133,7 @@ msgstr "Saal hinzufügen..."
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
-msgstr "Einzelbildsequenz oder DCP hinzufügen"
+msgstr "Einzelbildsequenz / DCP hinzufügen"
 
 #: src/wx/content_panel.cc:75
 msgid "Add file(s)..."
@@ -141,7 +141,7 @@ msgstr "Datei(en) hinzufügen..."
 
 #: src/wx/content_panel.cc:79
 msgid "Add folder..."
-msgstr "Einzelbildsequenz oder DCP hinzufügen..."
+msgstr "Einzelbildsequenz / DCP hinzufügen..."
 
 #: src/wx/image_sequence_dialog.cc:25
 msgid "Add image sequence"
@@ -227,7 +227,7 @@ msgstr ""
 
 #: src/wx/config_dialog.cc:189
 msgid "Automatically analyse content audio"
-msgstr "Audioinhalte beim erstmaligen Einbinden sofort analysieren"
+msgstr "Audioinhalte beim Import sofort analysieren"
 
 #: src/wx/colour_conversion_editor.cc:71
 msgid "B"
@@ -549,7 +549,7 @@ msgstr "Empfängeradresse"
 
 #: src/wx/cinema_dialog.cc:52
 msgid "Email addresses for KDM delivery"
-msgstr "KDM Empfänger Email Adressen"
+msgstr "KDM Empfänger Email-Adressen"
 
 #: src/wx/servers_list_dialog.cc:32
 msgid "Encoding Servers"
@@ -709,7 +709,7 @@ msgstr "IP Adresse / Host Name"
 
 #: src/wx/isdcf_metadata_dialog.cc:31
 msgid "ISDCF name"
-msgstr "ISDCF Name"
+msgstr "ISDCF Name - http://isdcf.com/dcnc/"
 
 #: src/wx/colour_conversion_editor.cc:55
 msgid "Input gamma"
@@ -726,7 +726,7 @@ msgstr "Eingangsstärke"
 #: src/wx/audio_dialog.cc:306
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
-msgstr "Integrierter Lautheitsumfang %.2f LU"
+msgstr "Integrierter Lautheitsumfang %.2f LUFS"
 
 #: src/wx/config_dialog.cc:818
 msgid "Intermediate"
@@ -758,7 +758,7 @@ msgstr "JPEG2000 Datenrate"
 
 #: src/wx/content_menu.cc:62
 msgid "Join"
-msgstr "Verbinden"
+msgstr "Nahtlos verbinden (VOB, MTS...)"
 
 #: src/wx/config_dialog.cc:1152
 msgid "KDM Email"
@@ -782,7 +782,7 @@ msgstr "Schlüssel"
 
 #: src/wx/config_dialog.cc:971
 msgid "Keys"
-msgstr "Schlüssel"
+msgstr "Eigenzertifikate"
 
 #: src/wx/subtitle_panel.cc:106
 msgid "Language"
@@ -818,7 +818,7 @@ msgstr "In die Log-Datei schreiben:"
 
 #: src/wx/config_dialog.cc:1352
 msgid "Log:"
-msgstr "Log:"
+msgstr "In die Log-Datei schreiben:"
 
 #: src/wx/audio_dialog.cc:315
 #, c-format
@@ -847,7 +847,7 @@ msgstr "KDMs erstellen"
 
 #: src/wx/make_chain_dialog.cc:33
 msgid "Make certificate chain"
-msgstr "Schlüsselkette erzeugen"
+msgstr "Zertifikatskette erzeugen"
 
 #: src/wx/isdcf_metadata_dialog.cc:73
 msgid "Mastered luminance (e.g. 14fl)"
@@ -935,7 +935,7 @@ msgstr "Aus"
 
 #: src/wx/config_dialog.cc:1347
 msgid "Only servers encode"
-msgstr "Nur Encoding  Server komprimieren (keine lokale J2C Komprimierung!)"
+msgstr "Nur Encoding Server komprimieren (keine lokale J2C Komprimierung!)"
 
 #: src/wx/config_dialog.cc:1379
 msgid "Open console window"
@@ -1044,7 +1044,7 @@ msgstr "RGB-XYZ Konvertierung:"
 
 #: src/wx/audio_dialog.cc:89
 msgid "RMS"
-msgstr "RMS"
+msgstr "RMS (Mittelwert)"
 
 #: src/wx/key_dialog.cc:49
 msgid "Random"
@@ -1072,7 +1072,7 @@ msgstr "Rec. 709 (HD)"
 
 #: src/wx/screen_dialog.cc:76
 msgid "Recipient certificate"
-msgstr "Empfängerzertifikat"
+msgstr "Serverzertifikat"
 
 #: src/wx/isdcf_metadata_dialog.cc:60
 msgid "Red band"
@@ -1184,7 +1184,7 @@ msgstr "Saal"
 
 #: src/wx/config_dialog.cc:585
 msgid "Search network for servers"
-msgstr "Suche automatisch nach Encodingservern"
+msgstr "Durchsuche Netzwerk nach aktiven Encodingservern"
 
 #: src/wx/kdm_cpl_panel.cc:94
 msgid "Select CPL XML file"
@@ -1193,7 +1193,7 @@ msgstr "CPL XML Datei auswählen"
 #: src/wx/config_dialog.cc:739 src/wx/config_dialog.cc:779
 #: src/wx/config_dialog.cc:1010 src/wx/screen_dialog.cc:143
 msgid "Select Certificate File"
-msgstr "Zertifikat Datei auswählen"
+msgstr "Zertifikats-Datei auswählen"
 
 #: src/wx/content_menu.cc:321
 msgid "Select KDM"
@@ -1349,9 +1349,8 @@ msgid ""
 "missing.  Either try again with the correct content file or remove the "
 "missing content."
 msgstr ""
-"Die ausgewählten Inhaltsdateien sind nicht die gleichen wie die Fehlenden. "
-"Entweder nochmals mit den richtigen Inhaltsdateien probieren oder Fehlende "
-"löschen."
+"Die ausgewählten Dateien sind nicht die gleichen wie die Fehlenden. Nochmals "
+"die richtigen Inhaltsdateien suchen, oder Fehlende aus Projekt löschen."
 
 #: src/wx/hints_dialog.cc:179
 msgid "There are no hints: everything looks good!"
@@ -1437,7 +1436,7 @@ msgstr "Update"
 
 #: src/wx/dcp_panel.cc:77
 msgid "Use ISDCF name"
-msgstr "ISDCF Name benutzen"
+msgstr "ISDCF Name erzeugen"
 
 #: src/wx/dcp_panel.cc:628
 msgid "Use best"