summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dvdomatic.cc48
-rw-r--r--src/tools/dvdomatic_batch.cc239
-rw-r--r--src/tools/makedcp.cc15
-rw-r--r--src/tools/po/es_ES.po65
-rw-r--r--src/tools/po/fr_FR.po80
-rw-r--r--src/tools/po/it_IT.po63
-rw-r--r--src/tools/po/sv_SE.po63
-rw-r--r--src/tools/wscript2
8 files changed, 386 insertions, 189 deletions
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index b161ac7e3..ff1560f0e 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -62,7 +62,6 @@ static shared_ptr<Film> film;
static std::string log_level;
static std::string film_to_load;
static wxMenu* jobs_menu = 0;
-static wxLocale* locale = 0;
static void set_menu_sensitivity ();
@@ -225,7 +224,7 @@ public:
film_editor = new FilmEditor (film, panel);
film_viewer = new FilmViewer (film, panel);
- JobManagerView* job_manager_view = new JobManagerView (panel);
+ JobManagerView* job_manager_view = new JobManagerView (panel, static_cast<JobManagerView::Buttons> (0));
_top_sizer = new wxBoxSizer (wxHORIZONTAL);
_top_sizer->Add (film_editor, 0, wxALL, 6);
@@ -463,49 +462,6 @@ static const wxCmdLineEntryDesc command_line_description[] = {
};
#endif
-void
-setup_i18n ()
-{
- int language = wxLANGUAGE_DEFAULT;
-
- ofstream f ("c:/users/carl hetherington/foo", std::ios::app);
- f << "Hello.\n";
-
- boost::optional<string> config_lang = Config::instance()->language ();
- if (config_lang && !config_lang->empty ()) {
- f << "Configured language " << config_lang.get() << "\n";
- wxLanguageInfo const * li = wxLocale::FindLanguageInfo (std_to_wx (config_lang.get ()));
- f << "LanguageInfo " << li << "\n";
- if (li) {
- language = li->Language;
- f << "language=" << language << " cf " << wxLANGUAGE_DEFAULT << " " << wxLANGUAGE_ENGLISH << "\n";
- }
- }
-
- if (wxLocale::IsAvailable (language)) {
- f << "Language is available.\n";
- locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT);
-
-#ifdef DVDOMATIC_WINDOWS
- locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string()));
-#endif
-
- locale->AddCatalog (wxT ("libdvdomatic-wx"));
- locale->AddCatalog (wxT ("dvdomatic"));
-
- if (!locale->IsOk()) {
- f << "Locale is not ok.\n";
- delete locale;
- locale = new wxLocale (wxLANGUAGE_ENGLISH);
- language = wxLANGUAGE_ENGLISH;
- }
- }
-
- if (locale) {
- dvdomatic_setup_i18n (wx_to_std (locale->GetCanonicalName ()));
- }
-}
-
class App : public wxApp
{
bool OnInit ()
@@ -526,7 +482,7 @@ class App : public wxApp
hasn't yet been called and there aren't any scalers, filters etc.
set up yet.
*/
- setup_i18n ();
+ dvdomatic_setup_i18n ();
/* Set things up, including scalers / filters etc.
which will now be internationalised correctly.
diff --git a/src/tools/dvdomatic_batch.cc b/src/tools/dvdomatic_batch.cc
new file mode 100644
index 000000000..7a3d38d9c
--- /dev/null
+++ b/src/tools/dvdomatic_batch.cc
@@ -0,0 +1,239 @@
+/*
+ Copyright (C) 2013 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.
+
+*/
+
+#include <wx/aboutdlg.h>
+#include <wx/stdpaths.h>
+#include <wx/wx.h>
+#include "lib/version.h"
+#include "lib/compose.hpp"
+#include "lib/config.h"
+#include "lib/util.h"
+#include "lib/film.h"
+#include "lib/job_manager.h"
+#include "wx/wx_util.h"
+#include "wx/wx_ui_signaller.h"
+#include "wx/job_manager_view.h"
+
+using boost::shared_ptr;
+
+enum {
+ ID_file_add_film = 1,
+ ID_file_quit,
+ ID_help_about
+};
+
+void
+setup_menu (wxMenuBar* m)
+{
+ wxMenu* file = new wxMenu;
+ file->Append (ID_file_add_film, _("&Add Film..."));
+ file->Append (ID_file_quit, _("&Quit"));
+
+ wxMenu* help = new wxMenu;
+ help->Append (ID_help_about, _("About"));
+
+ m->Append (file, _("&File"));
+ m->Append (help, _("&Help"));
+}
+
+class Frame : public wxFrame
+{
+public:
+ Frame (wxString const & title)
+ : wxFrame (NULL, -1, title)
+ {
+ wxMenuBar* bar = new wxMenuBar;
+ setup_menu (bar);
+ SetMenuBar (bar);
+
+ Connect (ID_file_add_film, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_add_film));
+ Connect (ID_file_quit, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::file_quit));
+ Connect (ID_help_about, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (Frame::help_about));
+
+ wxPanel* panel = new wxPanel (this);
+ wxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ s->Add (panel, 1, wxEXPAND);
+ SetSizer (s);
+
+ wxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+
+ JobManagerView* job_manager_view = new JobManagerView (panel, JobManagerView::PAUSE);
+ sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
+
+ wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
+ wxButton* add = new wxButton (panel, wxID_ANY, _("Add Film..."));
+ add->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (Frame::add_film));
+ buttons->Add (add, 1, wxALL, 6);
+
+ sizer->Add (buttons, 0, wxALL, 6);
+
+ panel->SetSizer (sizer);
+
+ Connect (wxID_ANY, wxEVT_CLOSE_WINDOW, wxCloseEventHandler (Frame::close));
+ }
+
+private:
+ bool should_close ()
+ {
+ if (!JobManager::instance()->work_to_do ()) {
+ return true;
+ }
+
+ wxMessageDialog* d = new wxMessageDialog (
+ 0,
+ _("There are unfinished jobs; are you sure you want to quit?"),
+ _("Unfinished jobs"),
+ wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
+ );
+
+ bool const r = d->ShowModal() == wxID_YES;
+ d->Destroy ();
+ return r;
+ }
+
+ void close (wxCloseEvent& ev)
+ {
+ if (!should_close ()) {
+ ev.Veto ();
+ return;
+ }
+
+ ev.Skip ();
+ }
+
+ void file_add_film (wxCommandEvent& ev)
+ {
+ add_film (ev);
+ }
+
+ void file_quit (wxCommandEvent &)
+ {
+ if (should_close ()) {
+ Close (true);
+ }
+ }
+
+ void help_about (wxCommandEvent &)
+ {
+ wxAboutDialogInfo info;
+ info.SetName (_("DVD-o-matic Batch Converter"));
+ if (strcmp (dvdomatic_git_commit, "release") == 0) {
+ info.SetVersion (std_to_wx (String::compose ("version %1", dvdomatic_version)));
+ } else {
+ info.SetVersion (std_to_wx (String::compose ("version %1 git %2", dvdomatic_version, dvdomatic_git_commit)));
+ }
+ info.SetDescription (_("Free, open-source DCP generation from almost anything."));
+ info.SetCopyright (_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"));
+
+ wxArrayString authors;
+ authors.Add (wxT ("Carl Hetherington"));
+ authors.Add (wxT ("Terrence Meiczinger"));
+ authors.Add (wxT ("Paul Davis"));
+ authors.Add (wxT ("Ole Laursen"));
+ info.SetDevelopers (authors);
+
+ wxArrayString translators;
+ translators.Add (wxT ("Olivier Perriere"));
+ translators.Add (wxT ("Lilian Lefranc"));
+ translators.Add (wxT ("Thierry Journet"));
+ translators.Add (wxT ("Massimiliano Broggi"));
+ translators.Add (wxT ("Manuel AC"));
+ translators.Add (wxT ("Adam Klotblixt"));
+ info.SetTranslators (translators);
+
+ info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
+ wxAboutBox (info);
+ }
+
+ void add_film (wxCommandEvent &)
+ {
+ wxDirDialog* c = new wxDirDialog (this, _("Select film to open"), wxStandardPaths::Get().GetDocumentsDir(), wxDEFAULT_DIALOG_STYLE | wxDD_DIR_MUST_EXIST);
+ int r;
+ while (1) {
+ r = c->ShowModal ();
+ if (r == wxID_OK && c->GetPath() == wxStandardPaths::Get().GetDocumentsDir()) {
+ error_dialog (this, _("You did not select a folder. Make sure that you select a folder before clicking Open."));
+ } else {
+ break;
+ }
+ }
+
+ if (r == wxID_OK) {
+ try {
+ shared_ptr<Film> film (new Film (wx_to_std (c->GetPath ())));
+ film->make_dcp ();
+ } catch (std::exception& e) {
+ wxString p = c->GetPath ();
+ wxCharBuffer b = p.ToUTF8 ();
+ error_dialog (this, wxString::Format (_("Could not open film at %s (%s)"), p.data(), std_to_wx (e.what()).data()));
+ }
+ }
+
+ c->Destroy ();
+ }
+};
+
+class App : public wxApp
+{
+ bool OnInit ()
+ {
+ if (!wxApp::OnInit()) {
+ return false;
+ }
+
+#ifdef DVDOMATIC_POSIX
+ unsetenv ("UBUNTU_MENUPROXY");
+#endif
+
+ /* Enable i18n; this will create a Config object
+ to look for a force-configured language. This Config
+ object will be wrong, however, because dvdomatic_setup
+ hasn't yet been called and there aren't any scalers, filters etc.
+ set up yet.
+ */
+ dvdomatic_setup_i18n ();
+
+ /* Set things up, including scalers / filters etc.
+ which will now be internationalised correctly.
+ */
+ dvdomatic_setup ();
+
+ /* Force the configuration to be re-loaded correctly next
+ time it is needed.
+ */
+ Config::drop ();
+
+ Frame* f = new Frame (_("DVD-o-matic Batch Converter"));
+ SetTopWindow (f);
+ f->Maximize ();
+ f->Show ();
+
+ ui_signaller = new wxUISignaller (this);
+ this->Connect (-1, wxEVT_IDLE, wxIdleEventHandler (App::idle));
+
+ return true;
+ }
+
+ void idle (wxIdleEvent &)
+ {
+ ui_signaller->ui_idle ();
+ }
+};
+
+IMPLEMENT_APP (App)
diff --git a/src/tools/makedcp.cc b/src/tools/makedcp.cc
index c594991a6..e73930d3c 100644
--- a/src/tools/makedcp.cc
+++ b/src/tools/makedcp.cc
@@ -20,7 +20,6 @@
#include <iostream>
#include <iomanip>
#include <getopt.h>
-#include <libdcp/test_mode.h>
#include <libdcp/version.h>
#include "format.h"
#include "film.h"
@@ -50,7 +49,6 @@ help (string n)
<< " -v, --version show DVD-o-matic version\n"
<< " -h, --help show this help\n"
<< " -d, --deps list DVD-o-matic dependency details and quit\n"
- << " -t, --test run in test mode (repeatable UUID generation, timestamps etc.)\n"
<< " -n, --no-progress do not print progress to stdout\n"
<< " -r, --no-remote do not use any remote servers\n"
<< "\n"
@@ -61,7 +59,6 @@ int
main (int argc, char* argv[])
{
string film_dir;
- bool test_mode = false;
bool progress = true;
bool no_remote = false;
int log_level = 0;
@@ -72,14 +69,13 @@ main (int argc, char* argv[])
{ "version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h'},
{ "deps", no_argument, 0, 'd'},
- { "test", no_argument, 0, 't'},
{ "no-progress", no_argument, 0, 'n'},
{ "no-remote", no_argument, 0, 'r'},
{ "log-level", required_argument, 0, 'l' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhdtnrl:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhdnrl:", long_options, &option_index);
if (c == -1) {
break;
@@ -95,9 +91,6 @@ main (int argc, char* argv[])
case 'd':
cout << dependency_version_summary () << "\n";
exit (EXIT_SUCCESS);
- case 't':
- test_mode = true;
- break;
case 'n':
progress = false;
break;
@@ -130,11 +123,6 @@ main (int argc, char* argv[])
}
cout << "\n";
- if (test_mode) {
- libdcp::enable_test_mode ();
- cout << dependency_version_summary() << "\n";
- }
-
shared_ptr<Film> film;
try {
film.reset (new Film (film_dir, true));
@@ -150,7 +138,6 @@ main (int argc, char* argv[])
cout << "A/B ";
}
cout << "DCP for " << film->name() << "\n";
- cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
cout << "Content: " << film->content() << "\n";
pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
cout << "Filters: " << f.first << " " << f.second << "\n";
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 1739f97cd..30f568c98 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DVDOMATIC\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 15:06+0100\n"
+"POT-Creation-Date: 2013-05-09 09:51+0100\n"
"PO-Revision-Date: 2013-03-23 21:08-0500\n"
"Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
"Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -17,113 +17,118 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
-#: src/tools/dvdomatic.cc:179
+#: src/tools/dvdomatic.cc:178
msgid "&Analyse audio"
msgstr "&Analizar audio"
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:184
msgid "&Edit"
msgstr "&Editar"
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:183
msgid "&File"
msgstr "&Archivo"
-#: src/tools/dvdomatic.cc:187
+#: src/tools/dvdomatic.cc:186
msgid "&Help"
msgstr "&Ayuda"
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:185
msgid "&Jobs"
msgstr "&Tareas"
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:174
msgid "&Make DCP"
msgstr "&Crear DCP"
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dvdomatic.cc:162
msgid "&Open..."
msgstr "&Abrir..."
-#: src/tools/dvdomatic.cc:172
+#: src/tools/dvdomatic.cc:171
msgid "&Preferences..."
msgstr "&Preferencias..."
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dvdomatic.cc:166
msgid "&Properties..."
msgstr "&Propiedades..."
-#: src/tools/dvdomatic.cc:169
+#: src/tools/dvdomatic.cc:168
msgid "&Quit"
msgstr "&Salir"
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dvdomatic.cc:164
msgid "&Save"
msgstr "&Guardar"
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:175
msgid "&Send DCP to TMS"
msgstr "&Enviar DCP al TMS"
-#: src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:426
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dvdomatic.cc:181
msgid "About"
msgstr "Acerca de"
-#: src/tools/dvdomatic.cc:538
+#: src/tools/dvdomatic.cc:502
#, fuzzy
msgid "Could not load film %1 (%2)"
msgstr "No se pudo cargar la película %s (%s)"
-#: src/tools/dvdomatic.cc:341
+#: src/tools/dvdomatic.cc:348
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "No se pudo cargar la película en %s (%s)"
-#: src/tools/dvdomatic.cc:289 src/tools/dvdomatic.cc:412
-#: src/tools/dvdomatic.cc:542
+#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:506
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
-#: src/tools/dvdomatic.cc:77
+#: src/tools/dvdomatic.cc:76
msgid "Film changed"
msgstr "Película cambiada"
-#: src/tools/dvdomatic.cc:418
+#: src/tools/dvdomatic.cc:425
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."
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dvdomatic.cc:161
msgid "New..."
msgstr "Nuevo..."
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dvdomatic.cc:176
msgid "S&how DCP"
msgstr "&Mostrar DCP"
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:75
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr ""
-#: src/tools/dvdomatic.cc:321
+#: src/tools/dvdomatic.cc:328
msgid "Select film to open"
msgstr "Selecciona la película a abrir"
-#: src/tools/dvdomatic.cc:305
-#, fuzzy
-msgid "The directory %1 already exists."
-msgstr "La carpeta %s ya existe."
+#: src/tools/dvdomatic.cc:307
+msgid ""
+"The directory %1 already exists and is not empty. Are you sure you want to "
+"use it?"
+msgstr ""
-#: src/tools/dvdomatic.cc:326
+#: src/tools/dvdomatic.cc:333
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
msgstr ""
+
+#, fuzzy
+#~ msgid "The directory %1 already exists."
+#~ msgstr "La carpeta %s ya existe."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index c1447f7e6..6b8f1e783 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: DVD-o-matic FRENCH\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 15:06+0100\n"
-"PO-Revision-Date: 2013-03-13 22:33+0100\n"
+"POT-Creation-Date: 2013-05-09 09:51+0100\n"
+"PO-Revision-Date: 2013-05-10 14:09+0100\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: \n"
@@ -16,111 +16,111 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/tools/dvdomatic.cc:179
+#: src/tools/dvdomatic.cc:178
msgid "&Analyse audio"
msgstr "&Analyser le son"
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:184
msgid "&Edit"
msgstr "&Edition"
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:183
msgid "&File"
msgstr "&Fichier"
-#: src/tools/dvdomatic.cc:187
+#: src/tools/dvdomatic.cc:186
msgid "&Help"
msgstr "&Aide"
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:185
msgid "&Jobs"
msgstr "&Travaux"
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:174
msgid "&Make DCP"
msgstr "&Créer le DCP"
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dvdomatic.cc:162
msgid "&Open..."
msgstr "&Ouvrir..."
-#: src/tools/dvdomatic.cc:172
+#: src/tools/dvdomatic.cc:171
msgid "&Preferences..."
msgstr "&Préférences..."
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dvdomatic.cc:166
msgid "&Properties..."
msgstr "&Propriétés..."
-#: src/tools/dvdomatic.cc:169
+#: src/tools/dvdomatic.cc:168
msgid "&Quit"
msgstr "&Quitter"
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dvdomatic.cc:164
msgid "&Save"
msgstr "&Enregistrer"
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:175
msgid "&Send DCP to TMS"
msgstr "&Envoyer le DCP dans le TMS"
-#: src/tools/dvdomatic.cc:419
-msgid ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-msgstr ""
-"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+#: src/tools/dvdomatic.cc:426
+msgid "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
+msgstr "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dvdomatic.cc:181
msgid "About"
msgstr "A Propos"
-#: src/tools/dvdomatic.cc:538
+#: src/tools/dvdomatic.cc:502
#, fuzzy
msgid "Could not load film %1 (%2)"
msgstr "Impossible de charger le film %s (%s)"
-#: src/tools/dvdomatic.cc:341
+#: src/tools/dvdomatic.cc:348
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Impossible d'ouvrir le film à %s (%s)"
-#: src/tools/dvdomatic.cc:289 src/tools/dvdomatic.cc:412
-#: src/tools/dvdomatic.cc:542
+#: src/tools/dvdomatic.cc:288
+#: src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:506
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
-#: src/tools/dvdomatic.cc:77
+#: src/tools/dvdomatic.cc:76
msgid "Film changed"
msgstr "Film changé"
-#: src/tools/dvdomatic.cc:418
+#: src/tools/dvdomatic.cc:425
msgid "Free, open-source DCP generation from almost anything."
msgstr "Création de DCP libre et open-source à partir de presque tout."
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dvdomatic.cc:161
msgid "New..."
msgstr "Nouveau..."
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dvdomatic.cc:176
msgid "S&how DCP"
msgstr "Voir le DCP"
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:75
#, c-format
msgid "Save changes to film \"%s\" before closing?"
-msgstr ""
+msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
-#: src/tools/dvdomatic.cc:321
+#: src/tools/dvdomatic.cc:328
msgid "Select film to open"
msgstr "Sélectionner le film à ouvrir"
-#: src/tools/dvdomatic.cc:305
-#, fuzzy
-msgid "The directory %1 already exists."
-msgstr "Le dossier %s existe déjà."
+#: src/tools/dvdomatic.cc:307
+msgid "The directory %1 already exists and is not empty. Are you sure you want to use it?"
+msgstr "Le dossier %1 existe et n'est pas vide. Etes-vous sûr de vouloir l'utiliser ?"
-#: src/tools/dvdomatic.cc:326
-msgid ""
-"You did not select a folder. Make sure that you select a folder before "
-"clicking Open."
-msgstr ""
+#: src/tools/dvdomatic.cc:333
+msgid "You did not select a folder. Make sure that you select a folder before clicking Open."
+msgstr "Aucun dossier sélectionné. Selectionnez un dossier avant de cliquer sur Ouvrir"
+
+#, fuzzy
+#~ msgid "The directory %1 already exists."
+#~ msgstr "Le dossier %s existe déjà."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index f0984946d..d1f0b01bb 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: IT VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 15:06+0100\n"
+"POT-Creation-Date: 2013-05-09 09:51+0100\n"
"PO-Revision-Date: 2013-04-28 10:31+0100\n"
"Last-Translator: Maci <macibro@gmail.com>\n"
"Language-Team: \n"
@@ -17,109 +17,114 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
-#: src/tools/dvdomatic.cc:179
+#: src/tools/dvdomatic.cc:178
msgid "&Analyse audio"
msgstr "&Analizza audio"
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:184
msgid "&Edit"
msgstr "&Modifica"
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:183
msgid "&File"
msgstr "&File"
-#: src/tools/dvdomatic.cc:187
+#: src/tools/dvdomatic.cc:186
msgid "&Help"
msgstr "&Aiuto"
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:185
msgid "&Jobs"
msgstr "&Lavori"
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:174
msgid "&Make DCP"
msgstr "&Crea DCP"
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dvdomatic.cc:162
msgid "&Open..."
msgstr "&Apri..."
-#: src/tools/dvdomatic.cc:172
+#: src/tools/dvdomatic.cc:171
msgid "&Preferences..."
msgstr "&Preferenze..."
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dvdomatic.cc:166
msgid "&Properties..."
msgstr "&Proprieta'..."
-#: src/tools/dvdomatic.cc:169
+#: src/tools/dvdomatic.cc:168
msgid "&Quit"
msgstr "&Esci"
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dvdomatic.cc:164
msgid "&Save"
msgstr "&Salva"
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:175
msgid "&Send DCP to TMS"
msgstr "&Invia DCP a TMS"
-#: src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:426
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dvdomatic.cc:181
msgid "About"
msgstr "Informazioni"
-#: src/tools/dvdomatic.cc:538
+#: src/tools/dvdomatic.cc:502
msgid "Could not load film %1 (%2)"
msgstr "Non posso caricare il film %s (%s)"
-#: src/tools/dvdomatic.cc:341
+#: src/tools/dvdomatic.cc:348
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Non posso aprire il film in %s (%s)"
-#: src/tools/dvdomatic.cc:289 src/tools/dvdomatic.cc:412
-#: src/tools/dvdomatic.cc:542
+#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:506
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
-#: src/tools/dvdomatic.cc:77
+#: src/tools/dvdomatic.cc:76
msgid "Film changed"
msgstr "Film modificato"
-#: src/tools/dvdomatic.cc:418
+#: src/tools/dvdomatic.cc:425
msgid "Free, open-source DCP generation from almost anything."
msgstr "Genera DCP da quasi tutto, free e open-source."
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dvdomatic.cc:161
msgid "New..."
msgstr "Nuovo"
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dvdomatic.cc:176
msgid "S&how DCP"
msgstr "&Mostra DCP"
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:75
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
-#: src/tools/dvdomatic.cc:321
+#: src/tools/dvdomatic.cc:328
msgid "Select film to open"
msgstr "Seleziona il film da aprire"
-#: src/tools/dvdomatic.cc:305
-msgid "The directory %1 already exists."
-msgstr "La directory %s esiste gia'."
+#: src/tools/dvdomatic.cc:307
+msgid ""
+"The directory %1 already exists and is not empty. Are you sure you want to "
+"use it?"
+msgstr ""
-#: src/tools/dvdomatic.cc:326
+#: src/tools/dvdomatic.cc:333
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
msgstr ""
+
+#~ msgid "The directory %1 already exists."
+#~ msgstr "La directory %s esiste gia'."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 8ae68853f..7e88f84b1 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DVD-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-22 15:06+0100\n"
+"POT-Creation-Date: 2013-05-09 09:51+0100\n"
"PO-Revision-Date: 2013-04-09 10:12+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
@@ -17,112 +17,117 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.5.5\n"
-#: src/tools/dvdomatic.cc:179
+#: src/tools/dvdomatic.cc:178
msgid "&Analyse audio"
msgstr "&Analysera audio"
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:184
msgid "&Edit"
msgstr "&Redigera"
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:183
msgid "&File"
msgstr "&Fil"
-#: src/tools/dvdomatic.cc:187
+#: src/tools/dvdomatic.cc:186
msgid "&Help"
msgstr "&Hjälp"
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:185
msgid "&Jobs"
msgstr "&Jobb"
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:174
msgid "&Make DCP"
msgstr "&Skapa DCP"
-#: src/tools/dvdomatic.cc:163
+#: src/tools/dvdomatic.cc:162
msgid "&Open..."
msgstr "&Öppna"
-#: src/tools/dvdomatic.cc:172
+#: src/tools/dvdomatic.cc:171
msgid "&Preferences..."
msgstr "&Inställningar"
-#: src/tools/dvdomatic.cc:167
+#: src/tools/dvdomatic.cc:166
msgid "&Properties..."
msgstr "&Egenskaper"
-#: src/tools/dvdomatic.cc:169
+#: src/tools/dvdomatic.cc:168
msgid "&Quit"
msgstr "&Avsluta"
-#: src/tools/dvdomatic.cc:165
+#: src/tools/dvdomatic.cc:164
msgid "&Save"
msgstr "&Spara"
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:175
msgid "&Send DCP to TMS"
msgstr "&Skicka DCP till TMS"
-#: src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:426
msgid ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
msgstr ""
"(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"
-#: src/tools/dvdomatic.cc:182
+#: src/tools/dvdomatic.cc:181
msgid "About"
msgstr "Om"
-#: src/tools/dvdomatic.cc:538
+#: src/tools/dvdomatic.cc:502
msgid "Could not load film %1 (%2)"
msgstr "Kunde inte öppna filmen %1 (%2)"
-#: src/tools/dvdomatic.cc:341
+#: src/tools/dvdomatic.cc:348
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Kunde inte öppna filmen vid %s (%s)"
-#: src/tools/dvdomatic.cc:289 src/tools/dvdomatic.cc:412
-#: src/tools/dvdomatic.cc:542
+#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
+#: src/tools/dvdomatic.cc:506
msgid "DVD-o-matic"
msgstr "DVD-o-matic"
-#: src/tools/dvdomatic.cc:77
+#: src/tools/dvdomatic.cc:76
msgid "Film changed"
msgstr "Film ändrad"
-#: src/tools/dvdomatic.cc:418
+#: src/tools/dvdomatic.cc:425
msgid "Free, open-source DCP generation from almost anything."
msgstr ""
"Fri, öppen-källkodsprogramvara för DCP-generering från nästan vad som helst."
-#: src/tools/dvdomatic.cc:162
+#: src/tools/dvdomatic.cc:161
msgid "New..."
msgstr "Ny..."
-#: src/tools/dvdomatic.cc:177
+#: src/tools/dvdomatic.cc:176
msgid "S&how DCP"
msgstr "&Visa DCP"
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:75
#, fuzzy, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Spara ändringarna till filmen \"%1\" före avslut?"
-#: src/tools/dvdomatic.cc:321
+#: src/tools/dvdomatic.cc:328
msgid "Select film to open"
msgstr "Välj film att öppna"
-#: src/tools/dvdomatic.cc:305
-msgid "The directory %1 already exists."
-msgstr "Katalogen %1 finns redan."
+#: src/tools/dvdomatic.cc:307
+msgid ""
+"The directory %1 already exists and is not empty. Are you sure you want to "
+"use it?"
+msgstr ""
-#: src/tools/dvdomatic.cc:326
+#: src/tools/dvdomatic.cc:333
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
msgstr ""
"Du har inte valt en folder. Se till att välja en folder innan du klickar på "
"Öppna."
+
+#~ msgid "The directory %1 already exists."
+#~ msgstr "Katalogen %1 finns redan."
diff --git a/src/tools/wscript b/src/tools/wscript
index 9f0f52152..f36f0abef 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -13,7 +13,7 @@ def build(bld):
obj.target = t
if not bld.env.DISABLE_GUI:
- for t in ['dvdomatic', 'servomatic_gui']:
+ for t in ['dvdomatic', 'dvdomatic_batch', 'servomatic_gui']:
obj = bld(features = 'cxx cxxprogram')
obj.uselib = 'DCP OPENJPEG AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC'
obj.includes = ['..']
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-06 23:02:57 +0000