diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-02-25 17:39:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-02-25 17:39:25 +0000 |
| commit | 58588c485eac7c488a574fe923576f109ec0134e (patch) | |
| tree | a82a2a61cb0ff7bc6981708942ee8e4376a03904 | |
| parent | d5f0a9d288948bf23cb0f1050596482f7d0403e3 (diff) | |
| parent | 075ee0f7766c9c5bdd0ed3957d1cbac91ae11d53 (diff) | |
Merge master.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | src/lib/po/es_ES.po | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,5 +1,9 @@ 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 misrecognised frame rates in some MOV files. diff --git a/debian/changelog b/debian/changelog index 79b1f98c3..15517b1a9 100644 --- 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 bbc67542a..5cc2af307 100644 --- 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" |