Merge master.

8 files changed, 44 insertions, 44 deletions

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index d08a11ea9..edd04fd51 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -198,7 +198,7 @@ public:
 
 		_film_editor = new FilmEditor (overall_panel);
 		_film_viewer = new FilmViewer (overall_panel);
-		JobManagerView* job_manager_view = new JobManagerView (overall_panel, static_cast<JobManagerView::Buttons> (0));
+		JobManagerView* job_manager_view = new JobManagerView (overall_panel);
 
 		wxBoxSizer* right_sizer = new wxBoxSizer (wxVERTICAL);
 		right_sizer->Add (_film_viewer, 2, wxEXPAND | wxALL, 6);
@@ -418,7 +418,7 @@ private:
 		} catch (exception& e) {
 			error_dialog (this, e.what ());
 		} catch (...) {
-			error_dialog (this, _("An unknown exeception occurred."));
+			error_dialog (this, _("An unknown exception occurred."));
 		}
 	
 		d->Destroy ();
diff --git a/src/tools/dcpomatic_batch.cc b/src/tools/dcpomatic_batch.cc
index de255e65e..b92ca5d71 100644
--- a/src/tools/dcpomatic_batch.cc
+++ b/src/tools/dcpomatic_batch.cc
@@ -77,7 +77,7 @@ public:
 		s->Add (panel, 1, wxEXPAND);
 		SetSizer (s);
 
-		JobManagerView* job_manager_view = new JobManagerView (panel, JobManagerView::PAUSE);
+		JobManagerView* job_manager_view = new JobManagerView (panel);
 		_sizer->Add (job_manager_view, 1, wxALL | wxEXPAND, 6);
 
 		wxSizer* buttons = new wxBoxSizer (wxHORIZONTAL);
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index ab8f2fca7..627bbe6a5 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-13 03:04+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,7 +108,11 @@ 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:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Ein unbekannter Fehler ist aufgetreten."
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -116,11 +120,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:421
-msgid "An unknown exeception occurred."
-msgstr "Ein unbekannter Fehler ist aufgetreten."
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Medien der CPL sind nicht verschlüsselt worden."
 
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index c4074fb12..5c99032c0 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-04-20 10:21-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -103,17 +103,17 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Ha ocurrido un error desconocido."
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr "Ha ocurrido un error desconocido."
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 6d426d432..e338bfdac 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-14 10:43+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -106,7 +106,11 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Exception inconnue"
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -114,11 +118,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:421
-msgid "An unknown exeception occurred."
-msgstr "Exception inconnue"
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Le contenu du CPL n'est pas crypté."
 
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 7f7baddaf..ce52d6543 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: 2014-10-16 16:38+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-02-03 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -100,17 +100,17 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr ""
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
 
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 02eafd9cc..67cd9cbe6 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/po/nl_NL.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-23 22:03+0100\n"
 "PO-Revision-Date: 2014-09-04 20:29+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -105,7 +105,11 @@ msgstr ""
 "Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
 "(carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Er is een onbekende fout opgetreden."
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
@@ -113,11 +117,7 @@ msgstr ""
 "Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
 "(carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr "Er is een onbekende fout opgetreden."
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "De inhoud van de CPL is niet geëncrypteerd."
 
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 9756a16c7..b1849f333 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@ -103,17 +103,17 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:829 src/tools/dcpomatic.cc:838
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:421
-msgid "An unknown exeception occurred."
-msgstr ""
-
-#: src/tools/dcpomatic.cc:417
+#: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""