Merge master.

diff --git a/ChangeLog b/ChangeLog
index 04eb830f5e7451aef832fbf8e2d458dd6be9e2ab..1bbaed6e5222024718f96bbe4e6c900e3625d9c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,49 @@
 
        * Add subtitle view.
 
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.16 released.
+
+2014-04-27  Carl Hetherington  <cth@carlh.net>
+
+       * Add .dpx to the list of acceptable image files.
+
+       * Slightly better handling of uncaught exceptions.
+
+       * Use our own directory picker on 14.04 (as well as 13.04 and 13.10) as
+       it appears that the same bug remains.
+
+2014-04-25  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.15 released.
+
+2014-04-25  Carl Hetherington  <cth@carlh.net>
+
+       * Fix subtitle display when the next subtitle is decoded before the previous
+       one has finished.
+
+2014-04-24  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.14 released.
+
+2014-04-23  Carl Hetherington  <cth@carlh.net>
+
+       * Version 1.66.13 released.
+
+2014-04-21  Carl Hetherington  <cth@carlh.net>
+
+       * Update to es_ES translation from Manuel AC.
+
+       * Update to fr_FR translation from Thierry Journet.
+
+2014-04-17  Carl Hetherington  <cth@carlh.net>
+
+       * Fix update of the gain control when using the gain calculator
+       dialog.
+
+       * Version 1.66.12 released.
+
 2014-04-07  Carl Hetherington  <cth@carlh.net>
 
        * Version 1.66.11 released.

diff --git a/cscript b/cscript
index c07c430310a41ad3f430e1bc60ba8d0123fefe50..890c937e6f3d15e8be71bbe7b96418fdc017a027 100644 (file)
--- a/cscript
+++ b/cscript
@@ -71,6 +71,20 @@ deb_depends['13.10'] = {'libc6': '2.17-93',
                         'libcurl3': '7.29.0-1ubuntu3',
                         'libzip2': '0.10.1-1.1'}
 
+deb_depends['14.04'] = {'libc6': '2.19-0ubuntu6',
+                        'libssh-4': '0.6.1-0ubuntu3',
+                        'libboost-filesystem1.54.0': '1.54.0-4ubuntu3',
+                        'libboost-thread1.54.0': '1.54.0-4ubuntu3',
+                        'libsndfile1': '1.0.25-7ubuntu2',
+                        'libmagick++5': '8:6.7.7.10-6ubuntu3',
+                        'libxml++2.6-2': '2.36.0-2ubuntu1',
+                        'libgtk2.0-0': '2.24.23-0ubuntu1',
+                        'libxmlsec1': '1.2.18-2ubuntu1',
+                        'libxmlsec1-openssl': '1.2.18-2ubuntu1',
+                        'libboost-date-time1.54.0': '1.54.0-4ubuntu3',
+                        'libcurl3': '7.35.0-1ubuntu2',
+                        'libzip2': '0.10.1-1.2'}
+
 deb_depends['7'] = {'libc6': '2.13',
                     'libssh-4': '0.5.4',
                     'libboost-filesystem1.49.0': '1.49.0',

diff --git a/debian/changelog b/debian/changelog
index e4c7a71e44ccdf9774cef3d78a908a30e8324ee4..f941ea6b5a55941e96380a640ef88a1e1333b0d8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.66.11-1) UNRELEASED; urgency=low
+dcpomatic (1.66.16-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -115,8 +115,13 @@ dcpomatic (1.66.11-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Mon, 07 Apr 2014 19:59:18 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Sun, 27 Apr 2014 21:46:39 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 

diff --git a/doc/manual/Makefile b/doc/manual/Makefile
index 2b2d709c97f598592d4b13646b2c8dc7cdbb8918..baf8bddc88ca718130b64848a43845334783e939 100644 (file)
--- a/doc/manual/Makefile
+++ b/doc/manual/Makefile
@@ -6,7 +6,7 @@ DIAGRAMS := file-structure.svg 3d-left-right.svg 3d-top-bottom.svg
 
 SCREENSHOTS := file-new.png video-new-film.png still-new-film.png video-select-content-file.png \
                still-select-content-file.png examine-thumbs.png examine-content.png timing-tab.png \
-               calculate-audio-gain.png \
+               calculate-audio-gain.png add-file.png dcp-tab.png \
                prefs-kdm-email.png prefs-colour-conversions.png prefs-metadata.png prefs-misc.png prefs-tms.png \
                making-dcp.png filters.png video-tab.png audio-tab.png subtitles-tab.png \
                audio-plot.png audio-map-eg1.png audio-map-eg2.png audio-map-eg3.png kdm.png

diff --git a/doc/manual/dcpomatic.xml b/doc/manual/dcpomatic.xml
index dafa67962e4ddfaee4abbc7dfa5b674d28590476..a346c69c74ee4c6e54d4bb35826030c669dd78fc 100644 (file)
--- a/doc/manual/dcpomatic.xml
+++ b/doc/manual/dcpomatic.xml
@@ -108,9 +108,8 @@ like to install it.
 
 <para>
 You can install DCP-o-matic on Ubuntu 12.04 (&lsquo;Precise
-Pangolin&rsquo;), 12.10 (&lsquo;Quantal Quetzal&rsquo;), 13.04
-(&lsquo;Raring Ringtail&rsquo;) or 13.10 (&lsquo;Saucy
-Salamander&rsquo;) using <code>.deb</code> packages: download the
+Pangolin&rsquo;), 12.10 (&lsquo;Quantal Quetzal&rsquo;), 13.10 (&lsquo;Saucy
+Salamander&rsquo;) or 14.04 (&lsquo;Trusty Tahr&rsquo;) using <code>.deb</code> packages: download the
 appropriate package from <ulink
 url="http://dcpomatic.com/">http://dcpomatic.com/</ulink> and
 double-click it.  Ubuntu will install the necessary bits and pieces
@@ -122,7 +121,15 @@ and set DCP-o-matic up for you.
 <section>
 <title>Debian Linux</title>
 <para>
-Packages are also available for Debian 7 (squeeze) from <ulink
+Packages are available for Debian 7 (squeeze) from <ulink
+url="http://dcpomatic.com/">http://dcpomatic.com/</ulink>.
+</para>
+</section>
+
+<section>
+<title>Centos Linux</title>
+<para>
+Packages are available for Centos 6.5 from <ulink
 url="http://dcpomatic.com/">http://dcpomatic.com/</ulink>.
 </para>
 </section>

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index d7b37a8353fa5f04b63c58006a2a6c8eade95a1f..56c83d3f740c3343903ec6f02ed517681fc69a3d 100644 (file)
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -44,7 +44,11 @@ ImageContent::ImageContent (shared_ptr<const Film> f, boost::filesystem::path p)
                                _paths.push_back (i->path ());
                        }
                }
