Merge master.

diff --git a/ChangeLog b/ChangeLog
index 38a8ea5ce01a929593fb280a30e2e505f7f22552..b7e9ad74fd3c52fb23dc3f46727e1d9c542b61d8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
        * Add subtitle view.
 
+2014-05-05  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.69.0 released.
+
+2014-05-02  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.68.0 released.
+
 2014-04-29  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.67.1 released.

diff --git a/debian/changelog b/debian/changelog
index 23b1da6115b11c4a18366cba7c35a2145d9da547..0f31a27167dae0e469b4194e2c0fcaedb5f193e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.67.1-1) UNRELEASED; urgency=low
+dcpomatic (1.69.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -122,8 +122,10 @@ dcpomatic (1.67.1-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Tue, 29 Apr 2014 18:29:53 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Mon, 05 May 2014 16:41:46 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh
index 1207dccef5e2f22b189a133aeee56b51a9e47dc1..faa7f44ed41fe46d97ce00ddb61886ae769ca636 100644 (file)
--- a/platform/osx/make_dmg.sh
+++ b/platform/osx/make_dmg.sh
@@ -11,7 +11,7 @@ version=`cat wscript | egrep ^VERSION | awk '{print $3}' | sed -e "s/'//g"`
 # DMG size in megabytes
 DMG_SIZE=256
 WORK=build/platform/osx
-ENV=/Users/carl/Environments/osx
+ENV=/Users/carl/Environments/osx/10.6
 ROOT=$1
 
 appdir="DCP-o-matic.app"

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 1938ed30254c29f6f61566743de69fab1488e638..04f4a350e2ee457e1c11ea6c7e375d4589bedd3b 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-01-14 19:45+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 10455a19a50c92fdb6e1b06d5cde4d296e950020..73b17d6af8f940aaa633f9b853dda48eda4bc1e0 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+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"

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 84ca8d1d45478866e145d75691883ccc031069a5..d21b7ef1b811227d322cb684ef22fc5e3ae7509d 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-04-18 22:51+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 185138bf72bc6c4e41e1a564b018a3b2a7138a8c..db80a1347db10c9c31d0d81d183321c8589e3c9d 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"

diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 4c8f372bde7c9abc1a4b429b9776a64e0e60db05..1b46fab65ab8a24e8d0e1a1ff97bc245b8ec2965 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+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"

diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 1867e3be736bc0e1b7d72591c45b85b559337280..42efabeddcd9c506b2da24724c60d8d905eca6e4 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"

diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 9df59c280a5f6637de519ab182e16eca0c20c380..b0bccdbccfbabfe5ab74038581bbf019fb7852b6 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-01-14 19:49+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 950005b60c7307482a89b7dd97a9c72bcd04c259..c62f3ff201d6e7c4d34bd341a02a64dedd1601aa 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+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"

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index fd972b1b92644da28f8cb099064a9e194bf9db27..41cde4f5a052bd9a51d9ed801490899d633ced64 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-04-18 22:54+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"

diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 7b886a2b7555d1fe017a7a35e43fd985f18824f2..465d32192b5137f566e394a7f5716287d04a0d54 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"

diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 780535593a99d59ef0b37e86d7120f3c64f55ff1..0495207e6822840ff4ed90e188ac08d5a018c145 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+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"

diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 95ac054bdfc6c310815dd1708bce65bc6729d0a7..901ad3179fbb2315fabd75e983ba395fb2210915 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"

diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 9886102217d790c880a29646ea839cb12578691c..1197fdc2182ee560e92a9ff11436fb33ab7bb5d1 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-01-14 20:00+0100\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -870,7 +870,7 @@ msgstr "Untertitel Offset"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:148
+#: src/wx/about_dialog.cc:149
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
@@ -890,7 +890,7 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:190
+#: src/wx/about_dialog.cc:191
 #, fuzzy
 msgid "Tested by"
 msgstr "Übersetzt von"

diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 36e9a911077726a64a6edd373d90c05f2c3e7fe3..b767fd2d7207daf831089c31bf02bbc58d9c721a 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+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"
@@ -852,7 +852,7 @@ msgstr "Desplazamiento del subtítulo en Y"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:148
+#: src/wx/about_dialog.cc:149
 msgid "Supported by"
 msgstr "Soportado por"
 
@@ -872,7 +872,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:190
+#: src/wx/about_dialog.cc:191
 msgid "Tested by"
 msgstr "Comprobado por"
 

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 744c59d1f4b5be338191da6c02527df967723ec9..82a0aece6fba10bd66285a503f407af2e5b7c6ad 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-04-18 22:50+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -855,7 +855,7 @@ msgstr "Position Verticale"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:148
+#: src/wx/about_dialog.cc:149
 msgid "Supported by"
 msgstr "Soutenu par"
 
@@ -875,7 +875,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version Test"
 
-#: src/wx/about_dialog.cc:190
+#: src/wx/about_dialog.cc:191
 msgid "Tested by"
 msgstr "Testé par"
 

diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 065aa72980c2ba358f75e00060b2da9671ac871a..5d18a5dbc4c5420eb69f0b34db932a75cc886d34 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-02-03 10:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -869,7 +869,7 @@ msgstr "Spostamento Y dei Sottotitoli"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:148
+#: src/wx/about_dialog.cc:149
 msgid "Supported by"
 msgstr ""
 
@@ -890,7 +890,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:190
+#: src/wx/about_dialog.cc:191
 msgid "Tested by"
 msgstr ""
 

diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index db0d72e502bf5f34f0786bc9fd7802c1f3561213..3f62e4f1b861a4929f413aef19e45678a20c1f44 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+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"
@@ -859,7 +859,7 @@ msgstr "Ondertitel Y offset"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:148
+#: src/wx/about_dialog.cc:149
 msgid "Supported by"
 msgstr "Ondersteund door"
 
@@ -879,7 +879,7 @@ msgstr "Grondgebied (vb NL)"
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:190
+#: src/wx/about_dialog.cc:191
 msgid "Tested by"
 msgstr "Getest door"
 

diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 0a75bab6d87d1ab440932769ef2a667a1380d5ed..f22f1c6250b88d6bc5ec7b40ee66da28330067fa 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-04-29 09:14+0100\n"
+"POT-Creation-Date: 2014-05-02 22:01+0100\n"
 "PO-Revision-Date: 2014-01-19 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -878,7 +878,7 @@ msgstr "Undertext Förskjutning"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:148
+#: src/wx/about_dialog.cc:149
 msgid "Supported by"
 msgstr "Stöd från"
 
@@ -898,7 +898,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:190
+#: src/wx/about_dialog.cc:191
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"