From ed5f11654baf824ed4438fdd29680aea63a70bad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Apr 2014 20:26:20 +0100 Subject: Update to es_ES translation from Manual AC. Signed-off-by: Manual AC --- src/tools/po/es_ES.po | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'src/tools') 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 \n" "Language-Team: Manuel AC \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" -- cgit v1.2.3 From 879afabeff6f8675c57e6c88fde8023fbc19f55a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 21 Apr 2014 20:37:43 +0100 Subject: Update to fr_FR translation from Thierry Journet. --- ChangeLog | 2 ++ src/lib/po/fr_FR.po | 2 +- src/tools/po/fr_FR.po | 2 +- src/wx/po/fr_FR.po | 32 ++++++++++++++++---------------- 4 files changed, 20 insertions(+), 18 deletions(-) (limited to 'src/tools') diff --git a/ChangeLog b/ChangeLog index 46865e635..890e59402 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,8 @@ * Update to es_ES translation from Manuel AC. + * Update to fr_FR translation from Thierry Journet. + 2014-04-17 Carl Hetherington * Fix update of the gain control when using the gain calculator diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index b96ca580d..b88099016 100644 --- 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/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" diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index 5c934fdc5..ee75de991 100644 --- 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" -- cgit v1.2.3 From a4afc8e3dd6ce7c5f02d0eb69f03bf9f043afed0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 27 Apr 2014 20:50:13 +0100 Subject: Open an error dialogue on uncaught exceptions in the main loop. Check that the ImageContent constructor found some valid files when scanning a folder. --- ChangeLog | 2 ++ src/lib/image_content.cc | 6 +++++- src/lib/job.cc | 4 ++-- src/tools/dcpomatic.cc | 11 +++++++++++ src/wx/film_editor.cc | 15 ++++++++++----- 5 files changed, 30 insertions(+), 8 deletions(-) (limited to 'src/tools') diff --git a/ChangeLog b/ChangeLog index 0393afe76..4911adf1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-04-27 Carl Hetherington + * 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. diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc index 13f7c52e3..3b87fcf00 100644 --- a/src/lib/image_content.cc +++ b/src/lib/image_content.cc @@ -44,7 +44,11 @@ ImageContent::ImageContent (shared_ptr 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 52499b433..96aedac65 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -108,7 +108,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); @@ -118,7 +118,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/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/wx/film_editor.cc b/src/wx/film_editor.cc index 31b9b8368..1131675bc 100644 --- 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 ( - new ImageContent (_film, boost::filesystem::path (wx_to_std (d->GetPath ()))) - ) - ); + shared_ptr 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 -- cgit v1.2.3