-               
+
+               if (_paths.empty()) {
+                       throw FileError (_("No valid image files were found in the folder."), p);
+               }
+                               
                sort (_paths.begin(), _paths.end());
        }
 }

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 3639e52830ed9fa585f62cbd9a66df8f80891cee..c6a6b90a808fcdd234c053ce1c21a31d3128d3eb 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -110,7 +110,7 @@ Job::run_wrapper ()
 
                set_error (
                        e.what (),
-                       _("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
+                       _("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
                        );
 
                set_progress (1);
@@ -120,7 +120,7 @@ Job::run_wrapper ()
 
                set_error (
                        _("Unknown error"),
-                       _("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
+                       _("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
                        );
 
                set_progress (1);

diff --git a/src/lib/piece.h b/src/lib/piece.h
new file mode 100644 (file)
index 0000000..9764093
--- /dev/null
+++ b/src/lib/piece.h
@@ -0,0 +1,43 @@
+/*
+    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef DCPOMATIC_PIECE_H
+#define DCPOMATIC_PIECE_H
+
+#include "types.h"
+#include "video_content.h"
+
+class Content;
+class Decoder;
+
+class Piece
+{
+public:
+       Piece (boost::shared_ptr<Content> c, boost::shared_ptr<Decoder> d, FrameRateChange f)
+               : content (c)
+               , decoder (d)
+               , frc (f)
+       {}
+       
+       boost::shared_ptr<Content> content;
+       boost::shared_ptr<Decoder> decoder;
+       FrameRateChange frc;
+};
+
+#endif

diff --git a/src/lib/player.h b/src/lib/player.h
index d83045ab12a6b8e84478be51188111240095f971..62ba89e6c6e783c2603a390f41d43d1583c079af 100644 (file)
--- a/src/lib/player.h
+++ b/src/lib/player.h
@@ -31,6 +31,7 @@
 #include "dcpomatic_time.h"
 #include "content_subtitle.h"
 #include "position_image.h"
+#include "piece.h"
 
 class Job;
 class Film;
@@ -73,18 +74,26 @@ public:
        void dump (boost::shared_ptr<Log>) const;
 };
 
-class Piece
+/** A wrapper for an Image which contains some pending operations; these may
+ *  not be necessary if the receiver of the PlayerImage throws it away.
+ */
+class PlayerImage
 {
 public:
-       Piece (boost::shared_ptr<Content> c, boost::shared_ptr<Decoder> d, FrameRateChange f)
-               : content (c)
-               , decoder (d)
-               , frc (f)
-       {}
-
-       boost::shared_ptr<Content> content;
-       boost::shared_ptr<Decoder> decoder;
-       FrameRateChange frc;
+       PlayerImage (boost::shared_ptr<const Image>, Crop, dcp::Size, dcp::Size, Scaler const *);
+
+       void set_subtitle (boost::shared_ptr<const Image>, Position<int>);
+       
+       boost::shared_ptr<Image> image ();
+       
+private:
+       boost::shared_ptr<const Image> _in;
+       Crop _crop;
+       dcp::Size _inter_size;
+       dcp::Size _out_size;
+       Scaler const * _scaler;
+       boost::shared_ptr<const Image> _subtitle_image;
+       Position<int> _subtitle_position;
 };
 
 /** @class Player

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 5144bbb0f8f9d241f7aad8de5c45de389a8b206a..337185c5f81f006201cc892c97e6b08abe9333d3 100644 (file)
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -8,35 +8,34 @@ msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-31 16:10+0100\n"
-"PO-Revision-Date: 2013-11-09 03:09-0500\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"
-"Language: es-ES\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: src/lib/sndfile_content.cc:62
 msgid "%1 [audio]"
-msgstr ""
+msgstr "%1 [audio]"
 
 #: src/lib/ffmpeg_content.cc:207
 msgid "%1 [movie]"
-msgstr ""
+msgstr "%1 [película]"
 
 #: src/lib/sndfile_content.cc:83
 msgid "%1 channels, %2kHz, %3 samples"
-msgstr ""
+msgstr "%1 canales, %2kHz, %3 muestras"
 
 #: src/lib/ffmpeg_content.cc:242
-#, fuzzy
 msgid "%1 frames; %2 frames per second"
-msgstr "fotogramas por segundo"
+msgstr "%1 imágenes; %2 imágenes per second"
 
 #: src/lib/video_content.cc:205
 msgid "%1x%2 pixels (%3:1)"
-msgstr ""
+msgstr "%1x%2 pixels (%3:1)"
 
 #: src/lib/ratio.cc:35
 msgid "1.19"
@@ -60,7 +59,7 @@ msgstr "reducción de ruido 3D"
 
 #: src/lib/ratio.cc:36
 msgid "4:3"
-msgstr ""
+msgstr "4:3"
 
 #: src/lib/ratio.cc:37
 msgid "Academy"
@@ -75,9 +74,8 @@ msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
 #: src/lib/analyse_audio_job.cc:48
-#, fuzzy
 msgid "Analyse audio"
-msgstr "Analizar audio de %1"
+msgstr "Analizar audio"
 
 #: src/lib/scaler.cc:64
 msgid "Area"
@@ -105,79 +103,77 @@ msgstr "Centro"
 
 #: src/lib/writer.cc:77
 msgid "Checking existing image data"
-msgstr ""
+msgstr "Comprobando las imágenes existentes"
 
 #: src/lib/writer.cc:460
 msgid "Computing audio digest"
-msgstr ""
+msgstr "Calculando la firma resumen del audio"
 
 #: src/lib/image_content.cc:100
 msgid "Computing digest"
-msgstr ""
+msgstr "Calculando la firma resumen"
 
 #: src/lib/writer.cc:456
 msgid "Computing image digest"
-msgstr ""
+msgstr "Calculando la firma resumen de imagen"
 
 #: src/lib/util.cc:838
-#, fuzzy
 msgid "Content and DCP have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
 #: src/lib/audio_content.cc:82
 msgid "Content to be joined must have the same audio delay."
-msgstr ""
+msgstr "Para unir contenido debe tener el mismo retardo de audio."
 
 #: src/lib/audio_content.cc:78
 msgid "Content to be joined must have the same audio gain."
-msgstr ""
+msgstr "Para unir contenido debe tener la misma ganancia de audio."
 
 #: src/lib/video_content.cc:140
 msgid "Content to be joined must have the same colour conversion."
-msgstr ""
+msgstr "Para unir contenido debe tener la misma conversión de color."
 
 #: src/lib/video_content.cc:132
 msgid "Content to be joined must have the same crop."
-msgstr ""
+msgstr "Para unir contenido debe tener el mismo recorte."
 
 #: src/lib/video_content.cc:120
 msgid "Content to be joined must have the same picture size."
-msgstr ""
+msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
 #: src/lib/video_content.cc:136
-#, fuzzy
 msgid "Content to be joined must have the same scale setting."
-msgstr "La fuente y el DCP tienen la misma velocidad."
+msgstr "Para unir contenido debe tener la misma redimensión."
 
 #: src/lib/subtitle_content.cc:74
-#, fuzzy
 msgid "Content to be joined must have the same subtitle X offset."
-msgstr "La fuente y el DCP tienen la misma velocidad."
+msgstr ""
+"Para unir contenido debe tener el mismo desplazamiento de subtítulo en X."
 
 #: src/lib/subtitle_content.cc:78
-#, fuzzy
 msgid "Content to be joined must have the same subtitle Y offset."
-msgstr "La fuente y el DCP tienen la misma velocidad."
+msgstr ""
+"Para unir contenido debe tener el mismo desplazamiento de subtítulo en Y."
 
 #: src/lib/subtitle_content.cc:82
 msgid "Content to be joined must have the same subtitle scale."
-msgstr ""
+msgstr "Para unir contenido debe tener el mismo tamaño de subtítulo."
 
 #: src/lib/video_content.cc:124
 msgid "Content to be joined must have the same video frame rate."
-msgstr ""
+msgstr "Para unir contenido debe tener la misma velocidad de imagen."
 
 #: src/lib/video_content.cc:128
 msgid "Content to be joined must have the same video frame type."
-msgstr ""
+msgstr "Para unir contenido debe tener el mismo tamaño de imagen."
 
 #: src/lib/ffmpeg_content.cc:112
 msgid "Content to be joined must use the same audio stream."
-msgstr ""
+msgstr "Para unir contenido debe usar el mismo tipo de audio."
 
 #: src/lib/ffmpeg_content.cc:108
 msgid "Content to be joined must use the same subtitle stream."
-msgstr ""
+msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
 
 #: src/lib/scp_dcp_job.cc:110
 msgid "Copy DCP to TMS"
@@ -192,18 +188,16 @@ msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
 #: src/lib/job.cc:90
-#, fuzzy
 msgid "Could not open %1"
-msgstr "no se pudo abrir el fichero %1"
+msgstr "No se pudo abrir %1"
 
 #: src/lib/scp_dcp_job.cc:182
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
 #: src/lib/internet.cc:72
-#, fuzzy
 msgid "Could not open downloaded ZIP file"
-msgstr "no se pudo abrir el fichero %1"
+msgstr "No se puedo abrir el fichero ZIP descargado"
 
 #: src/lib/film.cc:990
 msgid "Could not read DCP to make KDM for"
@@ -218,14 +212,12 @@ msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
 #: src/lib/util.cc:850
-#, fuzzy
 msgid "DCP will run at %1%% of the content speed.\n"
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 
 #: src/lib/util.cc:841
-#, fuzzy
 msgid "DCP will use every other frame of the content.\n"
-msgstr "El DCP usará fotogramas alternos de la fuente.\n"
+msgstr "El DCP usará imágenes alternas de la fuente.\n"
 
 #: src/lib/job.cc:91
 msgid ""
@@ -238,7 +230,7 @@ msgstr ""
 #: src/lib/ffmpeg_content.cc:89
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
-msgstr ""
+msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
 
 #: src/lib/filter.cc:65 src/lib/filter.cc:66 src/lib/filter.cc:67
 msgid "De-interlacing"
@@ -255,33 +247,38 @@ msgid ""
 "Best regards,\n"
 "DCP-o-matic"
 msgstr ""
+"Estimado proyeccionista\n"
+"\n"
+"Adjuntas encontrará las llaves KDM para $CPL_NAME.\n"
+"\n"
+"Estas llaves KDM son válidas desde $START_TIME hasta $END_TIME.\n"
+"\n"
+"Atentamente,\n"
+"DCP-o-matic"
 
 #: src/lib/dolby_cp750.cc:27
-#, fuzzy
 msgid "Dolby CP650 and CP750"
-msgstr "Dolby CP750"
+msgstr "Dolby CP650 and CP750"
 
 #: src/lib/internet.cc:65
 msgid "Download failed (%1/%2 error %3)"
-msgstr ""
+msgstr "Descarga fallida (%1/%2 error %3)"
 
 #: src/lib/util.cc:843
-#, fuzzy
 msgid "Each content frame will be doubled in the DCP.\n"
-msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
+msgstr "Se doblará cada imagen en el DCP.\n"
 
 #: src/lib/util.cc:845
-#, fuzzy
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
-msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
+msgstr "Cada imagen será repetida otras %1 veces en el DCP.\n"
 
 #: src/lib/send_kdm_email_job.cc:50
 msgid "Email KDMs for %1"
-msgstr ""
+msgstr "Enviar por email las KDM para %1"
 
 #: src/lib/writer.cc:120
 msgid "Encoding image data"
-msgstr ""
+msgstr "Codificando imagen"
 
 #: src/lib/job.cc:320
 msgid "Error (%1)"
@@ -309,7 +306,7 @@ msgstr "Flat"
 
 #: src/lib/ratio.cc:43
 msgid "Full frame"
-msgstr ""
+msgstr "Frame completo"
 
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
@@ -321,7 +318,7 @@ msgstr "Gradient debander"
 
 #: src/lib/util.cc:806
 msgid "Hearing impaired"
-msgstr ""
+msgstr "Sordos"
 
 #: src/lib/filter.cc:71
 msgid "High quality 3D denoiser"
@@ -349,12 +346,11 @@ msgstr "Izquierda"
 
 #: src/lib/util.cc:808
 msgid "Left centre"
-msgstr ""
+msgstr "Centro izquierda"
 
 #: src/lib/util.cc:810
-#, fuzzy
 msgid "Left rear surround"
-msgstr "Surround izquierda"
+msgstr "Surround trasero izquierda"
 
 #: src/lib/util.cc:804
 msgid "Left surround"
@@ -362,7 +358,7 @@ msgstr "Surround izquierda"
 
 #: src/lib/util.cc:803
 msgid "Lfe (sub)"
-msgstr ""
+msgstr "Lfe (bajos)"
 
 #: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:72
 msgid "Misc"
@@ -374,12 +370,11 @@ msgstr "Motion compensating deinterlacer"
 
 #: src/lib/video_content.cc:447
 msgid "No scale"
-msgstr ""
+msgstr "No redimensionar"
 
 #: src/lib/video_content.cc:444
-#, fuzzy
 msgid "No stretch"
-msgstr "Flat sin deformación"
+msgstr "Sin deformación"
 
 #: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:73
 msgid "Noise reduction"
@@ -392,14 +387,15 @@ msgstr "OK (ejecución %1)"
 #: src/lib/content.cc:100
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr ""
+"Solo la primera pieza a ser unida puede tener un recorte en su comienzo."
 
 #: src/lib/content.cc:104
 msgid "Only the last piece of content to be joined can have an end trim."
-msgstr ""
+msgstr "Solo la última pieza a ser unida puede tener un recorte en su final."
 
 #: src/lib/job.cc:103
 msgid "Out of memory"
-msgstr ""
+msgstr "Falta de memoria"
 
 #: src/lib/filter.cc:73
 msgid "Overcomplete wavelet denoiser"
@@ -418,9 +414,8 @@ msgid "Rating"
 msgstr "Clasificación"
 
 #: src/lib/config.cc:84 src/lib/config.cc:168
-#, fuzzy
 msgid "Rec. 709"
-msgstr "Rec 709"
+msgstr "Rec. 709"
 
 #: src/lib/util.cc:801
 msgid "Right"
@@ -428,12 +423,11 @@ msgstr "Derecha"
 
 #: src/lib/util.cc:809
 msgid "Right centre"
-msgstr ""
+msgstr "Centro derecha"
 
 #: src/lib/util.cc:811
-#, fuzzy
 msgid "Right rear surround"
-msgstr "Surround derecha"
+msgstr "Surround trasero derecha"
 
 #: src/lib/util.cc:805
 msgid "Right surround"
@@ -481,15 +475,14 @@ msgstr ""
 
 #: src/lib/job.cc:103
 msgid "There was not enough memory to do this."
-msgstr ""
+msgstr "No hubo suficiente memoria para hacer esto."
 
 #: src/lib/film.cc:406
-#, fuzzy
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
 msgstr ""
-"Esta película se creó con una versión antigua de DCP-o-matic, y "
+"Esta película se creó con una versión más reciente de DCP-o-matic, y "
 "desgraciadamente no s puede cargar. Necesitas crear una nueva película, "
 "volver a añadir y configurar ton contenido. ¡Lo siento!"
 
@@ -517,7 +510,7 @@ msgstr "Transitional"
 
 #: src/lib/internet.cc:77
 msgid "Unexpected ZIP file contents"
-msgstr ""
+msgstr "Contenidos inesperados del fichero ZIP"
 
 #: src/lib/job.cc:120
 msgid "Unknown error"
@@ -537,7 +530,7 @@ msgstr "Sin título"
 
 #: src/lib/util.cc:807
 msgid "Visually impaired"
-msgstr ""
+msgstr "Ciegos"
 
 #: src/lib/scp_dcp_job.cc:102
 msgid "Waiting"
@@ -557,12 +550,11 @@ msgstr "Tienes que añadir contenido al DCP antes de crearlo."
 
 #: src/lib/image_content.cc:68
 msgid "[moving images]"
-msgstr ""
+msgstr "[imágenes en movimiento]"
 
 #: src/lib/image_content.cc:66
-#, fuzzy
 msgid "[still]"
-msgstr "imagen fija"
+msgstr "[imagen fija]"
 
 #: src/lib/film.cc:247
 msgid "cannot contain slashes"
@@ -577,9 +569,8 @@ msgid "connecting"
 msgstr "conectando"
 
 #: src/lib/film.cc:295
-#, fuzzy
 msgid "container"
-msgstr "contenido"
+msgstr "continente"
 
 #: src/lib/film.cc:303
 msgid "content type"
@@ -590,9 +581,8 @@ msgid "copying %1"
 msgstr "copiando %1"
 
 #: src/lib/exceptions.cc:36
-#, fuzzy
 msgid "could not create file %1"
-msgstr "No se pudo escribir el fichero remoto (%1)"
+msgstr "No se pudo crear el fichero (%1)"
 
 #: src/lib/ffmpeg.cc:176
 msgid "could not find audio decoder"
@@ -608,15 +598,13 @@ msgstr "no se pudo encontrar decodificador de vídeo"
 
 #: src/lib/writer.cc:424
 msgid "could not move audio MXF into the DCP (%1)"
-msgstr ""
+msgstr "no s puedo mover el audio MXF en el DCP (%1)"
 
 #: src/lib/sndfile_decoder.cc:56
-#, fuzzy
 msgid "could not open audio file for reading"
-msgstr "no se pudo abrir el fichero para lectura"
+msgstr "no se pudo abrir el fichero de audio para lectura"
 
 #: src/lib/exceptions.cc:29
-#, fuzzy
 msgid "could not open file %1"
 msgstr "no se pudo abrir el fichero %1"
 
@@ -625,21 +613,18 @@ msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
 #: src/lib/dcp_video_frame.cc:358
-#, fuzzy
 msgid "could not read encoded data"
-msgstr "no se encontró el decodificador de audio"
+msgstr "no se pudo leer la información codificada"
 
 #: src/lib/exceptions.cc:42
-#, fuzzy
 msgid "could not read from file %1 (%2)"
-msgstr "No se pudo crear la carpeta remota %1 (%2)"
+msgstr "No se pudo leer del fichero %1 (%2)"
 
 #: src/lib/resampler.cc:102
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
 #: src/lib/resampler.cc:83
-#, fuzzy
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
@@ -652,29 +637,28 @@ msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
 #: src/lib/exceptions.cc:48
-#, fuzzy
 msgid "could not write to file %1 (%2)"
-msgstr "No se pudo escribir el fichero remoto (%1)"
+msgstr "No se pudo escribir en el fichero (%1)"
 
 #: src/lib/util.cc:601
 msgid "error during async_accept (%1)"
-msgstr ""
+msgstr "error durante async_accept (%1)"
 
 #: src/lib/util.cc:577
 msgid "error during async_connect (%1)"
-msgstr ""
+msgstr "error durante async_connect (%1)"
 
 #: src/lib/util.cc:650
 msgid "error during async_read (%1)"
-msgstr ""
+msgstr "error durante async_read (%1)"
 
 #: src/lib/util.cc:622
 msgid "error during async_write (%1)"
-msgstr ""
+msgstr "error durante async_write (%1)"
 
 #: src/lib/transcode_job.cc:100
 msgid "frames per second"
-msgstr "fotogramas por segundo"
+msgstr "imágenes por segundo"
 
 #: src/lib/util.cc:152
 msgid "hour"
@@ -702,7 +686,7 @@ msgstr "falta una configuración obligatoria %1"
 
 #: src/lib/image_content.cc:83
 msgid "moving"
-msgstr ""
+msgstr "moviendo"
 
 #: src/lib/ffmpeg_decoder.cc:575
 msgid "multi-part subtitles not yet supported"
@@ -735,14 +719,12 @@ msgid "seconds"
 msgstr "segundos"
 
 #: src/lib/image_content.cc:81
-#, fuzzy
 msgid "still"
 msgstr "imagen fija"
 
 #: src/lib/ffmpeg_examiner.cc:168
-#, fuzzy
 msgid "unknown"
-msgstr "Error desconocido"
+msgstr "desconocido"
 
 #~ msgid "Cubic interpolating deinterlacer"
 #~ msgstr "Desentrelazado por interpolación cúbica"

diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index b96ca580df73b59fc47e7cf9dfe545e1d563ef38..b88099016893a6d73386bfddce326fc17ee48c86 100644 (file)
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-31 16:10+0100\n"
-"PO-Revision-Date: 2014-04-06 03:02+0100\n"
+"PO-Revision-Date: 2014-04-18 22:51+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 40e9d9c2eed730795a8f8476533ae16290c403c0..c23deb59e2f46ddb9f2021442e9e7b4d4df264de 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -785,7 +785,7 @@ valid_image_file (boost::filesystem::path f)
 {
        string ext = f.extension().string();
        transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-       return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga");
+       return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx");
 }
 
 string

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 2f64371aebcc11c50e7561222292d879f815f15d..1abd2519853b120f15369c20540fd0e39c6cdcc3 100644 (file)
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -733,6 +733,17 @@ class App : public wxApp
                return true;
        }
 
+       bool OnExceptionInMainLoop ()
+       {
+               error_dialog (0, _("An unknown exception occurred.  Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+               return false;
+       }
+               
+       void OnUnhandledException ()
+       {
+               error_dialog (0, _("An unknown exception occurred.  Please report this problem to the DCP-o-matic author (carl@dcpomatic.com)."));
+       }
+
        void idle ()
        {
                ui_signaller->ui_idle ();

diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 3b5c01d2bfc30bb25ae96e79c47c9ca5b953cc21..e26a8221c26f03b5d87158a8a9700181fffec80e 100644 (file)
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-31 16:10+0100\n"
-"PO-Revision-Date: 2013-11-09 02:47-0500\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"
-"Language: es-ES\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: src/tools/dcpomatic.cc:396
 msgid "%1 already exists as a file, so you cannot use it for a new film."
@@ -23,7 +23,7 @@ msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
 
 #: src/tools/dcpomatic_batch.cc:49
 msgid "&Add Film..."
-msgstr ""
+msgstr "&Añadir película..."
 
 #: src/tools/dcpomatic.cc:270
 msgid "&Edit"
@@ -75,7 +75,7 @@ msgstr "&Enviar DCP al TMS"
 
 #: src/tools/dcpomatic.cc:273
 msgid "&Tools"
-msgstr ""
+msgstr "&Herramientas"
 
 #: src/tools/dcpomatic_batch.cc:146
 msgid ""
@@ -88,24 +88,22 @@ msgid "About"
 msgstr "Acerca de"
 
 #: src/tools/dcpomatic.cc:263
-#, fuzzy
 msgid "About DCP-o-matic"
-msgstr "DVD-o-matic"
+msgstr "Acerca de DVD-o-matic"
 
 #: src/tools/dcpomatic_batch.cc:84
 msgid "Add Film..."
-msgstr ""
+msgstr "Añadir película..."
 
 #: src/tools/dcpomatic.cc:508
 msgid "An unknown exeception occurred."
-msgstr ""
+msgstr "Ha ocurrido un error desconocido."
 
 #: src/tools/dcpomatic.cc:259
 msgid "Check for updates"
-msgstr ""
+msgstr "Buscar actualizaciones"
 
 #: src/tools/dcpomatic.cc:663 src/tools/dcpomatic_batch.cc:255
-#, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
@@ -120,7 +118,7 @@ msgstr "No se pudo mostrar el DCP (no se pudo ejecutar konqueror)"
 
 #: src/tools/dcpomatic.cc:531
 msgid "Could not show DCP (could not run nautilus)"
-msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilus)"
+msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilos)"
 
 #: src/tools/dcpomatic.cc:367 src/tools/dcpomatic.cc:623
 #: src/tools/dcpomatic.cc:678
@@ -129,11 +127,11 @@ msgstr "DCP-o-matic"
 
 #: src/tools/dcpomatic_batch.cc:139 src/tools/dcpomatic_batch.cc:240
 msgid "DCP-o-matic Batch Converter"
-msgstr ""
+msgstr "Convertidor por lotes DCP-o-matic"
 
 #: src/tools/dcpomatic.cc:258
 msgid "Encoding servers..."
-msgstr ""
+msgstr "Servidores de codificación..."
 
 #: src/tools/dcpomatic.cc:95
 msgid "Film changed"
@@ -142,12 +140,12 @@ msgstr "Película cambiada"
 #: src/tools/dcpomatic_batch.cc:145
 msgid "Free, open-source DCP generation from almost anything."
 msgstr ""
-"Generación de DCP a partir de casi cualquier fuente, libre y de código "
-"abierto."
+"Generación libre y de código abierto de DCP a partir de casi cualquier "
+"fuente."
 
 #: src/tools/dcpomatic.cc:257
 msgid "Hints..."
-msgstr ""
+msgstr "Pistas..."
 
 #: src/tools/dcpomatic.cc:252
 msgid "Make &KDMs..."
@@ -176,10 +174,13 @@ msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
 "using only has %.1f Gb available.  Do you want to continue anyway?"
 msgstr ""
+"El DCP de esta película usará aproximadamente %.1f Gb, y el disco "
+"seleccionado solo tiene %.1f Gb disponibles.  Quieres continuar de todas "
+"formas?"
 
 #: src/tools/dcpomatic.cc:771
 msgid "The DCP-o-matic download server could not be contacted."
-msgstr ""
+msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
 
 #: src/tools/dcpomatic.cc:386
 msgid ""
@@ -190,7 +191,7 @@ msgstr ""
 
 #: src/tools/dcpomatic.cc:766
 msgid "There are no new versions of DCP-o-matic available."
-msgstr ""
+msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
 
 #: src/tools/dcpomatic.cc:583 src/tools/dcpomatic_batch.cc:104
 msgid "There are unfinished jobs; are you sure you want to quit?"
@@ -201,6 +202,9 @@ msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
 msgstr ""
+"Este proyecto se creó con una versión antigua de DVD-o-matic y puede que no "
+"cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
+"opciones."
 
 #: src/tools/dcpomatic.cc:584 src/tools/dcpomatic_batch.cc:105
 msgid "Unfinished jobs"

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 91c0ef78ed587cb359563eda3ffad596e1011e87..b573e5b7d6d329249e70374d7734b8696de2f6c3 100644 (file)
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-31 16:10+0100\n"
-"PO-Revision-Date: 2014-04-06 03:07+0100\n"
+"PO-Revision-Date: 2014-04-18 22:54+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"

diff --git a/src/wx/audio_panel.cc b/src/wx/audio_panel.cc
index 0838fa8abb9a7a9241470db621091a3297169d1a..1c679d336c003fc7404f64ddff9b55cc88d46eec 100644 (file)
--- a/src/wx/audio_panel.cc
+++ b/src/wx/audio_panel.cc
@@ -166,7 +166,7 @@ AudioPanel::gain_calculate_button_clicked ()
        /* This appears to be necessary, as the change is not signalled,
           I think.
        */
-       _gain->update_from_model ();
+       _gain->view_changed ();
        
        d->Destroy ();
 }

diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index 7fa34c516c60875e0208b0f907adf6d332078b94..2cf6a0b6ccc6847a627bfeb63a848a8e407d6ab8 100644 (file)
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -803,11 +803,16 @@ FilmEditor::content_add_folder_clicked ()
                return;
        }
 
-       _film->examine_and_add_content (
-               shared_ptr<ImageContent> (
-                       new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ())))
-                       )
-               );
+       shared_ptr<ImageContent> ic;
+       
+       try {
+               ic.reset (new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ()))));
+       } catch (FileError& e) {
+               error_dialog (this, std_to_wx (e.what ()));
+               return;
+       }
+
+       _film->examine_and_add_content (ic);
 }
 
 void

diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 3b8632ed40a1baf7eedeb7e2204b8c936068bab2..bc457f992c7ff61afb10804230a649248c0cc980 100644 (file)
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-31 16:10+0100\n"
-"PO-Revision-Date: 2013-11-09 03:00-0500\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"
-"Language: es-ES\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"X-Generator: Poedit 1.6.4\n"
 
 #: src/wx/subtitle_panel.cc:48 src/wx/subtitle_panel.cc:57
 #: src/wx/subtitle_panel.cc:66
@@ -23,7 +23,6 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/about_dialog.cc:78
-#, fuzzy
 msgid ""
 "(C) 2012-2014 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
 msgstr ""
@@ -31,7 +30,7 @@ msgstr ""
 
 #: src/wx/config_dialog.cc:125
 msgid "(password will be stored on disk in plaintext)"
-msgstr ""
+msgstr "(claves guardadas como texto plano en el disco)"
 
 #: src/wx/config_dialog.cc:98
 msgid "(restart DCP-o-matic to see language changes)"
@@ -39,11 +38,11 @@ msgstr "(reinicia DCP-o-matic para ver el cambio de idioma)"
 
 #: src/wx/audio_mapping_view.cc:135
 msgid "-3dB"
-msgstr ""
+msgstr "-3dB"
 
 #: src/wx/colour_conversion_editor.cc:83
 msgid "1 / "
