Merge master.

21 files changed, 43 insertions, 33 deletions

diff --git a/ChangeLog b/ChangeLog
index 38a8ea5ce..b7e9ad74f 100644
--- 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 23b1da611..0f31a2716 100644
--- 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 1207dccef..faa7f44ed 100644
--- 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 1938ed302..04f4a350e 100644
--- 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 10455a19a..73b17d6af 100644
--- 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 84ca8d1d4..d21b7ef1b 100644
--- 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 185138bf7..db80a1347 100644
--- 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 4c8f372bd..1b46fab65 100644
--- 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 1867e3be7..42efabedd 100644
--- 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 9df59c280..b0bccdbcc 100644
--- 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 950005b60..c62f3ff20 100644
--- 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 fd972b1b9..41cde4f5a 100644
--- 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 7b886a2b7..465d32192 100644
--- 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 780535593..0495207e6 100644
--- 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 95ac054bd..901ad3179 100644
--- 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 988610221..1197fdc21 100644
--- 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 36e9a9110..b767fd2d7 100644
--- 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 744c59d1f..82a0aece6 100644
--- 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 065aa7298..5d18a5dbc 100644
--- 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 db0d72e50..3f62e4f1b 100644
--- 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 0a75bab6d..f22f1c625 100644
--- 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"