Merge master.

diff --git a/ChangeLog b/ChangeLog
index ba4cf937712d7bc2bfde244fc0e68f3b5fee184d..e9607abbf1c1b7940e9b2c7621553b8346076163 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.64.16 released.
+
 2014-02-23  Carl Hetherington  <cth@carlh.net>
 
        * Bump ffmpeg library to git head to fix problems with

diff --git a/debian/changelog b/debian/changelog
index 79b1f98c35f0293e8bc48fbfb961dac51bfef0eb..15517b1a94678381321bab28bcac99a072c5cf9f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.64.15-1) UNRELEASED; urgency=low
+dcpomatic (1.64.16-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -96,8 +96,9 @@ dcpomatic (1.64.15-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Thu, 20 Feb 2014 10:10:09 +0000
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 23 Feb 2014 22:38:19 +0000
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index bbc67542a3f8e49a599aa4d9a86f8403f10576df..5cc2af3078387f56e2d2c65f29cdeb4f2fbc95c1 100644 (file)
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -193,7 +193,7 @@ msgstr "No se pudo crear la carpeta remota %1 (%2)"
 #: src/lib/job.cc:94
 #, fuzzy
 msgid "Could not open %1"
-msgstr "no se pudo abrir el fichero para lectura"
+msgstr "no se pudo abrir el fichero %1"
 
 #: src/lib/scp_dcp_job.cc:176
 msgid "Could not open %1 to send"
@@ -619,7 +619,7 @@ msgstr "no se pudo abrir el fichero para lectura"
 #: src/lib/exceptions.cc:29
 #, fuzzy
 msgid "could not open file %1"
-msgstr "no se pudo abrir el fichero para lectura"
+msgstr "no se pudo abrir el fichero %1"
 
 #: src/lib/dcp_video_frame.cc:357
 msgid "could not open file for reading"