-msgstr ""
+msgstr "1 / "
 
 #: src/wx/audio_panel.cc:236
 msgid "1 channel"
@@ -51,19 +50,19 @@ msgstr "1 canal"
 
 #: src/wx/video_panel.cc:196
 msgid "2D"
-msgstr ""
+msgstr "2D"
 
 #: src/wx/film_editor.cc:220
 msgid "2K"
-msgstr ""
+msgstr "2K"
 
 #: src/wx/film_editor.cc:168
 msgid "3D"
-msgstr ""
+msgstr "3D"
 
 #: src/wx/video_panel.cc:199
 msgid "3D alternate"
-msgstr ""
+msgstr "3D alterno"
 
 #: src/wx/video_panel.cc:197
 msgid "3D left/right"
@@ -71,20 +70,19 @@ msgstr "3D izquierda/derecha"
 
 #: src/wx/video_panel.cc:198
 msgid "3D top/bottom"
-msgstr ""
+msgstr "3D arriba/abajo"
 
 #: src/wx/film_editor.cc:221
 msgid "4K"
-msgstr ""
+msgstr "4K"
 
 #: src/wx/update_dialog.cc:34
 msgid "A new version of DCP-o-matic is available."
-msgstr ""
+msgstr "Una nueva versión de DCP-o-matic está disponible."
 
 #: src/wx/about_dialog.cc:30
