Merge.

diff --git a/ChangeLog b/ChangeLog
index 1d3ee28fa067027dbc1a5e236160be18151cd498..7fbd78e59cfa32b5d2570faa27616a04226413a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * Add subtitle view.
 
+2014-04-02  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.10 released.
+
 2014-04-01  Carl Hetherington  <cth@carlh.net>
 
        * Basic support for separate left/right-eye files or directories

diff --git a/debian/changelog b/debian/changelog
index 4891fc0a77f791bf398639b42f06ed3d940d5d2a..e012be22c8bc52678215385c453aa36b13ab3f01 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.66.9-1) UNRELEASED; urgency=low
+dcpomatic (1.66.10-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -113,8 +113,9 @@ dcpomatic (1.66.9-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Sun, 30 Mar 2014 22:00:50 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Wed, 02 Apr 2014 11:54:12 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
index 8dea6174796272083e92615694d6d9b681414c81..69a2cc916ec09127c8b34bf21c7f34688bf4168e 100644 (file)
--- a/src/wx/about_dialog.cc
+++ b/src/wx/about_dialog.cc
@@ -100,6 +100,7 @@ AboutDialog::AboutDialog (wxWindow* parent)
        translated_by.Add (wxT ("Olivier Perriere"));
        translated_by.Add (wxT ("Markus Raab"));
        translated_by.Add (wxT ("Theo Kooijmans"));
+       translated_by.Add (wxT ("Max Aeschlimann"));
        add_section (_("Translated by"), translated_by);
 
        wxArrayString artwork_by;

diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 83aad26e0e25bf0c147685dd79b0644a1096474a..e82ba62f138c6e20d72609efb97ef16d762b8935 100644 (file)
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -156,7 +156,7 @@ msgstr "Falsche Einstellung für %s (%s)"
 
 #: src/wx/video_panel.cc:120
 msgid "Bottom crop"
-msgstr "Unterkante beschneiden"
+msgstr "Unten beschneiden"
 
 #: src/wx/dir_picker_ctrl.cc:37
 msgid "Browse..."
@@ -349,7 +349,7 @@ msgstr "Standard Ordner für neue Filme"
 
 #: src/wx/config_dialog.cc:315
 msgid "Default duration of still images"
-msgstr "Satndard Länge der Standbilder"
+msgstr "Standard Länge der Standbilder"
 
 #: src/wx/config_dialog.cc:361
 #, fuzzy
@@ -428,7 +428,7 @@ msgstr "Verschlüsselt"
 
 #: src/wx/dci_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
-msgstr "Einrichtung (z.B. DXL)"
+msgstr "Hersteller (z.B. DXL)"
 
 #: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
 #: src/wx/dolby_certificate_dialog.cc:106
@@ -474,7 +474,7 @@ msgstr "Von"
 
 #: src/wx/config_dialog.cc:129
 msgid "From address for KDM emails"
-msgstr "Von Adresse für KDM Emails"
+msgstr "Absender Adresse für KDM Emails"
 
 #: src/wx/audio_mapping_view.cc:134
 msgid "Full"