Merge master.

3 files changed, 35 insertions, 20 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 2f64371ae..1abd25198 100644
--- 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 3b5c01d2b..e26a8221c 100644
--- 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 91c0ef78e..b573e5b7d 100644
--- 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"