-#, fuzzy
 msgid "About DCP-o-matic"
-msgstr "DCP-o-matic"
+msgstr "Acerca de DCP-o-matic"
 
 #: src/wx/kdm_dialog.cc:66
 msgid "Add Cinema..."
@@ -104,11 +102,11 @@ msgstr "Añadir carpeta..."
 
 #: src/wx/editable_list.h:62
 msgid "Add..."
-msgstr ""
+msgstr "Añadir..."
 
 #: src/wx/about_dialog.cc:107
 msgid "Artwork by"
-msgstr ""
+msgstr "Grafismo de"
 
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
@@ -127,27 +125,25 @@ msgid "Audio Language (e.g. EN)"
 msgstr "Idioma del audio (ej. ES)"
 
 #: src/wx/audio_panel.cc:81
-#, fuzzy
 msgid "Audio Stream"
-msgstr "Retardo del audio"
+msgstr "Flujo de audio"
 
 #: src/wx/film_editor.cc:163
-#, fuzzy
 msgid "Audio channels"
-msgstr "canales"
+msgstr "Canales de audio"
 
 #: src/wx/audio_mapping_view.cc:353
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
-msgstr ""
+msgstr "El audio del canal %d pasará al canal %d del DCP sin modificar."
 
 #: src/wx/audio_mapping_view.cc:356
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
 "%.1fdB."
-msgstr ""
+msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB."
 
 #: src/wx/job_wrapper.cc:38
 #, c-format
@@ -164,11 +160,11 @@ msgstr "Explorar..."
 
 #: src/wx/audio_mapping_view.cc:320
 msgid "BsL"
-msgstr ""
+msgstr "BsL"
 
 #: src/wx/audio_mapping_view.cc:324
 msgid "BsR"
-msgstr ""
+msgstr "BsR"
 
 #: src/wx/gain_calculator_dialog.cc:32
 msgid "But I have to use fader"
@@ -176,7 +172,7 @@ msgstr "pero tengo que usar el fader a"
 
 #: src/wx/audio_mapping_view.cc:288
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: src/wx/audio_panel.cc:63
 msgid "Calculate..."
@@ -187,20 +183,17 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: src/wx/screen_dialog.cc:44
-#, fuzzy
 msgid "Certificate"
-msgstr "Seleccionar fichero de contenido"
+msgstr "Certificado"
 
 #: src/wx/dolby_certificate_dialog.cc:157
 #: src/wx/doremi_certificate_dialog.cc:67
-#, fuzzy
 msgid "Certificate downloaded"
-msgstr "Seleccionar fichero de contenido"
+msgstr "Certificado descargado"
 
 #: src/wx/audio_gain_dialog.cc:26
-#, fuzzy
 msgid "Channel gain"
-msgstr "Canales"
+msgstr "Ganancia del canal"
 
 #: src/wx/audio_dialog.cc:44
 msgid "Channels"
@@ -208,33 +201,29 @@ msgstr "Canales"
 
 #: src/wx/config_dialog.cc:137
 msgid "Check for testing updates as well as stable ones"
-msgstr ""
+msgstr "Buscar actualizaciones de prueba y estables"
 
 #: src/wx/config_dialog.cc:133
 msgid "Check for updates on startup"
-msgstr ""
+msgstr "Buscar actualizaciones al iniciar"
 
 #: src/wx/content_menu.cc:182
-#, fuzzy
 msgid "Choose a file"
-msgstr "Crear en carpeta"
+msgstr "Elige un fichero"
 
 #: src/wx/film_editor.cc:775
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
 #: src/wx/content_menu.cc:175 src/wx/film_editor.cc:798
-#, fuzzy
 msgid "Choose a folder"
-msgstr "Crear en carpeta"
+msgstr "Elige una carpeta"
 
 #: src/wx/dolby_certificate_dialog.cc:43
-#, fuzzy
 msgid "Cinema"
-msgstr "Añadir cine..."
+msgstr "Cine"
 
 #: src/wx/config_dialog.cc:561
-#, fuzzy
 msgid "Colour Conversions"
 msgstr "Conversiones de color"
 
@@ -244,9 +233,8 @@ msgid "Colour conversion"
 msgstr "Conversión de color"
 
 #: src/wx/film_editor.cc:134
-#, fuzzy
 msgid "Container"
-msgstr "Contenido"
+msgstr "Continente"
 
 #: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
 msgid "Content"
@@ -262,9 +250,8 @@ msgid "Content frame rate %.4f\n"
 msgstr "Velocidad del contenido %.4f\n"
 
 #: src/wx/dci_metadata_dialog.cc:32
-#, fuzzy
 msgid "Content version"
-msgstr "Tipo de contenido"
+msgstr "Versión del contenido"
 
 #: src/wx/video_panel.cc:289
 #, c-format
@@ -287,7 +274,7 @@ msgstr "No se pudo crear el DCP: %s"
 
 #: src/wx/dolby_certificate_dialog.cc:39
 msgid "Country"
-msgstr ""
+msgstr "País"
 
 #: src/wx/new_film_dialog.cc:40
 msgid "Create in folder"
@@ -308,7 +295,7 @@ msgstr "Nombre DCI"
 
 #: src/wx/film_editor.cc:87 src/wx/kdm_dialog.cc:107
 msgid "DCP"
-msgstr ""
+msgstr "DCP"
 
 #: src/wx/film_editor.cc:118
 msgid "DCP Name"
@@ -319,56 +306,49 @@ msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
 #: src/wx/audio_dialog.cc:98
-#, fuzzy, c-format
+#, c-format
 msgid "DCP-o-matic audio - %s"
-msgstr "Audio DCP-o-matic - %1"
+msgstr "Audio DCP-o-matic - %s"
 
 #: src/wx/config_dialog.cc:331
 msgid "Default DCI name details"
 msgstr "Detalles por defecto del nombre DCI"
 
 #: src/wx/config_dialog.cc:344
-#, fuzzy
 msgid "Default JPEG2000 bandwidth"
-msgstr "Ancho de banda JPEG2000"
+msgstr "Ancho de banda JPEG2000 por defecto"
 
 #: src/wx/config_dialog.cc:353
-#, fuzzy
 msgid "Default audio delay"
-msgstr "Tipo de contenido"
+msgstr "Retardo de audio por defecto"
 
 #: src/wx/config_dialog.cc:335
-#, fuzzy
 msgid "Default container"
-msgstr "Tipo de contenido"
+msgstr "Contenedor por defecto"
 
 #: src/wx/config_dialog.cc:339
-#, fuzzy
 msgid "Default content type"
-msgstr "Tipo de contenido"
+msgstr "Tipo de contenido por defecto"
 
 #: src/wx/config_dialog.cc:365
-#, fuzzy
 msgid "Default creator"
-msgstr "Tipo de contenido"
+msgstr "Creador por defecto"
 
 #: src/wx/config_dialog.cc:323
 msgid "Default directory for new films"
 msgstr "Carpeta por defecto para nuevas películas"
 
 #: src/wx/config_dialog.cc:315
-#, fuzzy
 msgid "Default duration of still images"
-msgstr "Carpeta por defecto para nuevas películas"
+msgstr "Duración por defecto de las imágenes fijas"
 
 #: src/wx/config_dialog.cc:361
-#, fuzzy
 msgid "Default issuer"
-msgstr "Tipo de contenido"
+msgstr "Emisor por defecto"
 
 #: src/wx/config_dialog.cc:294
 msgid "Defaults"
-msgstr ""
+msgstr "Por defecto"
 
 #: src/wx/film_editor.cc:130 src/wx/job_manager_view.cc:78
 msgid "Details..."
@@ -381,43 +361,41 @@ msgstr "Espacio requerido en disco"
 #: src/wx/screen_dialog.cc:64 src/wx/screen_dialog.cc:118
 #: src/wx/screen_dialog.cc:135
 msgid "Dolby"
