summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/dcpomatic.cc60
-rw-r--r--src/tools/dcpomatic_cli.cc2
-rw-r--r--src/tools/dcpomatic_create.cc2
-rw-r--r--src/tools/dcpomatic_kdm.cc30
-rw-r--r--src/tools/dcpomatic_server_cli.cc2
-rw-r--r--src/tools/po/de_DE.po92
-rw-r--r--src/tools/po/es_ES.po92
-rw-r--r--src/tools/po/fr_FR.po92
-rw-r--r--src/tools/po/it_IT.po92
-rw-r--r--src/tools/po/nl_NL.po90
-rw-r--r--src/tools/po/sv_SE.po94
-rw-r--r--src/tools/server_test.cc25
-rw-r--r--src/tools/wscript14
13 files changed, 349 insertions, 338 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index fa89a4871..d08a11ea9 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -30,7 +30,7 @@
#include <wx/stdpaths.h>
#include <wx/cmdline.h>
#include <wx/preferences.h>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
#include "wx/film_viewer.h"
#include "wx/film_editor.h"
#include "wx/job_manager_view.h"
@@ -45,6 +45,7 @@
#include "wx/servers_list_dialog.h"
#include "wx/hints_dialog.h"
#include "wx/update_dialog.h"
+#include "wx/content_panel.h"
#include "lib/film.h"
#include "lib/config.h"
#include "lib/util.h"
@@ -72,8 +73,6 @@ using std::exception;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-// #define DCPOMATIC_WINDOWS_CONSOLE 1
-
class FilmChangedDialog
{
public:
@@ -145,20 +144,24 @@ public:
, _history_position (0)
, _history_separator (0)
{
-#if defined(DCPOMATIC_WINDOWS) && defined(DCPOMATIC_WINDOWS_CONSOLE)
- AllocConsole();
-
- HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
- int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT);
- FILE* hf_out = _fdopen(hCrt, "w");
- setvbuf(hf_out, NULL, _IONBF, 1);
- *stdout = *hf_out;
-
- HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
- hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT);
- FILE* hf_in = _fdopen(hCrt, "r");
- setvbuf(hf_in, NULL, _IONBF, 128);
- *stdin = *hf_in;
+#if defined(DCPOMATIC_WINDOWS)
+ if (Config::instance()->win32_console ()) {
+ AllocConsole();
+
+ HANDLE handle_out = GetStdHandle(STD_OUTPUT_HANDLE);
+ int hCrt = _open_osfhandle((intptr_t) handle_out, _O_TEXT);
+ FILE* hf_out = _fdopen(hCrt, "w");
+ setvbuf(hf_out, NULL, _IONBF, 1);
+ *stdout = *hf_out;
+
+ HANDLE handle_in = GetStdHandle(STD_INPUT_HANDLE);
+ hCrt = _open_osfhandle((intptr_t) handle_in, _O_TEXT);
+ FILE* hf_in = _fdopen(hCrt, "r");
+ setvbuf(hf_in, NULL, _IONBF, 128);
+ *stdin = *hf_in;
+
+ cout << "DCP-o-matic is starting." << "\n";
+ }
#endif
wxMenuBar* bar = new wxMenuBar;
@@ -188,12 +191,6 @@ public:
Bind (wxEVT_CLOSE_WINDOW, boost::bind (&Frame::close, this, _1));
- wxAcceleratorEntry accel[1];
- accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
- Bind (wxEVT_MENU, boost::bind (&FilmEditor::content_add_file_clicked, _film_editor), ID_add_file);
- wxAcceleratorTable accel_table (1, accel);
- SetAcceleratorTable (accel_table);
-
/* Use a panel as the only child of the Frame so that we avoid
the dark-grey background on Windows.
*/
@@ -219,6 +216,12 @@ public:
JobManager::instance()->ActiveJobsChanged.connect (boost::bind (&Frame::set_menu_sensitivity, this));
overall_panel->SetSizer (main_sizer);
+
+ wxAcceleratorEntry accel[1];
+ accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
+ Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file);
+ wxAcceleratorTable accel_table (1, accel);
+ SetAcceleratorTable (accel_table);
}
void new_film (boost::filesystem::path path)
@@ -410,7 +413,7 @@ private:
shared_ptr<Job> (new SendKDMEmailJob (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ()))
);
}
- } catch (libdcp::NotEncryptedError& e) {
+ } catch (dcp::NotEncryptedError& e) {
error_dialog (this, _("CPL's content is not encrypted."));
} catch (exception& e) {
error_dialog (this, e.what ());
@@ -423,7 +426,7 @@ private:
void content_scale_to_fit_width ()
{
- VideoContentList vc = _film_editor->selected_video_content ();
+ VideoContentList vc = _film_editor->content_panel()->selected_video ();
for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
(*i)->scale_and_crop_to_fit_width ();
}
@@ -431,7 +434,7 @@ private:
void content_scale_to_fit_height ()
{
- VideoContentList vc = _film_editor->selected_video_content ();
+ VideoContentList vc = _film_editor->content_panel()->selected_video ();
for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
(*i)->scale_and_crop_to_fit_height ();
}
@@ -542,7 +545,7 @@ private:
}
bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished ();
bool const have_cpl = _film && !_film->cpls().empty ();
- bool const have_selected_video_content = !_film_editor->selected_video_content().empty();
+ bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty();
for (map<wxMenuItem*, int>::iterator j = menu_items.begin(); j != menu_items.end(); ++j) {
@@ -707,6 +710,9 @@ static const wxCmdLineEntryDesc command_line_description[] = {
{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
};
+/** @class App
+ * @brief The magic App class for wxWidgets.
+ */
class App : public wxApp
{
bool OnInit ()
diff --git a/src/tools/dcpomatic_cli.cc b/src/tools/dcpomatic_cli.cc
index 23ca938d4..f55a425ce 100644
--- a/src/tools/dcpomatic_cli.cc
+++ b/src/tools/dcpomatic_cli.cc
@@ -20,7 +20,7 @@
#include <iostream>
#include <iomanip>
#include <getopt.h>
-#include <libdcp/version.h>
+#include <dcp/version.h>
#include "lib/film.h"
#include "lib/filter.h"
#include "lib/transcode_job.h"
diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 26de1c71f..304f4f697 100644
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -190,7 +190,7 @@ main (int argc, char* argv[])
for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
if (ic) {
- ic->set_video_length (still_length * 24);
+ ic->set_video_length (ContentTime::from_seconds (still_length));
}
}
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 758060a08..6257d60af 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -18,7 +18,7 @@
*/
#include <getopt.h>
-#include <libdcp/certificates.h>
+#include <dcp/certificates.h>
#include "lib/film.h"
#include "lib/cinema.h"
#include "lib/kdm.h"
@@ -41,8 +41,8 @@ help ()
cerr << "Syntax: " << program_name << " [OPTION] [<FILM>]\n"
" -h, --help show this help\n"
" -o, --output output file or directory\n"
- " -f, --valid-from valid from time (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
- " -t, --valid-to valid to time (e.g. \"2014-09-28 01:41:51\")\n"
+ " -f, --valid-from valid from time (in local time zone) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n"
+ " -t, --valid-to valid to time (in local time zone) (e.g. \"2014-09-28 01:41:51\")\n"
" -d, --valid-duration valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n"
" --formulation modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n"
" -z, --zip ZIP each cinema's KDMs into its own file\n"
@@ -111,7 +111,7 @@ int main (int argc, char* argv[])
bool cinemas = false;
string duration_string;
bool verbose = false;
- libdcp::KDM::Formulation formulation = libdcp::KDM::MODIFIED_TRANSITIONAL_1;
+ dcp::Formulation formulation = dcp::MODIFIED_TRANSITIONAL_1;
program_name = argv[0];
@@ -171,13 +171,13 @@ int main (int argc, char* argv[])
break;
case 'C':
if (string (optarg) == "modified-transitional-1") {
- formulation = libdcp::KDM::MODIFIED_TRANSITIONAL_1;
+ formulation = dcp::MODIFIED_TRANSITIONAL_1;
} else if (string (optarg) == "dci-any") {
- formulation = libdcp::KDM::DCI_ANY;
+ formulation = dcp::DCI_ANY;
} else if (string (optarg) == "dci-specific") {
- formulation = libdcp::KDM::DCI_SPECIFIC;
+ formulation = dcp::DCI_SPECIFIC;
} else {
- error ("unrecognised KDM formulation " + formulation);
+ error ("unrecognised KDM formulation " + string (optarg));
}
}
}
@@ -248,8 +248,8 @@ int main (int argc, char* argv[])
error ("you must specify --output");
}
- shared_ptr<libdcp::Certificate> certificate (new libdcp::Certificate (boost::filesystem::path (certificate_file)));
- libdcp::KDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
+ dcp::Certificate certificate (dcp::file_to_string (certificate_file));
+ dcp::EncryptedKDM kdm = film->make_kdm (certificate, cpl, valid_from.get(), valid_to.get(), formulation);
kdm.as_xml (output);
if (verbose) {
cout << "Generated KDM " << output << " for certificate.\n";
@@ -273,12 +273,18 @@ int main (int argc, char* argv[])
try {
if (zip) {
- write_kdm_zip_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation, output);
+ write_kdm_zip_files (
+ film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
+ );
+
if (verbose) {
cout << "Wrote ZIP files to " << output << "\n";
}
} else {
- write_kdm_files (film, (*i)->screens(), cpl, valid_from.get(), valid_to.get(), formulation, output);
+ write_kdm_files (
+ film, (*i)->screens(), cpl, dcp::LocalTime (valid_from.get()), dcp::LocalTime (valid_to.get()), formulation, output
+ );
+
if (verbose) {
cout << "Wrote KDM files to " << output << "\n";
}
diff --git a/src/tools/dcpomatic_server_cli.cc b/src/tools/dcpomatic_server_cli.cc
index f35797954..b816460a3 100644
--- a/src/tools/dcpomatic_server_cli.cc
+++ b/src/tools/dcpomatic_server_cli.cc
@@ -32,7 +32,7 @@
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include "lib/config.h"
-#include "lib/dcp_video_frame.h"
+#include "lib/dcp_video.h"
#include "lib/exceptions.h"
#include "lib/util.h"
#include "lib/config.h"
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index ba09e24da..ab8f2fca7 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.6.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/tools/dcpomatic.cc:306
+#: src/tools/dcpomatic.cc:309
msgid "%1 already exists as a file, so you cannot use it for a new film."
msgstr ""
"%1 existiert bereits als Datei, kann also nicht für einen neuen Film benutzt "
@@ -28,70 +28,70 @@ msgstr ""
msgid "&Add Film..."
msgstr "&Projekt hinzufügen"
-#: src/tools/dcpomatic.cc:652
+#: src/tools/dcpomatic.cc:655
msgid "&Content"
msgstr "&Quelle..."
-#: src/tools/dcpomatic.cc:650
+#: src/tools/dcpomatic.cc:653
msgid "&Edit"
msgstr "&Bearbeiten"
-#: src/tools/dcpomatic.cc:614
+#: src/tools/dcpomatic.cc:617
msgid "&Exit"
msgstr "&Ende"
-#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:651 src/tools/dcpomatic_batch.cc:56
msgid "&File"
msgstr "&Datei"
-#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:57
msgid "&Help"
msgstr "&Hilfe"
-#: src/tools/dcpomatic.cc:653
+#: src/tools/dcpomatic.cc:656
msgid "&Jobs"
msgstr "&Aufgaben"
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:634
#, fuzzy
msgid "&Make DCP\tCtrl-M"
msgstr "&DCP erstellen\tCtrl-M"
-#: src/tools/dcpomatic.cc:601
+#: src/tools/dcpomatic.cc:604
#, fuzzy
msgid "&Open...\tCtrl-O"
msgstr "&Öffnen...\tCtrl-O"
-#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:623 src/tools/dcpomatic.cc:626
#, fuzzy
msgid "&Preferences...\tCtrl-P"
msgstr "&Einstellungen...\tCtrl-P"
-#: src/tools/dcpomatic.cc:605
+#: src/tools/dcpomatic.cc:608
msgid "&Properties..."
msgstr "&Eigenschaften..."
-#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:619 src/tools/dcpomatic_batch.cc:51
msgid "&Quit"
msgstr "&Beenden"
-#: src/tools/dcpomatic.cc:603
+#: src/tools/dcpomatic.cc:606
msgid "&Save\tCtrl-S"
msgstr ""
-#: src/tools/dcpomatic.cc:633
+#: src/tools/dcpomatic.cc:636
msgid "&Send DCP to TMS"
msgstr "&DCP an TMS senden"
-#: src/tools/dcpomatic.cc:654
+#: src/tools/dcpomatic.cc:657
msgid "&Tools"
msgstr "&Werkzeuge"
-#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:54
msgid "About"
msgstr "Über"
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:646
msgid "About DCP-o-matic"
msgstr "Über DCP-o-matic"
@@ -99,7 +99,7 @@ msgstr "Über DCP-o-matic"
msgid "Add Film..."
msgstr "Projekt hinzufügen..."
-#: src/tools/dcpomatic.cc:821
+#: src/tools/dcpomatic.cc:827
#, fuzzy, c-format
msgid ""
"An exception occurred (%s). Please report this problem to the DCP-o-matic "
@@ -108,7 +108,7 @@ msgstr ""
"Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
"den Autor von DCP-o-matic (carl@dcpomatic.com)!"
-#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
+#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
msgid ""
"An unknown exception occurred. Please report this problem to the DCP-o-"
"matic author (carl@dcpomatic.com)."
@@ -116,38 +116,38 @@ msgstr ""
"Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
"den Autor von DCP-o-matic (carl@dcpomatic.com)!"
-#: src/tools/dcpomatic.cc:418
+#: src/tools/dcpomatic.cc:421
msgid "An unknown exeception occurred."
msgstr "Ein unbekannter Fehler ist aufgetreten."
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:417
msgid "CPL's content is not encrypted."
msgstr "Medien der CPL sind nicht verschlüsselt worden."
-#: src/tools/dcpomatic.cc:639
+#: src/tools/dcpomatic.cc:642
msgid "Check for updates"
msgstr "Auf Updates überprüfen..."
-#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:766 src/tools/dcpomatic_batch.cc:238
msgid "Could not load film %1 (%2)"
msgstr "Film %1 (%2) konnte nicht geladen werden"
-#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:260 src/tools/dcpomatic_batch.cc:175
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Der Film konnte nicht bei %s (%s) geöffnet werden"
-#: src/tools/dcpomatic.cc:464
+#: src/tools/dcpomatic.cc:467
msgid "Could not show DCP (could not run konqueror)"
msgstr ""
"DCP kann nicht angezeigt werden (Konqueror konnte nicht gestartet werden)"
-#: src/tools/dcpomatic.cc:457
+#: src/tools/dcpomatic.cc:460
msgid "Could not show DCP (could not run nautilus)"
msgstr "DCP kann nicht angezeigt werden (Nautilus konnte nicht geladen werden)"
-#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:721
+#: src/tools/dcpomatic.cc:757
msgid "DCP-o-matic"
msgstr "DCP-o-matic"
@@ -155,48 +155,48 @@ msgstr "DCP-o-matic"
msgid "DCP-o-matic Batch Converter"
msgstr "DCP-o-matic Batch Converter"
-#: src/tools/dcpomatic.cc:638
+#: src/tools/dcpomatic.cc:641
msgid "Encoding servers..."
msgstr "Encoding Server..."
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:84
msgid "Film changed"
msgstr "Projekt gewechselt"
-#: src/tools/dcpomatic.cc:637
+#: src/tools/dcpomatic.cc:640
msgid "Hints...\tCtrl-H"
msgstr "Tipps...\tCtrl-H"
-#: src/tools/dcpomatic.cc:632
+#: src/tools/dcpomatic.cc:635
msgid "Make &KDMs...\tCtrl-K"
msgstr "&KDM erstellen...\tCtrl-K"
-#: src/tools/dcpomatic.cc:600
+#: src/tools/dcpomatic.cc:603
msgid "New...\tCtrl-N"
msgstr "Neu...\tCtrl-N"
-#: src/tools/dcpomatic.cc:634
+#: src/tools/dcpomatic.cc:637
msgid "S&how DCP"
msgstr "Z&eige DCP"
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:83
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Änderungen des Projekts \"%s\" vor dem Schließen speichern ?"
-#: src/tools/dcpomatic.cc:628
+#: src/tools/dcpomatic.cc:631
msgid "Scale to fit &height"
msgstr "...skalieren auf &Höhe DCI-Container"
-#: src/tools/dcpomatic.cc:627
+#: src/tools/dcpomatic.cc:630
msgid "Scale to fit &width"
msgstr "...skalieren auf &Breite DCI-Container"
-#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:325 src/tools/dcpomatic_batch.cc:152
msgid "Select film to open"
msgstr "Zu öffnendes Projekt auswählen"
-#: src/tools/dcpomatic.cc:385
+#: src/tools/dcpomatic.cc:388
#, c-format
msgid ""
"The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -205,11 +205,11 @@ msgstr ""
"Das DCP für diesen Film wird etwa %.1f Gbyte groß. Auf dem ausgewählten "
"Laufwerk sind aber nur %.1f Gbyte frei. Möchten Sie trotzdem weitermachen ?"
-#: src/tools/dcpomatic.cc:870
+#: src/tools/dcpomatic.cc:876
msgid "The DCP-o-matic download server could not be contacted."
msgstr "Der DCP-o-matic Download Server ist nicht erreichbar."
-#: src/tools/dcpomatic.cc:296
+#: src/tools/dcpomatic.cc:299
msgid ""
"The directory %1 already exists and is not empty. Are you sure you want to "
"use it?"
@@ -217,17 +217,17 @@ msgstr ""
"Der Ordner %1 existiert bereits und ist nicht leer. Wollen Sie ihn trotzdem "
"benutzen ?"
-#: src/tools/dcpomatic.cc:865
+#: src/tools/dcpomatic.cc:871
msgid "There are no new versions of DCP-o-matic available."
msgstr "Es ist keine neue Version von DCP-o-matic verfügbar."
-#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic_batch.cc:111
msgid "There are unfinished jobs; are you sure you want to quit?"
msgstr ""
"Manche Aufgaben sind nicht erledigt - sind Sie sicher, dass Sie Beenden "
"wollen ?"
-#: src/tools/dcpomatic.cc:243
+#: src/tools/dcpomatic.cc:246
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."
@@ -236,11 +236,11 @@ msgstr ""
"worden und wird in dieser Programmversion möglicherweise nicht korrekt "
"umgesetzt. Bitte prüfen Sie alle Projekteinstellungen sorgfältig!"
-#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic_batch.cc:112
msgid "Unfinished jobs"
msgstr "Unerledigte Aufgaben"
-#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:334 src/tools/dcpomatic_batch.cc:161
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index e37d375e0..c4074fb12 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.4\n"
-#: src/tools/dcpomatic.cc:306
+#: src/tools/dcpomatic.cc:309
msgid "%1 already exists as a file, so you cannot use it for a new film."
msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
@@ -25,70 +25,70 @@ msgstr "%1 ya existe como fichero, no puedes usarlo para una nueva película."
msgid "&Add Film..."
msgstr "&Añadir película..."
-#: src/tools/dcpomatic.cc:652
+#: src/tools/dcpomatic.cc:655
msgid "&Content"
msgstr ""
-#: src/tools/dcpomatic.cc:650
+#: src/tools/dcpomatic.cc:653
msgid "&Edit"
msgstr "&Editar"
-#: src/tools/dcpomatic.cc:614
+#: src/tools/dcpomatic.cc:617
msgid "&Exit"
msgstr "&Salir"
-#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:651 src/tools/dcpomatic_batch.cc:56
msgid "&File"
msgstr "&Archivo"
-#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:57
msgid "&Help"
msgstr "&Ayuda"
-#: src/tools/dcpomatic.cc:653
+#: src/tools/dcpomatic.cc:656
msgid "&Jobs"
msgstr "&Tareas"
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:634
#, fuzzy
msgid "&Make DCP\tCtrl-M"
msgstr "&Crear DCP\tCtrl-M"
-#: src/tools/dcpomatic.cc:601
+#: src/tools/dcpomatic.cc:604
#, fuzzy
msgid "&Open...\tCtrl-O"
msgstr "&Abrir...\tCtrl-O"
-#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:623 src/tools/dcpomatic.cc:626
#, fuzzy
msgid "&Preferences...\tCtrl-P"
msgstr "&Preferencias...\tCtrl-P"
-#: src/tools/dcpomatic.cc:605
+#: src/tools/dcpomatic.cc:608
msgid "&Properties..."
msgstr "&Propiedades..."
-#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:619 src/tools/dcpomatic_batch.cc:51
msgid "&Quit"
msgstr "&Salir"
-#: src/tools/dcpomatic.cc:603
+#: src/tools/dcpomatic.cc:606
msgid "&Save\tCtrl-S"
msgstr ""
-#: src/tools/dcpomatic.cc:633
+#: src/tools/dcpomatic.cc:636
msgid "&Send DCP to TMS"
msgstr "&Enviar DCP al TMS"
-#: src/tools/dcpomatic.cc:654
+#: src/tools/dcpomatic.cc:657
msgid "&Tools"
msgstr "&Herramientas"
-#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:54
msgid "About"
msgstr "Acerca de"
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:646
msgid "About DCP-o-matic"
msgstr "Acerca de DVD-o-matic"
@@ -96,50 +96,50 @@ msgstr "Acerca de DVD-o-matic"
msgid "Add Film..."
msgstr "Añadir película..."
-#: src/tools/dcpomatic.cc:821
+#: src/tools/dcpomatic.cc:827
#, c-format
msgid ""
"An exception occurred (%s). Please report this problem to the DCP-o-matic "
"author (carl@dcpomatic.com)."
msgstr ""
-#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
+#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
msgid ""
"An unknown exception occurred. Please report this problem to the DCP-o-"
"matic author (carl@dcpomatic.com)."
msgstr ""
-#: src/tools/dcpomatic.cc:418
+#: src/tools/dcpomatic.cc:421
msgid "An unknown exeception occurred."
msgstr "Ha ocurrido un error desconocido."
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:417
msgid "CPL's content is not encrypted."
msgstr ""
-#: src/tools/dcpomatic.cc:639
+#: src/tools/dcpomatic.cc:642
msgid "Check for updates"
msgstr "Buscar actualizaciones"
-#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:766 src/tools/dcpomatic_batch.cc:238
msgid "Could not load film %1 (%2)"
msgstr "No se pudo cargar la película %s (%s)"
-#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:260 src/tools/dcpomatic_batch.cc:175
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "No se pudo cargar la película en %s (%s)"
-#: src/tools/dcpomatic.cc:464
+#: src/tools/dcpomatic.cc:467
msgid "Could not show DCP (could not run konqueror)"
msgstr "No se pudo mostrar el DCP (no se pudo ejecutar konqueror)"
-#: src/tools/dcpomatic.cc:457
+#: src/tools/dcpomatic.cc:460
msgid "Could not show DCP (could not run nautilus)"
msgstr "No se pudo mostrar el DCP (no se pudo ejecutar nautilos)"
-#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:721
+#: src/tools/dcpomatic.cc:757
msgid "DCP-o-matic"
msgstr "DCP-o-matic"
@@ -147,51 +147,51 @@ msgstr "DCP-o-matic"
msgid "DCP-o-matic Batch Converter"
msgstr "Convertidor por lotes DCP-o-matic"
-#: src/tools/dcpomatic.cc:638
+#: src/tools/dcpomatic.cc:641
msgid "Encoding servers..."
msgstr "Servidores de codificación..."
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:84
msgid "Film changed"
msgstr "Película cambiada"
-#: src/tools/dcpomatic.cc:637
+#: src/tools/dcpomatic.cc:640
#, fuzzy
msgid "Hints...\tCtrl-H"
msgstr "Pistas...\tCtrl-H"
-#: src/tools/dcpomatic.cc:632
+#: src/tools/dcpomatic.cc:635
#, fuzzy
msgid "Make &KDMs...\tCtrl-K"
msgstr "Crear &KDMs...\tCtrl-K"
-#: src/tools/dcpomatic.cc:600
+#: src/tools/dcpomatic.cc:603
#, fuzzy
msgid "New...\tCtrl-N"
msgstr "Nuevo...\tCtrl-N"
-#: src/tools/dcpomatic.cc:634
+#: src/tools/dcpomatic.cc:637
msgid "S&how DCP"
msgstr "&Mostrar DCP"
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:83
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Guardar cambios de la película \"%s\" antes de cerrar?"
-#: src/tools/dcpomatic.cc:628
+#: src/tools/dcpomatic.cc:631
msgid "Scale to fit &height"
msgstr ""
-#: src/tools/dcpomatic.cc:627
+#: src/tools/dcpomatic.cc:630
msgid "Scale to fit &width"
msgstr ""
-#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:325 src/tools/dcpomatic_batch.cc:152
msgid "Select film to open"
msgstr "Selecciona la película a abrir"
-#: src/tools/dcpomatic.cc:385
+#: src/tools/dcpomatic.cc:388
#, c-format
msgid ""
"The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -201,26 +201,26 @@ msgstr ""
"seleccionado solo tiene %.1f Gb disponibles. Quieres continuar de todas "
"formas?"
-#: src/tools/dcpomatic.cc:870
+#: src/tools/dcpomatic.cc:876
msgid "The DCP-o-matic download server could not be contacted."
msgstr "Imposible conectar con el servidor de descarga de DCP-o-matic."
-#: src/tools/dcpomatic.cc:296
+#: src/tools/dcpomatic.cc:299
msgid ""
"The directory %1 already exists and is not empty. Are you sure you want to "
"use it?"
msgstr ""
"El directorio %1 ya existe y no está vacío. ¿Estás seguro de querer usarlo?"
-#: src/tools/dcpomatic.cc:865
+#: src/tools/dcpomatic.cc:871
msgid "There are no new versions of DCP-o-matic available."
msgstr "No hay disponibles nuevas versiones de DCP-o-matic."
-#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic_batch.cc:111
msgid "There are unfinished jobs; are you sure you want to quit?"
msgstr "Hay trabajos sin finalizar; ¿estás seguro de querer cerrar?"
-#: src/tools/dcpomatic.cc:243
+#: src/tools/dcpomatic.cc:246
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."
@@ -229,11 +229,11 @@ msgstr ""
"cargue correctamente en esta versión. Por favor revisa cuidadosamente las "
"opciones."
-#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic_batch.cc:112
msgid "Unfinished jobs"
msgstr "Trabajos sin finalizar"
-#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:334 src/tools/dcpomatic_batch.cc:161
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 75eed5623..6d426d432 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.6\n"
-#: src/tools/dcpomatic.cc:306
+#: src/tools/dcpomatic.cc:309
msgid "%1 already exists as a file, so you cannot use it for a new film."
msgstr ""
"Le fichier %1 existe déjà, vous ne pouvez l'utiliser pour un nouveau projet."
@@ -26,70 +26,70 @@ msgstr ""
msgid "&Add Film..."
msgstr "&Ajouter Film..."
-#: src/tools/dcpomatic.cc:652
+#: src/tools/dcpomatic.cc:655
msgid "&Content"
msgstr "&Contenu"
-#: src/tools/dcpomatic.cc:650
+#: src/tools/dcpomatic.cc:653
msgid "&Edit"
msgstr "&Edition"
-#: src/tools/dcpomatic.cc:614
+#: src/tools/dcpomatic.cc:617
msgid "&Exit"
msgstr "&Quitter"
-#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:651 src/tools/dcpomatic_batch.cc:56
msgid "&File"
msgstr "&Fichier"
-#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:57
msgid "&Help"
msgstr "&Aide"
-#: src/tools/dcpomatic.cc:653
+#: src/tools/dcpomatic.cc:656
msgid "&Jobs"
msgstr "&Travaux"
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:634
#, fuzzy
msgid "&Make DCP\tCtrl-M"
msgstr "&Créer le DCP\tCtrl-M"
-#: src/tools/dcpomatic.cc:601
+#: src/tools/dcpomatic.cc:604
#, fuzzy
msgid "&Open...\tCtrl-O"
msgstr "&Ouvrir...\tCtrl-O"
-#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:623 src/tools/dcpomatic.cc:626
#, fuzzy
msgid "&Preferences...\tCtrl-P"
msgstr "&Préférences...\tCtrl-P"
-#: src/tools/dcpomatic.cc:605
+#: src/tools/dcpomatic.cc:608
msgid "&Properties..."
msgstr "&Propriétés..."
-#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:619 src/tools/dcpomatic_batch.cc:51
msgid "&Quit"
msgstr "&Quitter"
-#: src/tools/dcpomatic.cc:603
+#: src/tools/dcpomatic.cc:606
msgid "&Save\tCtrl-S"
msgstr ""
-#: src/tools/dcpomatic.cc:633
+#: src/tools/dcpomatic.cc:636
msgid "&Send DCP to TMS"
msgstr "&Envoyer le DCP au TMS"
-#: src/tools/dcpomatic.cc:654
+#: src/tools/dcpomatic.cc:657
msgid "&Tools"
msgstr "&Outils"
-#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:54
msgid "About"
msgstr "A propos"
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:646
msgid "About DCP-o-matic"
msgstr "À propos de DCP-o-matic"
@@ -97,7 +97,7 @@ msgstr "À propos de DCP-o-matic"
msgid "Add Film..."
msgstr "Ajouter Film..."
-#: src/tools/dcpomatic.cc:821
+#: src/tools/dcpomatic.cc:827
#, fuzzy, c-format
msgid ""
"An exception occurred (%s). Please report this problem to the DCP-o-matic "
@@ -106,7 +106,7 @@ msgstr ""
"Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
"matic (carl@dcpomatic.com)."
-#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
+#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
msgid ""
"An unknown exception occurred. Please report this problem to the DCP-o-"
"matic author (carl@dcpomatic.com)."
@@ -114,37 +114,37 @@ msgstr ""
"Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
"matic (carl@dcpomatic.com)."
-#: src/tools/dcpomatic.cc:418
+#: src/tools/dcpomatic.cc:421
msgid "An unknown exeception occurred."
msgstr "Exception inconnue"
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:417
msgid "CPL's content is not encrypted."
msgstr "Le contenu du CPL n'est pas crypté."
-#: src/tools/dcpomatic.cc:639
+#: src/tools/dcpomatic.cc:642
msgid "Check for updates"
msgstr "Recherche mises à jour"
-#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:766 src/tools/dcpomatic_batch.cc:238
msgid "Could not load film %1 (%2)"
msgstr "Impossible de charger le film %1 (%2)"
-#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:260 src/tools/dcpomatic_batch.cc:175
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Impossible d'ouvrir le film à %s (%s)"
-#: src/tools/dcpomatic.cc:464
+#: src/tools/dcpomatic.cc:467
msgid "Could not show DCP (could not run konqueror)"
msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
-#: src/tools/dcpomatic.cc:457
+#: src/tools/dcpomatic.cc:460
msgid "Could not show DCP (could not run nautilus)"
msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
-#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:721
+#: src/tools/dcpomatic.cc:757
msgid "DCP-o-matic"
msgstr "DCP-o-matic"
@@ -152,49 +152,49 @@ msgstr "DCP-o-matic"
msgid "DCP-o-matic Batch Converter"
msgstr "DCP-o-matic - Convertisseur par lots"
-#: src/tools/dcpomatic.cc:638
+#: src/tools/dcpomatic.cc:641
msgid "Encoding servers..."
msgstr "Serveurs d'encodage"
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:84
msgid "Film changed"
msgstr "Film changé"
-#: src/tools/dcpomatic.cc:637
+#: src/tools/dcpomatic.cc:640
#, fuzzy
msgid "Hints...\tCtrl-H"
msgstr "Conseils...\tCtrl-H"
-#: src/tools/dcpomatic.cc:632
+#: src/tools/dcpomatic.cc:635
msgid "Make &KDMs...\tCtrl-K"
msgstr "Générer &KDMs...\tCtrl-K"
-#: src/tools/dcpomatic.cc:600
+#: src/tools/dcpomatic.cc:603
msgid "New...\tCtrl-N"
msgstr "Nouveau...\tCtrl-N"
-#: src/tools/dcpomatic.cc:634
+#: src/tools/dcpomatic.cc:637
msgid "S&how DCP"
msgstr "Voir le DCP"
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:83
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
-#: src/tools/dcpomatic.cc:628
+#: src/tools/dcpomatic.cc:631
msgid "Scale to fit &height"
msgstr "Adapter pour remplir la &hauteur"
-#: src/tools/dcpomatic.cc:627
+#: src/tools/dcpomatic.cc:630
msgid "Scale to fit &width"
msgstr "Adapter pour remplir la largeur"
-#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:325 src/tools/dcpomatic_batch.cc:152
msgid "Select film to open"
msgstr "Sélectionner le film à ouvrir"
-#: src/tools/dcpomatic.cc:385
+#: src/tools/dcpomatic.cc:388
#, c-format
msgid ""
"The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -203,26 +203,26 @@ msgstr ""
"Le DCP de ce film pèsera environ %.1f Go. Le disque que vous utilisez n'a "
"que %.1f Go disponible(s). Souhaitez-vous continuer?"
-#: src/tools/dcpomatic.cc:870
+#: src/tools/dcpomatic.cc:876
msgid "The DCP-o-matic download server could not be contacted."
msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
-#: src/tools/dcpomatic.cc:296
+#: src/tools/dcpomatic.cc:299
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/dcpomatic.cc:865
+#: src/tools/dcpomatic.cc:871
msgid "There are no new versions of DCP-o-matic available."
msgstr "Aucune mise à jour disponible pour DCP-o-matic."
-#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic_batch.cc:111
msgid "There are unfinished jobs; are you sure you want to quit?"
msgstr "Il y a des tâches inachevées ; voulez-vous vraiment quitter ?"
-#: src/tools/dcpomatic.cc:243
+#: src/tools/dcpomatic.cc:246
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."
@@ -231,11 +231,11 @@ msgstr ""
"être ouvert correctement dans cette version. Veuillez vérifier les "
"paramètres de réglages très attentivement."
-#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic_batch.cc:112
msgid "Unfinished jobs"
msgstr "Travaux incomplets"
-#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:334 src/tools/dcpomatic_batch.cc:161
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 07b348c13..7f7baddaf 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/po/it_IT.po
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.3\n"
-#: src/tools/dcpomatic.cc:306
+#: src/tools/dcpomatic.cc:309
msgid "%1 already exists as a file, so you cannot use it for a new film."
msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
@@ -25,67 +25,67 @@ msgstr "%1 esiste già il file, non è possibile usarlo per un nuovo film"
msgid "&Add Film..."
msgstr ""
-#: src/tools/dcpomatic.cc:652
+#: src/tools/dcpomatic.cc:655
msgid "&Content"
msgstr ""
-#: src/tools/dcpomatic.cc:650
+#: src/tools/dcpomatic.cc:653
msgid "&Edit"
msgstr "&Modifica"
-#: src/tools/dcpomatic.cc:614
+#: src/tools/dcpomatic.cc:617
msgid "&Exit"
msgstr "&Esci"
-#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:651 src/tools/dcpomatic_batch.cc:56
msgid "&File"
msgstr "&File"
-#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:57
msgid "&Help"
msgstr "&Aiuto"
-#: src/tools/dcpomatic.cc:653
+#: src/tools/dcpomatic.cc:656
msgid "&Jobs"
msgstr "&Lavori"
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:634
msgid "&Make DCP\tCtrl-M"
msgstr "&Crea DCP\tCtrl-M"
-#: src/tools/dcpomatic.cc:601
+#: src/tools/dcpomatic.cc:604
msgid "&Open...\tCtrl-O"
msgstr "&Apri...\tCtrl-O"
-#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:623 src/tools/dcpomatic.cc:626
msgid "&Preferences...\tCtrl-P"
msgstr "&Preferenze...\tCtrl-P"
-#: src/tools/dcpomatic.cc:605
+#: src/tools/dcpomatic.cc:608
msgid "&Properties..."
msgstr "&Proprieta'..."
-#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:619 src/tools/dcpomatic_batch.cc:51
msgid "&Quit"
msgstr "&Esci"
-#: src/tools/dcpomatic.cc:603
+#: src/tools/dcpomatic.cc:606
msgid "&Save\tCtrl-S"
msgstr ""
-#: src/tools/dcpomatic.cc:633
+#: src/tools/dcpomatic.cc:636
msgid "&Send DCP to TMS"
msgstr "&Invia DCP a TMS"
-#: src/tools/dcpomatic.cc:654
+#: src/tools/dcpomatic.cc:657
msgid "&Tools"
msgstr "&Strumenti"
-#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:54
msgid "About"
msgstr "Informazioni"
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:646
msgid "About DCP-o-matic"
msgstr "Su DVD-o-matic"
@@ -93,50 +93,50 @@ msgstr "Su DVD-o-matic"
msgid "Add Film..."
msgstr ""
-#: src/tools/dcpomatic.cc:821
+#: src/tools/dcpomatic.cc:827
#, c-format
msgid ""
"An exception occurred (%s). Please report this problem to the DCP-o-matic "
"author (carl@dcpomatic.com)."
msgstr ""
-#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
+#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
msgid ""
"An unknown exception occurred. Please report this problem to the DCP-o-"
"matic author (carl@dcpomatic.com)."
msgstr ""
-#: src/tools/dcpomatic.cc:418
+#: src/tools/dcpomatic.cc:421
msgid "An unknown exeception occurred."
msgstr ""
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:417
msgid "CPL's content is not encrypted."
msgstr ""
-#: src/tools/dcpomatic.cc:639
+#: src/tools/dcpomatic.cc:642
msgid "Check for updates"
msgstr "Controlla aggiornamenti"
-#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:766 src/tools/dcpomatic_batch.cc:238
msgid "Could not load film %1 (%2)"
msgstr "Non posso caricare il film %s (%s)"
-#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:260 src/tools/dcpomatic_batch.cc:175
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Non posso aprire il film in %s (%s)"
-#: src/tools/dcpomatic.cc:464
+#: src/tools/dcpomatic.cc:467
msgid "Could not show DCP (could not run konqueror)"
msgstr ""
-#: src/tools/dcpomatic.cc:457
+#: src/tools/dcpomatic.cc:460
msgid "Could not show DCP (could not run nautilus)"
msgstr ""
-#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:721
+#: src/tools/dcpomatic.cc:757
msgid "DCP-o-matic"
msgstr "DCP-o-matic"
@@ -144,48 +144,48 @@ msgstr "DCP-o-matic"
msgid "DCP-o-matic Batch Converter"
msgstr ""
-#: src/tools/dcpomatic.cc:638
+#: src/tools/dcpomatic.cc:641
msgid "Encoding servers..."
msgstr ""
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:84
msgid "Film changed"
msgstr "Film modificato"
-#: src/tools/dcpomatic.cc:637
+#: src/tools/dcpomatic.cc:640
msgid "Hints...\tCtrl-H"
msgstr "Suggerimenti...\tCtrl-H"
-#: src/tools/dcpomatic.cc:632
+#: src/tools/dcpomatic.cc:635
msgid "Make &KDMs...\tCtrl-K"
msgstr ""
-#: src/tools/dcpomatic.cc:600
+#: src/tools/dcpomatic.cc:603
msgid "New...\tCtrl-N"
msgstr "Nuovo...\tCtrl-N"
-#: src/tools/dcpomatic.cc:634
+#: src/tools/dcpomatic.cc:637
msgid "S&how DCP"
msgstr "&Mostra DCP"
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:83
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
-#: src/tools/dcpomatic.cc:628
+#: src/tools/dcpomatic.cc:631
msgid "Scale to fit &height"
msgstr ""
-#: src/tools/dcpomatic.cc:627
+#: src/tools/dcpomatic.cc:630
msgid "Scale to fit &width"
msgstr ""
-#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:325 src/tools/dcpomatic_batch.cc:152
msgid "Select film to open"
msgstr "Seleziona il film da aprire"
-#: src/tools/dcpomatic.cc:385
+#: src/tools/dcpomatic.cc:388
#, c-format
msgid ""
"The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -194,35 +194,35 @@ msgstr ""
"Il DCP di questo film occupa %.1f Gb, ma il disco che stai usando dispone di "
"%.1f Gb liberi. Vuoi continuare ugualmente?"
-#: src/tools/dcpomatic.cc:870
+#: src/tools/dcpomatic.cc:876
msgid "The DCP-o-matic download server could not be contacted."
msgstr "Il download server di DCP-o-matic non può essere contattato."
-#: src/tools/dcpomatic.cc:296
+#: src/tools/dcpomatic.cc:299
msgid ""
"The directory %1 already exists and is not empty. Are you sure you want to "
"use it?"
msgstr "La cartella %1 esiste già e non è vuota. Sei sicuro di volerla usare?"
-#: src/tools/dcpomatic.cc:865
+#: src/tools/dcpomatic.cc:871
msgid "There are no new versions of DCP-o-matic available."
msgstr "Non ci sono nuove versioni di DCP-o-matic disponibili."
-#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic_batch.cc:111
msgid "There are unfinished jobs; are you sure you want to quit?"
msgstr "C'è un processo in corso: sei sicuro di voler uscire?"
-#: src/tools/dcpomatic.cc:243
+#: src/tools/dcpomatic.cc:246
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 ""
-#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic_batch.cc:112
msgid "Unfinished jobs"
msgstr "Processo in corso"
-#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:334 src/tools/dcpomatic_batch.cc:161
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index c77c54b95..02eafd9cc 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.po
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: Poedit 1.6.9\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/tools/dcpomatic.cc:306
+#: src/tools/dcpomatic.cc:309
msgid "%1 already exists as a file, so you cannot use it for a new film."
msgstr ""
"%1 Dit bestand bestaat al, hierdoor kunt u het niet gebruiken voor een "
@@ -28,27 +28,27 @@ msgstr ""
msgid "&Add Film..."
msgstr "Open een DCP map"
-#: src/tools/dcpomatic.cc:652
+#: src/tools/dcpomatic.cc:655
msgid "&Content"
msgstr "&Content"
-#: src/tools/dcpomatic.cc:650
+#: src/tools/dcpomatic.cc:653
msgid "&Edit"
msgstr "&Edit"
-#: src/tools/dcpomatic.cc:614
+#: src/tools/dcpomatic.cc:617
msgid "&Exit"
msgstr "&Afsluiten"
-#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:651 src/tools/dcpomatic_batch.cc:56
msgid "&File"
msgstr "&Bestand"
-#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:57
msgid "&Help"
msgstr "&Help"
-#: src/tools/dcpomatic.cc:653
+#: src/tools/dcpomatic.cc:656
msgid "&Jobs"
msgstr "&Projecten"
@@ -56,39 +56,39 @@ msgstr "&Projecten"
msgid "&Make DCP\tCtrl-M"
msgstr "&Maak een DCP\tCtrl-M"
-#: src/tools/dcpomatic.cc:601
+#: src/tools/dcpomatic.cc:604
msgid "&Open...\tCtrl-O"
msgstr "&Openen...\tCtrl-O"
-#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:623 src/tools/dcpomatic.cc:626
msgid "&Preferences...\tCtrl-P"
msgstr "&Voorkeuren...\tCtrl-P"
-#: src/tools/dcpomatic.cc:605
+#: src/tools/dcpomatic.cc:608
msgid "&Properties..."
msgstr "&Instellingen..."
-#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:619 src/tools/dcpomatic_batch.cc:51
msgid "&Quit"
msgstr "&Afsluiten"
-#: src/tools/dcpomatic.cc:603
+#: src/tools/dcpomatic.cc:606
msgid "&Save\tCtrl-S"
msgstr ""
-#: src/tools/dcpomatic.cc:633
+#: src/tools/dcpomatic.cc:636
msgid "&Send DCP to TMS"
msgstr "&Verstuur DCP naar TMS"
-#: src/tools/dcpomatic.cc:654
+#: src/tools/dcpomatic.cc:657
msgid "&Tools"
msgstr "&Gereedschappen"
-#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:54
msgid "About"
msgstr "Over.."
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:646
msgid "About DCP-o-matic"
msgstr "Over DCP-o-matic"
@@ -96,7 +96,7 @@ msgstr "Over DCP-o-matic"
msgid "Add Film..."
msgstr "Voeg Film Toe"
-#: src/tools/dcpomatic.cc:821
+#: src/tools/dcpomatic.cc:827
#, fuzzy, c-format
msgid ""
"An exception occurred (%s). Please report this problem to the DCP-o-matic "
@@ -105,7 +105,7 @@ msgstr ""
"Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
"(carl@dcpomatic.com)."
-#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
+#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
msgid ""
"An unknown exception occurred. Please report this problem to the DCP-o-"
"matic author (carl@dcpomatic.com)."
@@ -113,37 +113,37 @@ msgstr ""
"Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
"(carl@dcpomatic.com)."
-#: src/tools/dcpomatic.cc:418
+#: src/tools/dcpomatic.cc:421
msgid "An unknown exeception occurred."
msgstr "Er is een onbekende fout opgetreden."
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:417
msgid "CPL's content is not encrypted."
msgstr "De inhoud van de CPL is niet geëncrypteerd."
-#: src/tools/dcpomatic.cc:639
+#: src/tools/dcpomatic.cc:642
msgid "Check for updates"
msgstr "Controleer op updates"
-#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:766 src/tools/dcpomatic_batch.cc:238
msgid "Could not load film %1 (%2)"
msgstr "Kan film niet openen %1 (%2)"
-#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:260 src/tools/dcpomatic_batch.cc:175
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Kan film niet openen in %s (%s)"
-#: src/tools/dcpomatic.cc:464
+#: src/tools/dcpomatic.cc:467
msgid "Could not show DCP (could not run konqueror)"
msgstr "Kan DCP niet vertonen (Kan Konqueror niet starten)"
-#: src/tools/dcpomatic.cc:457
+#: src/tools/dcpomatic.cc:460
msgid "Could not show DCP (could not run nautilus)"
msgstr "Kan DCP niet vertonen (Kan Nautilus niet starten)"
-#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:721
+#: src/tools/dcpomatic.cc:757
msgid "DCP-o-matic"
msgstr "DCP-o-matic"
@@ -151,48 +151,48 @@ msgstr "DCP-o-matic"
msgid "DCP-o-matic Batch Converter"
msgstr "DCP-o-matic Bulk Omzetter"
-#: src/tools/dcpomatic.cc:638
+#: src/tools/dcpomatic.cc:641
msgid "Encoding servers..."
msgstr "Render servers..."
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:84
msgid "Film changed"
msgstr "Film is veranderd"
-#: src/tools/dcpomatic.cc:637
+#: src/tools/dcpomatic.cc:640
msgid "Hints...\tCtrl-H"
msgstr "Tips...\tCtrl-H"
-#: src/tools/dcpomatic.cc:632
+#: src/tools/dcpomatic.cc:635
msgid "Make &KDMs...\tCtrl-K"
msgstr "Maak &KDMs...\tCtrl-K"
-#: src/tools/dcpomatic.cc:600
+#: src/tools/dcpomatic.cc:603
msgid "New...\tCtrl-N"
msgstr "Nieuw...\tCtrl-N"
-#: src/tools/dcpomatic.cc:634
+#: src/tools/dcpomatic.cc:637
msgid "S&how DCP"
msgstr "S&hoe DCP"
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:83
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Bewaar veranderingen naar film \"%s\" voor afsluiten?"
-#: src/tools/dcpomatic.cc:628
+#: src/tools/dcpomatic.cc:631
msgid "Scale to fit &height"
msgstr "Scaal naar &height"
-#: src/tools/dcpomatic.cc:627
+#: src/tools/dcpomatic.cc:630
msgid "Scale to fit &width"
msgstr "Schaal naar &width"
-#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:325 src/tools/dcpomatic_batch.cc:152
msgid "Select film to open"
msgstr "Kies een film om te openen"
-#: src/tools/dcpomatic.cc:385
+#: src/tools/dcpomatic.cc:388
#, c-format
msgid ""
"The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -201,26 +201,26 @@ msgstr ""
"De DCP voor deze film neemt ongeveer %.1f Gb in beslag, er is echter maar "
"%.1f Gb beschikbaar. Wilt u toch doorgaan?"
-#: src/tools/dcpomatic.cc:870
+#: src/tools/dcpomatic.cc:876
msgid "The DCP-o-matic download server could not be contacted."
msgstr "De verbinding met de DCP-o-matic download server is niet beschikbaar."
-#: src/tools/dcpomatic.cc:296
+#: src/tools/dcpomatic.cc:299
msgid ""
"The directory %1 already exists and is not empty. Are you sure you want to "
"use it?"
msgstr "De map %1 bestaat al en is niet leeg. Wilt u deze toch gebruiken?"
-#: src/tools/dcpomatic.cc:865
+#: src/tools/dcpomatic.cc:871
msgid "There are no new versions of DCP-o-matic available."
msgstr "Er is geen nieuwere versie van DCP-o-matic beschikbaar."
-#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic_batch.cc:111
msgid "There are unfinished jobs; are you sure you want to quit?"
msgstr ""
"Er zijn nog niet afgeronde projecten, weet u zeker dat u wilt afsluiten?"
-#: src/tools/dcpomatic.cc:243
+#: src/tools/dcpomatic.cc:246
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."
@@ -228,11 +228,11 @@ msgstr ""
"Deze film is gemaakt met een oude versie van DCP-o-matic en opent mogelijk "
"niet goed in de huidige versie. Controleer alle instellingen zorgvuldig."
-#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic_batch.cc:112
msgid "Unfinished jobs"
msgstr "Niet afgemaakte projecten"
-#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:334 src/tools/dcpomatic_batch.cc:161
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index fbe64370f..9756a16c7 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: DCP-o-matic\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-15 09:37+0100\n"
"PO-Revision-Date: 2014-01-19 08:59+0100\n"
"Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
"Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 1.6.3\n"
-#: src/tools/dcpomatic.cc:306
+#: src/tools/dcpomatic.cc:309
msgid "%1 already exists as a file, so you cannot use it for a new film."
msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
@@ -25,70 +25,70 @@ msgstr "%1 finns redan som fil, så du kan inte använda den för en ny film."
msgid "&Add Film..."
msgstr ""
-#: src/tools/dcpomatic.cc:652
+#: src/tools/dcpomatic.cc:655
msgid "&Content"
msgstr ""
-#: src/tools/dcpomatic.cc:650
+#: src/tools/dcpomatic.cc:653
msgid "&Edit"
msgstr "&Redigera"
-#: src/tools/dcpomatic.cc:614
+#: src/tools/dcpomatic.cc:617
msgid "&Exit"
msgstr "&Avsluta"
-#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:56
+#: src/tools/dcpomatic.cc:651 src/tools/dcpomatic_batch.cc:56
msgid "&File"
msgstr "&Fil"
-#: src/tools/dcpomatic.cc:655 src/tools/dcpomatic_batch.cc:57
+#: src/tools/dcpomatic.cc:658 src/tools/dcpomatic_batch.cc:57
msgid "&Help"
msgstr "&Hjälp"
-#: src/tools/dcpomatic.cc:653
+#: src/tools/dcpomatic.cc:656
msgid "&Jobs"
msgstr "&Jobb"
-#: src/tools/dcpomatic.cc:631
+#: src/tools/dcpomatic.cc:634
#, fuzzy
msgid "&Make DCP\tCtrl-M"
msgstr "&Skapa DCP\tCtrl-M"
-#: src/tools/dcpomatic.cc:601
+#: src/tools/dcpomatic.cc:604
#, fuzzy
msgid "&Open...\tCtrl-O"
msgstr "&Öppna...\tCtrl-O"
-#: src/tools/dcpomatic.cc:620 src/tools/dcpomatic.cc:623
+#: src/tools/dcpomatic.cc:623 src/tools/dcpomatic.cc:626
#, fuzzy
msgid "&Preferences...\tCtrl-P"
msgstr "&Inställningar...\tCtrl-P"
-#: src/tools/dcpomatic.cc:605
+#: src/tools/dcpomatic.cc:608
msgid "&Properties..."
msgstr "&Egenskaper"
-#: src/tools/dcpomatic.cc:616 src/tools/dcpomatic_batch.cc:51
+#: src/tools/dcpomatic.cc:619 src/tools/dcpomatic_batch.cc:51
msgid "&Quit"
msgstr "&Avsluta"
-#: src/tools/dcpomatic.cc:603
+#: src/tools/dcpomatic.cc:606
msgid "&Save\tCtrl-S"
msgstr ""
-#: src/tools/dcpomatic.cc:633
+#: src/tools/dcpomatic.cc:636
msgid "&Send DCP to TMS"
msgstr "&Skicka DCP till TMS"
-#: src/tools/dcpomatic.cc:654
+#: src/tools/dcpomatic.cc:657
msgid "&Tools"
msgstr "&Verktyg"
-#: src/tools/dcpomatic.cc:645 src/tools/dcpomatic_batch.cc:54
+#: src/tools/dcpomatic.cc:648 src/tools/dcpomatic_batch.cc:54
msgid "About"
msgstr "Om"
-#: src/tools/dcpomatic.cc:643
+#: src/tools/dcpomatic.cc:646
msgid "About DCP-o-matic"
msgstr "Om DCP-o-matic"
@@ -96,50 +96,50 @@ msgstr "Om DCP-o-matic"
msgid "Add Film..."
msgstr ""
-#: src/tools/dcpomatic.cc:821
+#: src/tools/dcpomatic.cc:827
#, c-format
msgid ""
"An exception occurred (%s). Please report this problem to the DCP-o-matic "
"author (carl@dcpomatic.com)."
msgstr ""
-#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
+#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
msgid ""
"An unknown exception occurred. Please report this problem to the DCP-o-"
"matic author (carl@dcpomatic.com)."
msgstr ""
-#: src/tools/dcpomatic.cc:418
+#: src/tools/dcpomatic.cc:421
msgid "An unknown exeception occurred."
msgstr ""
-#: src/tools/dcpomatic.cc:414
+#: src/tools/dcpomatic.cc:417
msgid "CPL's content is not encrypted."
msgstr ""
-#: src/tools/dcpomatic.cc:639
+#: src/tools/dcpomatic.cc:642
msgid "Check for updates"
msgstr "Leta efter uppdateringar"
-#: src/tools/dcpomatic.cc:760 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic.cc:766 src/tools/dcpomatic_batch.cc:238
msgid "Could not load film %1 (%2)"
msgstr "Kunde inte öppna filmen %1 (%2)"
-#: src/tools/dcpomatic.cc:257 src/tools/dcpomatic_batch.cc:175
+#: src/tools/dcpomatic.cc:260 src/tools/dcpomatic_batch.cc:175
#, c-format
msgid "Could not open film at %s (%s)"
msgstr "Kunde inte öppna filmen vid %s (%s)"
-#: src/tools/dcpomatic.cc:464
+#: src/tools/dcpomatic.cc:467
msgid "Could not show DCP (could not run konqueror)"
msgstr "Kunde inte visa DCP (kunde inte köra konqueror)"
-#: src/tools/dcpomatic.cc:457
+#: src/tools/dcpomatic.cc:460
msgid "Could not show DCP (could not run nautilus)"
msgstr "Kunde inte visa DCP (kunde inte köra nautilus)"
-#: src/tools/dcpomatic.cc:277 src/tools/dcpomatic.cc:715
-#: src/tools/dcpomatic.cc:751
+#: src/tools/dcpomatic.cc:280 src/tools/dcpomatic.cc:721
+#: src/tools/dcpomatic.cc:757
msgid "DCP-o-matic"
msgstr "DCP-o-matic"
@@ -147,48 +147,48 @@ msgstr "DCP-o-matic"
msgid "DCP-o-matic Batch Converter"
msgstr ""
-#: src/tools/dcpomatic.cc:638
+#: src/tools/dcpomatic.cc:641
msgid "Encoding servers..."
msgstr "Kodningsservrar..."
-#: src/tools/dcpomatic.cc:85
+#: src/tools/dcpomatic.cc:84
msgid "Film changed"
msgstr "Film ändrad"
-#: src/tools/dcpomatic.cc:637
+#: src/tools/dcpomatic.cc:640
msgid "Hints...\tCtrl-H"
msgstr "Råd...\tCtrl-H"
-#: src/tools/dcpomatic.cc:632
+#: src/tools/dcpomatic.cc:635
msgid "Make &KDMs...\tCtrl-K"
msgstr "Skapa &KDM:er...\tCtrl-K"
-#: src/tools/dcpomatic.cc:600
+#: src/tools/dcpomatic.cc:603
msgid "New...\tCtrl-N"
msgstr "Ny...\tCtrl-N"
-#: src/tools/dcpomatic.cc:634
+#: src/tools/dcpomatic.cc:637
msgid "S&how DCP"
msgstr "&Visa DCP"
-#: src/tools/dcpomatic.cc:84
+#: src/tools/dcpomatic.cc:83
#, c-format
msgid "Save changes to film \"%s\" before closing?"
msgstr "Spara ändringarna till filmen \"%s\" före avslut?"
-#: src/tools/dcpomatic.cc:628
+#: src/tools/dcpomatic.cc:631
msgid "Scale to fit &height"
msgstr ""
-#: src/tools/dcpomatic.cc:627
+#: src/tools/dcpomatic.cc:630
msgid "Scale to fit &width"
msgstr ""
-#: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:152
+#: src/tools/dcpomatic.cc:325 src/tools/dcpomatic_batch.cc:152
msgid "Select film to open"
msgstr "Välj film att öppna"
-#: src/tools/dcpomatic.cc:385
+#: src/tools/dcpomatic.cc:388
#, c-format
msgid ""
"The DCP for this film will take up about %.1f Gb, and the disk that you are "
@@ -197,11 +197,11 @@ msgstr ""
"DCP:n för denna film kommer att uppta ungefär %.1f Gb, och disken du "
"använder har bara %.1f Gb ledigt. Vill du fortsätta ändå?"
-#: src/tools/dcpomatic.cc:870
+#: src/tools/dcpomatic.cc:876
msgid "The DCP-o-matic download server could not be contacted."
msgstr "DCP-o-matics nedladdningsserver kunde inte kontaktas."
-#: src/tools/dcpomatic.cc:296
+#: src/tools/dcpomatic.cc:299
msgid ""
"The directory %1 already exists and is not empty. Are you sure you want to "
"use it?"
@@ -209,25 +209,25 @@ msgstr ""
"Foldern %1 finns redan och är inte tom. Är du säker på att du vill använda "
"den?"
-#: src/tools/dcpomatic.cc:865
+#: src/tools/dcpomatic.cc:871
msgid "There are no new versions of DCP-o-matic available."
msgstr "Det finns inga nya versioner av DCP-o-matic tillgängligt."
-#: src/tools/dcpomatic.cc:509 src/tools/dcpomatic_batch.cc:111
+#: src/tools/dcpomatic.cc:512 src/tools/dcpomatic_batch.cc:111
msgid "There are unfinished jobs; are you sure you want to quit?"
msgstr "Det finns oasvlutade jobb; är du säker på att du vill avsluta?"
-#: src/tools/dcpomatic.cc:243
+#: src/tools/dcpomatic.cc:246
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 ""
-#: src/tools/dcpomatic.cc:510 src/tools/dcpomatic_batch.cc:112
+#: src/tools/dcpomatic.cc:513 src/tools/dcpomatic_batch.cc:112
msgid "Unfinished jobs"
msgstr "Oavslutade jobb"
-#: src/tools/dcpomatic.cc:331 src/tools/dcpomatic_batch.cc:161
+#: src/tools/dcpomatic.cc:334 src/tools/dcpomatic_batch.cc:161
msgid ""
"You did not select a folder. Make sure that you select a folder before "
"clicking Open."
diff --git a/src/tools/server_test.cc b/src/tools/server_test.cc
index a5d31fc08..9223efb3e 100644
--- a/src/tools/server_test.cc
+++ b/src/tools/server_test.cc
@@ -27,14 +27,15 @@
#include "lib/util.h"
#include "lib/scaler.h"
#include "lib/server.h"
-#include "lib/dcp_video_frame.h"
+#include "lib/dcp_video.h"
#include "lib/decoder.h"
#include "lib/exceptions.h"
#include "lib/scaler.h"
#include "lib/log.h"
#include "lib/video_decoder.h"
#include "lib/player.h"
-#include "lib/player_video_frame.h"
+#include "lib/player_video.h"
+#include "lib/encoded_data.h"
using std::cout;
using std::cerr;
@@ -45,18 +46,18 @@ using boost::shared_ptr;
static shared_ptr<Film> film;
static ServerDescription* server;
static shared_ptr<FileLog> log_ (new FileLog ("servomatictest.log"));
-static int frame = 0;
+static int frame_count = 0;
void
-process_video (shared_ptr<PlayerVideoFrame> pvf)
+process_video (shared_ptr<PlayerVideo> pvf)
{
- shared_ptr<DCPVideoFrame> local (new DCPVideoFrame (pvf, frame, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
- shared_ptr<DCPVideoFrame> remote (new DCPVideoFrame (pvf, frame, film->video_frame_rate(), 250000000, RESOLUTION_2K, log_));
+ shared_ptr<DCPVideo> local (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, log_));
+ shared_ptr<DCPVideo> remote (new DCPVideo (pvf, frame_count, film->video_frame_rate(), 250000000, RESOLUTION_2K, true, log_));
- cout << "Frame " << frame << ": ";
+ cout << "Frame " << frame_count << ": ";
cout.flush ();
- ++frame;
+ ++frame_count;
shared_ptr<EncodedData> local_encoded = local->encode_locally ();
shared_ptr<EncodedData> remote_encoded;
@@ -144,12 +145,10 @@ main (int argc, char* argv[])
film->read_metadata ();
shared_ptr<Player> player = film->make_player ();
- player->disable_audio ();
- player->Video.connect (boost::bind (process_video, _1));
- bool done = false;
- while (!done) {
- done = player->pass ();
+ DCPTime const frame = DCPTime::from_frames (1, film->video_frame_rate ());
+ for (DCPTime t; t < film->length(); t += frame) {
+ process_video (player->get_video(t, true).front ());
}
} catch (std::exception& e) {
cerr << "Error: " << e.what() << "\n";
diff --git a/src/tools/wscript b/src/tools/wscript
index ac270af70..3811bf760 100644
--- a/src/tools/wscript
+++ b/src/tools/wscript
@@ -11,28 +11,28 @@ def configure(conf):
def build(bld):
for t in ['dcpomatic_cli', 'dcpomatic_server_cli', 'server_test', 'dcpomatic_kdm', 'dcpomatic_create']:
obj = bld(features = 'cxx cxxprogram')
- obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC QUICKMAIL'
+ obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC WXWIDGETS QUICKMAIL SUB'
obj.includes = ['..']
- obj.use = ['libdcpomatic']
+ obj.use = ['libdcpomatic2']
obj.source = '%s.cc' % t
- obj.target = t
+ obj.target = t.replace('dcpomatic', 'dcpomatic2')
if t == 'server_test':
obj.install_path = None
if not bld.env.DISABLE_GUI:
for t in ['dcpomatic', 'dcpomatic_batch', 'dcpomatic_server']:
obj = bld(features = 'cxx cxxprogram')
- obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS QUICKMAIL'
+ obj.uselib = 'BOOST_THREAD BOOST_DATETIME OPENJPEG DCP CXML AVFORMAT AVFILTER AVCODEC AVUTIL SWSCALE POSTPROC CXML WXWIDGETS QUICKMAIL SUB'
if bld.env.BUILD_STATIC:
obj.uselib += ' GTK'
obj.includes = ['..']
- obj.use = ['libdcpomatic', 'libdcpomatic-wx']
+ obj.use = ['libdcpomatic2', 'libdcpomatic2-wx']
obj.source = '%s.cc' % t
if bld.env.TARGET_WINDOWS:
obj.source += ' ../../platform/windows/dcpomatic.rc'
- obj.target = t
+ obj.target = t.replace('dcpomatic', 'dcpomatic2')
- i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic', bld)
+ i18n.po_to_mo(os.path.join('src', 'tools'), 'dcpomatic2', bld)
def pot(bld):
i18n.pot(os.path.join('src', 'tools'), 'dcpomatic.cc dcpomatic_batch.cc', 'dcpomatic')
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-28 03:29:04 +0000