Merge.

diff --git a/ChangeLog b/ChangeLog
index 16edf7d3a04fe725e0e025113346a03aac02dd09..e2da549d1ec19360fb6030943ee169a6e4f07665 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
+<<<<<<< HEAD
 2018-03-14  Carl Hetherington  <cth@carlh.net>
+=======
+2018-03-21  Carl Hetherington  <cth@carlh.net>
+
+       * Updated nl_NL translation from Rob van Nieuwkerk.
+
+2018-03-19  Carl Hetherington  <cth@carlh.net>
+>>>>>>> 15f3ff4... Updated nl_NL translation from Rob van Nieuwkerk.
 
        * Better error when loading a non-certificate as a certificate.
 

diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 0d0e0b71939d1d4378310732489e9ae31f95461d..24ef00da92d1d9da33cf809e4cbe5c0cbfec3aa1 100644 (file)
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 16:50+0000\n"
-"PO-Revision-Date: 2018-01-06 01:40+0100\n"
+"POT-Creation-Date: 2018-03-17 10:22+0000\n"
+"PO-Revision-Date: 2018-03-21 02:02+0100\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/lib/video_content.cc:448
@@ -300,7 +300,11 @@ msgstr "Geannuleerd"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan pixelformaat %1 niet verwerken tijdens %2"
 
-#: src/lib/util.cc:513
+#: src/lib/film.cc:1220
+msgid "Cannot make a KDM as this project is not encrypted."
+msgstr "Kan geen KDM maken omdat dit project niet is versleuteld."
+
+#: src/lib/util.cc:514
 msgid "Centre"
 msgstr "Midden (C)"
 
@@ -1097,11 +1101,11 @@ msgstr "De DCP heeft niet ondertitels in alle reels."
 
 #: src/lib/exceptions.cc:73
 msgid "The certificate chain for signing is invalid"
-msgstr "De certificaatketen voor ondertekening is ongeldig"
+msgstr "De certificaat-keten voor ondertekening is ongeldig"
 
 #: src/lib/exceptions.cc:79
 msgid "The certificate chain for signing is invalid (%1)"
-msgstr "De certificaatketen voor ondertekening is ongeldig (%1)"
+msgstr "De certificaat-keten voor ondertekening is ongeldig (%1)"
 
 #: src/lib/job.cc:108
 msgid ""
@@ -1307,7 +1311,18 @@ msgstr ""
 "U gebruikt 3D-content, maar uw DCP is op 2D ingesteld.  Stel de DCP in op 3D "
 "als u hem wilt afspelen op een 3D-systeem (bv. Real-D, MasterImage etc.)"
 
-#: src/lib/hints.cc:138
+#: src/lib/hints.cc:82
+msgid ""
+"You are using DCP-o-matic's stereo-to-5.1 upmixer.  This is experimental and "
+"may result in poor-quality audio.  If you continue, you should listen to the "
+"resulting DCP in a cinema to make sure that it sounds good."
+msgstr ""
+"U gebruikt de stereo naar 5.1 up-mixer van DCP-o-matic.  Deze is "
+"experimenteel en kan leiden tot audio van slechte kwaliteit.  Als u "
+"doorgaat, kunt u beter in een bioscoop naar de resulterende DCP luisteren om "
+"er zeker van te zijn dat het goed klinkt."
+
+#: src/lib/hints.cc:144
 msgid ""
 "You have %1 files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."

diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 493be53b3097788692ff2fa456dea4ecc7d049f3..856e6349b9ee132afe069810490039ab09215f6f 100644 (file)
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-01 16:50+0000\n"
-"PO-Revision-Date: 2018-02-01 02:16+0100\n"
+"POT-Creation-Date: 2018-03-17 10:22+0000\n"
+"PO-Revision-Date: 2018-03-21 02:30+0100\n"
 "Last-Translator: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language-Team: Rob van Nieuwkerk <dcpomatic-translations@berrymount.nl>\n"
 "Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.12\n"
+"X-Generator: Poedit 2.0.6\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: src/wx/subtitle_panel.cc:72 src/wx/subtitle_panel.cc:82
@@ -386,6 +386,10 @@ msgstr "Annuleer"
 msgid "Cannot reference this DCP.  "
 msgstr "Kan niet aan deze DCP refereren."
 
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Certificate chain"
+msgstr "Certificaat-keten"
+
 #: src/wx/dolby_doremi_certificate_panel.cc:204
 msgid "Certificate downloaded"
 msgstr "Certificaat gedownload"
@@ -659,6 +663,10 @@ msgstr "Vertraging"
 msgid "Details..."
 msgstr "Details..."
 
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Do nothing"
+msgstr "Doe niets"
+
 #: src/wx/download_certificate_dialog.cc:37
 msgid "Dolby / Doremi"
 msgstr "Dolby / Doremi"
@@ -1525,6 +1533,10 @@ msgstr "Rec. 709"
 msgid "Recipient certificate"
 msgstr "Ontvanger-certificaat"
 
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Recreate signing certificates"
+msgstr "Maak ondertekenings-certificaten opnieuw"
+
 #: src/wx/isdcf_metadata_dialog.cc:64
 msgid "Red band"
 msgstr "Red band"
@@ -1913,6 +1925,21 @@ msgstr "Getest door"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "De 'tot'-tijd moet na de 'van'-tijd zijn."
 
+#: src/wx/recreate_chain_dialog.cc:33
+msgid ""
+"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
+"contains a small error\n"
+"which will prevent DCPs from being validated correctly on some systems.  Do "
+"you want to re-create\n"
+"the certificate chain for signing DCPs and KDMs?"
+msgstr ""
+"De certificaat-keten die DCP-o-matic gebruikt voor het ondertekenen van "
+"DCP's en KDM's bevat\n"
+"een kleine fout die ervoor zorgt dat DCP's als incorrect worden gevalideerd "
+"op sommige systemen.\n"
+"Wilt u de certificaat-keten voor het ondertekenen van DCP's en KDM's opnieuw "
+"aanmaken?"
+
 #: src/wx/content_menu.cc:360
 msgid ""
 "The content file(s) you specified are not the same as those that are "