Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

diff --git a/ChangeLog b/ChangeLog
index 8154861b220dc79c4c08e555dfae56307d36540c..61143e15a7d33105f4c873b8bbe09b7c9f1292db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2016-03-07  c.hetherington  <cth@carlh.net>
+
+       * Updated nl_NL translation from Rob van Nieuwkerk.
+
+2016-03-07  Carl Hetherington  <cth@carlh.net>
+
+       * Version 2.6.36 released.
+
 2016-03-07  Carl Hetherington  <cth@carlh.net>
 
        * Updated de_DE translation from Carsten Kurz.

diff --git a/debian/changelog b/debian/changelog
index f9c291a47f5a1db748f231e8289f4a6f183c20ff..36b81950a9bd03df6c7d49f5d9ebaa643efb0a22 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (2.6.35-1) UNRELEASED; urgency=low
+dcpomatic (2.6.36-1) UNRELEASED; urgency=low
 
   [ Carl Hetherington ]
   * New upstream release.
@@ -392,8 +392,9 @@ dcpomatic (2.6.35-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 07 Mar 2016 09:37:49 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 07 Mar 2016 13:17:59 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 699d203050c567b048d6280bc5ba5eb7517c96c9..580cdd2976db879eacebc0b3187d64a302bfdf11 100644 (file)
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-03-07 11:02+0000\n"
-"PO-Revision-Date: 2016-03-06 05:26+0100\n"
+"PO-Revision-Date: 2016-03-07 15:53+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"
@@ -358,6 +358,8 @@ msgstr "Bioscoop- en scherm-database-bestand"
 #: src/wx/content_widget.h:72
 msgid "Click the button to set all selected content to the same value."
 msgstr ""
+"Klik op de knop om alle geselecteerde content op dezelfde waarde in te "
+"stellen."
 
 #: src/wx/text_subtitle_appearance_dialog.cc:31
 msgid "Colour"
@@ -906,7 +908,7 @@ msgstr "Meedere content geselecteerd"
 
 #: src/wx/content_widget.h:64
 msgid "Multiple values"
-msgstr ""
+msgstr "Meerdere waarden"
 
 #: src/wx/dir_picker_ctrl.cc:51
 msgid "My Documents"

diff --git a/wscript b/wscript
index 75d2817158c38ae4d0b018c629471b1dd4267482..da45d2c2e86074b2e00045a8b462f4f91352ed56 100644 (file)
--- a/wscript
+++ b/wscript
@@ -26,7 +26,7 @@ import distutils.spawn
 from waflib import Logs, Context
 
 APPNAME = 'dcpomatic'
-VERSION = '2.6.35devel'
+VERSION = '2.6.36devel'
 
 def options(opt):
     opt.load('compiler_cxx')