-msgstr ""
+msgstr "Dolby"
 
 #: src/wx/screen_dialog.cc:63 src/wx/screen_dialog.cc:114
 #: src/wx/screen_dialog.cc:134
 msgid "Doremi"
-msgstr ""
+msgstr "Doremi"
 
 #: src/wx/doremi_certificate_dialog.cc:48
 msgid "Doremi serial numbers must have 6 digits"
-msgstr ""
+msgstr "Los números de serie de Doremi deben tener 6 cifras"
 
 #: src/wx/film_editor.cc:288
 msgid "Down"
-msgstr ""
+msgstr "Bajar"
 
 #: src/wx/download_certificate_dialog.cc:37 src/wx/screen_dialog.cc:47
 msgid "Download"
-msgstr ""
+msgstr "Descargar"
 
 #: src/wx/download_certificate_dialog.cc:27
 msgid "Download certificate"
-msgstr ""
+msgstr "Descargar certificado"
 
 #: src/wx/dolby_certificate_dialog.cc:132
 #: src/wx/doremi_certificate_dialog.cc:52
 msgid "Downloading certificate"
-msgstr ""
+msgstr "Descargando certificado"
 
 #: src/wx/kdm_dialog.cc:68
-#, fuzzy
 msgid "Edit Cinema..."
-msgstr "Editar..."
+msgstr "Editar cine..."
 
 #: src/wx/kdm_dialog.cc:75
-#, fuzzy
 msgid "Edit Screen..."
-msgstr "Editar..."
+msgstr "Editar pantalla..."
 
 #: src/wx/audio_mapping_view.cc:136 src/wx/config_dialog.cc:332
 #: src/wx/video_panel.cc:154 src/wx/video_panel.cc:171
@@ -426,18 +404,16 @@ msgid "Edit..."
 msgstr "Editar..."
 
 #: src/wx/cinema_dialog.cc:31
-#, fuzzy
 msgid "Email address for KDM delivery"
 msgstr "Remitente para los emails de KDM"
 
 #: src/wx/servers_list_dialog.cc:30
-#, fuzzy
 msgid "Encoding Servers"
 msgstr "Servidores de codificación"
 
 #: src/wx/film_editor.cc:159
 msgid "Encrypted"
-msgstr ""
+msgstr "Encriptado"
 
 #: src/wx/dci_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
@@ -445,9 +421,8 @@ msgstr "Compañía (ej. DLA)"
 
 #: src/wx/dolby_certificate_dialog.cc:76 src/wx/dolby_certificate_dialog.cc:91
 #: src/wx/dolby_certificate_dialog.cc:106
-#, fuzzy
 msgid "Fetching..."
-msgstr "contando..."
+msgstr "Recuperando..."
 
 #: src/wx/properties_dialog.cc:36
 msgid "Film Properties"
@@ -463,12 +438,11 @@ msgstr "Filtros"
 
 #: src/wx/content_menu.cc:52
 msgid "Find missing..."
-msgstr ""
+msgstr "Buscar ausentes..."
 
 #: src/wx/film_editor.cc:145
-#, fuzzy
 msgid "Frame Rate"
-msgstr "Velocidad DCP"
+msgstr "Velocidad"
 
 #: src/wx/properties_dialog.cc:39
 msgid "Frames"
@@ -493,11 +467,11 @@ msgstr "Remitente para los emails de KDM"
 
 #: src/wx/audio_mapping_view.cc:134
 msgid "Full"
-msgstr ""
+msgstr "Completo"
 
 #: src/wx/timing_panel.cc:43
 msgid "Full length"
-msgstr ""
+msgstr "Duración completa"
 
 #: src/wx/gain_calculator_dialog.cc:27
 msgid "Gain Calculator"
@@ -506,7 +480,7 @@ msgstr "Calculadora de ganancia"
 #: src/wx/audio_gain_dialog.cc:28
 #, c-format
 msgid "Gain for content channel %d in DCP channel %d"
-msgstr ""
+msgstr "Ganancia del canal %d en el canal %d del DCP"
 
 #: src/wx/properties_dialog.cc:52
 msgid "Gb"
@@ -514,15 +488,15 @@ msgstr "Gb"
 
 #: src/wx/audio_mapping_view.cc:304
 msgid "HI"
-msgstr ""
+msgstr "HI"
 
 #: src/wx/hints_dialog.cc:26
 msgid "Hints"
-msgstr ""
+msgstr "Pistas"
 
 #: src/wx/servers_list_dialog.cc:40
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: src/wx/server_dialog.cc:38
 msgid "Host name or IP address"
@@ -541,9 +515,8 @@ msgid "IP address"
 msgstr "Dirección IP"
 
 #: src/wx/config_dialog.cc:519
-#, fuzzy
 msgid "IP address / host name"
-msgstr "Dirección IP"
+msgstr "Dirección IP / nombre"
 
 #: src/wx/colour_conversion_editor.cc:44
 msgid "Input gamma"
@@ -551,7 +524,7 @@ msgstr "Gamma de entrada"
 
 #: src/wx/film_editor.cc:224
 msgid "Interop"
-msgstr ""
+msgstr "Interop"
 
 #: src/wx/film_editor.cc:178
 msgid "JPEG2000 bandwidth"
@@ -559,10 +532,9 @@ msgstr "Ancho de banda JPEG2000"
 
 #: src/wx/content_menu.cc:51
 msgid "Join"
-msgstr ""
+msgstr "Unir"
 
 #: src/wx/config_dialog.cc:694
-#, fuzzy
 msgid "KDM Email"
 msgstr "Email KDM"
 
@@ -572,11 +544,11 @@ msgstr "Mantener el video secuencia"
 
 #: src/wx/audio_mapping_view.cc:280
 msgid "L"
-msgstr ""
+msgstr "L"
 
 #: src/wx/audio_mapping_view.cc:312
 msgid "Lc"
-msgstr ""
+msgstr "Lc"
 
 #: src/wx/video_panel.cc:87
 msgid "Left crop"
@@ -584,7 +556,7 @@ msgstr "Recorte izquierda"
 
 #: src/wx/audio_mapping_view.cc:292
 msgid "Lfe"
-msgstr ""
+msgstr "Lfe"
 
 #: src/wx/colour_conversion_editor.cc:49
 msgid "Linearise input gamma curve for low values"
@@ -592,26 +564,23 @@ msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 
 #: src/wx/screen_dialog.cc:46
 msgid "Load from file..."
-msgstr ""
+msgstr "Cargar de fichero..."
 
 #: src/wx/audio_mapping_view.cc:296
-#, fuzzy
 msgid "Ls"
-msgstr "s"
+msgstr "Ls"
 
 #: src/wx/film_editor.cc:749
 msgid "MISSING: "
-msgstr ""
+msgstr "FALTA:"
 
 #: src/wx/config_dialog.cc:121
-#, fuzzy
 msgid "Mail password"
-msgstr "Clave del TMS"
+msgstr "Clave del correo"
 
 #: src/wx/config_dialog.cc:117
-#, fuzzy
 msgid "Mail user name"
-msgstr "Usuario del TMS"
+msgstr "Usuario del correo"
 
 #: src/wx/kdm_dialog.cc:47
 msgid "Make KDMs"
@@ -619,21 +588,19 @@ msgstr "Crear KDMs"
 
 #: src/wx/colour_conversion_editor.cc:67
 msgid "Matrix"
-msgstr ""
+msgstr "Matriz"
 
 #: src/wx/config_dialog.cc:109
-#, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
-msgstr "Ancho de banda JPEG2000"
+msgstr "Ancho de banda JPEG2000 máximo"
 
 #: src/wx/config_dialog.cc:348 src/wx/film_editor.cc:182
 msgid "Mbit/s"
-msgstr ""
+msgstr "Mbit/s"
 
 #: src/wx/video_panel.cc:277
-#, fuzzy
 msgid "Multiple content selected"
-msgstr "Tipo de contenido"
+msgstr "Varios contenidos seleccionados"
 
 #: src/wx/dir_picker_ctrl.cc:51
 msgid "My Documents"
@@ -650,12 +617,12 @@ msgstr "Nueva película"
 
 #: src/wx/update_dialog.cc:36
 msgid "New versions of DCP-o-matic are available."
-msgstr ""
+msgstr "Nuevas versiones disponibles de DCP-o-matic."
 
 #: src/wx/audio_mapping_view.cc:351
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
-msgstr ""
+msgstr "No pasará audio del canal de origen %d al canal %d del DCP."
 
 #: src/wx/video_panel.cc:152 src/wx/video_panel.cc:246
 msgid "None"
@@ -663,16 +630,15 @@ msgstr "Ninguno"
 
 #: src/wx/audio_mapping_view.cc:133
 msgid "Off"
-msgstr ""
+msgstr "Off"
 
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
-msgstr ""
+msgstr "Otros"
 
 #: src/wx/config_dialog.cc:113
-#, fuzzy
 msgid "Outgoing mail server"
-msgstr "Servidores de codificación"
+msgstr "Servidor de salida de correo"
 
 #: src/wx/colour_conversion_editor.cc:78
 msgid "Output gamma"
@@ -688,9 +654,8 @@ msgid "Padded with black to %dx%d (%.2f:1)\n"
 msgstr "Completado con negro hasta %dx%d (%.2f:1)\n"
 
 #: src/wx/config_dialog.cc:639
-#, fuzzy
 msgid "Password"
-msgstr "Clave del TMS"
+msgstr "Clave"
 
 #: src/wx/job_manager_view.cc:72 src/wx/job_manager_view.cc:164
 msgid "Pause"
@@ -706,7 +671,7 @@ msgstr "Reproducir"
 
 #: src/wx/timing_panel.cc:52
 msgid "Play length"
-msgstr ""
+msgstr "Duración"
 
 #: src/wx/audio_plot.cc:43
 msgid "Please wait; audio is being analysed..."
@@ -718,7 +683,7 @@ msgstr "Posición"
 
 #: src/wx/audio_mapping_view.cc:284
 msgid "R"
-msgstr ""
+msgstr "R"
 
 #: src/wx/audio_dialog.cc:61
 msgid "RMS"
@@ -730,7 +695,7 @@ msgstr "Clasificación (ej. 16)"
 
 #: src/wx/audio_mapping_view.cc:316
 msgid "Rc"
-msgstr ""
+msgstr "Rc"
 
 #: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
 #: src/wx/editable_list.h:66
@@ -738,23 +703,20 @@ msgid "Remove"
 msgstr "Quitar"
 
 #: src/wx/kdm_dialog.cc:70
-#, fuzzy
 msgid "Remove Cinema"
-msgstr "Quitar"
+msgstr "Quitar cine"
 
 #: src/wx/kdm_dialog.cc:77
-#, fuzzy
 msgid "Remove Screen"
-msgstr "Quitar"
+msgstr "Quitar pantalla"
 
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Repetir"
 
 #: src/wx/repeat_dialog.cc:24
-#, fuzzy
 msgid "Repeat Content"
-msgstr "Seleccionar fichero de contenido"
+msgstr "Repetir contenido"
 
 #: src/wx/content_menu.cc:50
 msgid "Repeat..."
@@ -770,25 +732,23 @@ msgstr "Continuar"
 
 #: src/wx/audio_mapping_view.cc:359
 msgid "Right click to change gain."
-msgstr ""
+msgstr "Click derecho para cambiar la ganancia."
 
 #: src/wx/video_panel.cc:98
 msgid "Right crop"
 msgstr "Recorte derecha"
 
 #: src/wx/audio_mapping_view.cc:300
-#, fuzzy
 msgid "Rs"
-msgstr "s"
+msgstr "Rs"
 
 #: src/wx/film_editor.cc:223
 msgid "SMPTE"
-msgstr ""
+msgstr "SMPTE"
 
 #: src/wx/video_panel.cc:131
-#, fuzzy
 msgid "Scale to"
-msgstr "Escalador"
+msgstr "Redimensionar a"
 
 #: src/wx/video_panel.cc:313
 #, c-format
@@ -800,9 +760,8 @@ msgid "Scaler"
 msgstr "Escalador"
 
 #: src/wx/screen_dialog.cc:102
-#, fuzzy
 msgid "Select Certificate File"
-msgstr "Seleccionar fichero de contenido"
+msgstr "Seleccionar fichero de certificado"
 
 #: src/wx/kdm_dialog.cc:140
 msgid "Send by email"
@@ -810,7 +769,7 @@ msgstr "Enviar por email"
 
 #: src/wx/dolby_certificate_dialog.cc:47
 msgid "Serial number"
-msgstr ""
+msgstr "Número de serie"
 
 #: src/wx/server_dialog.cc:28
 msgid "Server"
@@ -818,12 +777,11 @@ msgstr "Servidor"
 
 #: src/wx/doremi_certificate_dialog.cc:35
 msgid "Server serial number"
-msgstr ""
+msgstr "Número de serie del servidor"
 
 #: src/wx/config_dialog.cc:499
-#, fuzzy
 msgid "Servers"
-msgstr "Servidor"
+msgstr "Servidores"
 
 #: src/wx/timecode.cc:65 src/wx/timing_panel.cc:61
 msgid "Set"
@@ -839,7 +797,7 @@ msgstr "Mostrar audio..."
 
 #: src/wx/film_editor.cc:155
 msgid "Signed"
-msgstr ""
+msgstr "Firmado"
 
 #: src/wx/audio_dialog.cc:71
 msgid "Smoothing"
@@ -847,12 +805,11 @@ msgstr "Suavizado"
 
 #: src/wx/timeline_dialog.cc:38
 msgid "Snap"
-msgstr ""
+msgstr "Acoplar"
 
 #: src/wx/update_dialog.cc:43
-#, fuzzy
 msgid "Stable version "
-msgstr "Tipo de contenido"
+msgstr "Versión estable"
 
 #: src/wx/film_editor.cc:187
 msgid "Standard"
@@ -871,19 +828,16 @@ msgid "Subtitle Scale"
 msgstr "Escala del subtítulo"
 
 #: src/wx/subtitle_panel.cc:70
-#, fuzzy
 msgid "Subtitle Stream"
-msgstr "Escala del subtítulo"
+msgstr "Flujo de subtítulos"
 
 #: src/wx/subtitle_panel.cc:44
-#, fuzzy
 msgid "Subtitle X Offset"
-msgstr "Desplazamiento del subtítulo"
+msgstr "Desplazamiento del subtítulo en X"
 
 #: src/wx/subtitle_panel.cc:53
-#, fuzzy
 msgid "Subtitle Y Offset"
-msgstr "Desplazamiento del subtítulo"
+msgstr "Desplazamiento del subtítulo en Y"
 
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
@@ -894,28 +848,24 @@ msgid "Supported by"
 msgstr "Soportado por"
 
 #: src/wx/config_dialog.cc:607
-#, fuzzy
 msgid "TMS"
-msgstr "RMS"
+msgstr "TMS"
 
 #: src/wx/config_dialog.cc:631
-#, fuzzy
 msgid "Target path"
-msgstr "Ruta en el TMS"
+msgstr "Ruta"
 
 #: src/wx/dci_metadata_dialog.cc:41
 msgid "Territory (e.g. UK)"
 msgstr "Territorio (ej. ES)"
 
 #: src/wx/update_dialog.cc:48
-#, fuzzy
 msgid "Test version "
-msgstr "Tipo de contenido"
+msgstr "Versión en prueba"
 
 #: src/wx/about_dialog.cc:188
-#, fuzzy
 msgid "Tested by"
-msgstr "Traducido por"
+msgstr "Comprobado por"
 
 #: src/wx/content_menu.cc:223
 msgid ""
@@ -923,14 +873,16 @@ msgid ""
 "missing.  Either try again with the correct content file or remove the "
 "missing content."
 msgstr ""
+"El fichero(s) especificados no es el mismo que el ausente. Puedes probar de "
+"nuevo con el fichero correcto o eliminar el contenido ausente."
 
 #: src/wx/hints_dialog.cc:97
 msgid "There are no hints: everything looks good!"
-msgstr ""
+msgstr "No hay recomendaciones: ¡todo parece bien!"
 
 #: src/wx/film_viewer.cc:133
 msgid "There is not enough free memory to do that."
-msgstr ""
+msgstr "No hay suficiente memoria para hacer eso."
 
 #: src/wx/servers_list_dialog.cc:48
 msgid "Threads"
@@ -945,9 +897,8 @@ msgid "Time"
 msgstr "Tiempo"
 
 #: src/wx/timeline_dialog.cc:32
-#, fuzzy
 msgid "Timeline"
-msgstr "Tiempo"
+msgstr "Línea de tiempo"
 
 #: src/wx/film_editor.cc:290
 msgid "Timeline..."
@@ -955,7 +906,7 @@ msgstr "Linea de tiempo..."
 
 #: src/wx/timing_panel.cc:35
 msgid "Timing"
-msgstr ""
+msgstr "Tiempo"
 
 #: src/wx/video_panel.cc:109
 msgid "Top crop"
@@ -966,28 +917,24 @@ msgid "Translated by"
 msgstr "Traducido por"
 
 #: src/wx/timing_panel.cc:49
-#, fuzzy
 msgid "Trim from end"
-msgstr "Recortar fotogramas"
+msgstr "Recortar del final"
 
 #: src/wx/timing_panel.cc:46
-#, fuzzy
 msgid "Trim from start"
-msgstr "Recortar fotogramas"
+msgstr "Recortar del inicio"
 
 #: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
 msgid "Type"
 msgstr "Tipo"
 
 #: src/wx/dolby_certificate_dialog.cc:148
-#, fuzzy
 msgid "Unexpected certificate filename form"
-msgstr "Seleccionar fichero de contenido"
+msgstr "Nombre inesperado del fichero de certificado"
 
 #: src/wx/screen_dialog.cc:62
-#, fuzzy
 msgid "Unknown"
-msgstr "desconocido"
+msgstr "Desconocido"
 
 #: src/wx/kdm_dialog.cc:93
 msgid "Until"
@@ -995,11 +942,11 @@ msgstr "Hasta"
 
 #: src/wx/film_editor.cc:286
 msgid "Up"
-msgstr ""
+msgstr "Subir"
 
 #: src/wx/update_dialog.cc:27
 msgid "Update"
-msgstr ""
+msgstr "Actualizar"
 
 #: src/wx/film_editor.cc:128
 msgid "Use DCI name"
@@ -1007,34 +954,31 @@ msgstr "Usar el nombre DCI"
 
 #: src/wx/config_dialog.cc:515
 msgid "Use all servers"
-msgstr ""
+msgstr "Usar todos los servidores"
 
 #: src/wx/film_editor.cc:149
 msgid "Use best"
 msgstr "Usar la mejor"
 
 #: src/wx/content_colour_conversion_dialog.cc:42
-#, fuzzy
 msgid "Use preset"
-msgstr "Usar la mejor"
+msgstr "Usar por defecto"
 
 #: src/wx/config_dialog.cc:635
-#, fuzzy
 msgid "User name"
-msgstr "Usar el nombre DCI"
+msgstr "Nombre de usuario"
 
 #: src/wx/audio_mapping_view.cc:308
 msgid "VI"
-msgstr ""
+msgstr "VI"
 
 #: src/wx/video_panel.cc:67
 msgid "Video"
 msgstr "Vídeo"
 
 #: src/wx/timing_panel.cc:57
-#, fuzzy
 msgid "Video frame rate"
-msgstr "Velocidad DCP"
+msgstr "Velocidad de imagen"
 
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"
@@ -1054,6 +998,8 @@ msgid ""
 "You have %d files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
 msgstr ""
+"Hay %d ficheros que parecen VOBs en el DVD. Deberías unirlos para asegurarte "
+"transiciones suaves."
 
 #: src/wx/hints_dialog.cc:76
 #, c-format
@@ -1061,23 +1007,29 @@ msgid ""
 "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
 "projectors.  Use 24 or 48 frames per second to be on the safe side."
 msgstr ""
+"La velocidad de tu DCP (%d fas) puede causar problemas en algunos "
+"proyectores (sobre todo antiguos).  Utiliza 24 o 48 imágenes por segundo "
+"para asegurarte."
 
 #: src/wx/hints_dialog.cc:66
 msgid ""
 "Your DCP has an odd number of audio channels.  This is very likely to cause "
 "problems on playback."
 msgstr ""
+"Tu DCP tiene un número impar de canales de audio. Es muy probable que cause "
+"problemas de reproducción."
 
 #: src/wx/hints_dialog.cc:70
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
 msgstr ""
+"Tu DCP tiene menos de 6 canales de audio. Esto puede causar problemas con "
+"algunos proyectores."
 
 #: src/wx/timeline.cc:213
-#, fuzzy
 msgid "audio"
-msgstr "Audio"
+msgstr "audio"
 
 #: src/wx/audio_panel.cc:238
 msgid "channels"
@@ -1106,12 +1058,11 @@ msgstr "fijo"
 
 #: src/wx/repeat_dialog.cc:28
 msgid "times"
-msgstr ""
+msgstr "veces"
 
 #: src/wx/timeline.cc:234
-#, fuzzy
 msgid "video"
-msgstr "Vídeo"
+msgstr "vídeo"
 
 #, fuzzy
 #~ msgid "Content channel"

diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 5c934fdc5a47e259b1d39f79995e7b1ca52703e9..ee75de991a3f5b8c764af61bb924dc90c9173452 100644 (file)
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-03-31 16:10+0100\n"
-"PO-Revision-Date: 2014-04-06 03:30+0100\n"
+"PO-Revision-Date: 2014-04-18 22:50+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr_FR\n"
@@ -107,7 +107,7 @@ msgstr "Ajouter..."
 
 #: src/wx/about_dialog.cc:107
 msgid "Artwork by"
-msgstr "Thème artistique par"
+msgstr "Thème par"
 
 #: src/wx/audio_dialog.cc:33 src/wx/audio_panel.cc:40
 msgid "Audio"
@@ -205,7 +205,7 @@ msgstr "Canaux"
 
 #: src/wx/config_dialog.cc:137
 msgid "Check for testing updates as well as stable ones"
-msgstr "Recherche de mises à jour - version test et stables."
+msgstr "Recherche toutes mises à jour : test et stables."
 
 #: src/wx/config_dialog.cc:133
 msgid "Check for updates on startup"
@@ -229,16 +229,16 @@ msgstr "Cinéma"
 
 #: src/wx/config_dialog.cc:561
 msgid "Colour Conversions"
-msgstr "Conversions couleurs"
+msgstr "Conversions Couleurs"
 
 #: src/wx/content_colour_conversion_dialog.cc:34
 #: src/wx/preset_colour_conversion_dialog.cc:30 src/wx/video_panel.cc:161
 msgid "Colour conversion"
-msgstr "Conversion colorimétrique"
+msgstr "Espace Couleurs"
 
 #: src/wx/film_editor.cc:134
 msgid "Container"
-msgstr "Contenu"
+msgstr "Format"
 
 #: src/wx/audio_mapping_view.cc:273 src/wx/film_editor.cc:85
 msgid "Content"
@@ -328,11 +328,11 @@ msgstr "Délais audio par défaut"
 
 #: src/wx/config_dialog.cc:335
 msgid "Default container"
-msgstr "Type de contenu par défaut"
+msgstr "Format par défaut"
 
 #: src/wx/config_dialog.cc:339
 msgid "Default content type"
-msgstr "Type de contenu par défaut"
+msgstr "Catégorie par défaut"
 
 #: src/wx/config_dialog.cc:365
 msgid "Default creator"
@@ -340,7 +340,7 @@ msgstr "Créateur par défaut"
 
 #: src/wx/config_dialog.cc:323
 msgid "Default directory for new films"
-msgstr "Dossier par défaut pour nouveaux films"
+msgstr "Dossier par défaut pour les DCP"
 
 #: src/wx/config_dialog.cc:315
 msgid "Default duration of still images"
@@ -571,7 +571,7 @@ msgstr "Chargement depuis fichier..."
 
 #: src/wx/audio_mapping_view.cc:296
 msgid "Ls"
-msgstr "SG"
+msgstr "Sr.G"
 
 #: src/wx/film_editor.cc:749
 msgid "MISSING: "
@@ -743,7 +743,7 @@ msgstr "Découpe droite"
 
 #: src/wx/audio_mapping_view.cc:300
 msgid "Rs"
-msgstr "SD"
+msgstr "Sr.D"
 
 #: src/wx/film_editor.cc:223
 msgid "SMPTE"
@@ -836,11 +836,11 @@ msgstr "Flux de sous-titre"
 
 #: src/wx/subtitle_panel.cc:44
 msgid "Subtitle X Offset"
-msgstr "Position Horiz."
+msgstr "Position Horizontale"
 
 #: src/wx/subtitle_panel.cc:53
 msgid "Subtitle Y Offset"
-msgstr "Position Vertic."
+msgstr "Position Verticale"
 
 #: src/wx/subtitle_panel.cc:34
 msgid "Subtitles"
@@ -922,11 +922,11 @@ msgstr "Traduit par"
 
 #: src/wx/timing_panel.cc:49
 msgid "Trim from end"
-msgstr "Images coupées depuis la fin"
+msgstr "Exclure à la fin"
 
 #: src/wx/timing_panel.cc:46
 msgid "Trim from start"
-msgstr "Images coupées depuis le début"
+msgstr "Exclure au début"
 
 #: src/wx/audio_dialog.cc:55 src/wx/video_panel.cc:74
 msgid "Type"
@@ -982,7 +982,7 @@ msgstr "Vidéo"
 
 #: src/wx/timing_panel.cc:57
 msgid "Video frame rate"
-msgstr "Cadence images vidéo"
+msgstr "Cadence vidéo"
 
 #: src/wx/subtitle_panel.cc:39
 msgid "With Subtitles"

diff --git a/src/wx/wx_util.h b/src/wx/wx_util.h
index 0afd82b900a104834936dd75a3029ede0d0d9e04..5855411501f8b3be074be3a29e95f6317e322e4c 100644 (file)
--- a/src/wx/wx_util.h
+++ b/src/wx/wx_util.h
@@ -89,10 +89,10 @@ extern int wx_get (wxChoice* widget);
 extern int wx_get (wxSpinCtrl* widget);
 
 /* GTK 2.24.17 has a buggy GtkFileChooserButton and it was put in Ubuntu 13.04.
-   This also seems to apply to 2.24.20 in Ubuntu 13.10
+   This also seems to apply to 2.24.20 in Ubuntu 13.10 and 2.24.23 in Ubuntu 14.04.
    Use our own dir picker as this is the least bad option I can think of.
 */
-#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20))
+#if defined(__WXMSW__) || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION == 24 && (GTK_MICRO_VERSION == 17 || GTK_MICRO_VERSION == 20 || GTK_MICRO_VERSION == 23))
 #define DCPOMATIC_USE_OWN_DIR_PICKER
 #endif