Merge.

6 files changed, 71 insertions, 55 deletions

diff --git a/src/wx/new_film_dialog.cc b/src/wx/new_film_dialog.cc
index 737b07fbb..191482a7c 100644
--- a/src/wx/new_film_dialog.cc
+++ b/src/wx/new_film_dialog.cc
@@ -29,7 +29,7 @@
 using namespace std;
 using namespace boost;
 
-string NewFilmDialog::_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
+boost::optional<string> NewFilmDialog::_directory;
 
 NewFilmDialog::NewFilmDialog (wxWindow* parent)
 	: wxDialog (parent, wxID_ANY, _("New Film"))
@@ -51,7 +51,12 @@ NewFilmDialog::NewFilmDialog (wxWindow* parent)
 #else	
 	_folder = new wxDirPickerCtrl (this, wxDD_DIR_MUST_EXIST);
 #endif
-	_folder->SetPath (std_to_wx (_directory));
+
+	if (!_directory) {
+		_directory = Config::instance()->default_directory_or (wx_to_std (wxStandardPaths::Get().GetDocumentsDir()));
+	}
+	
+	_folder->SetPath (std_to_wx (_directory.get()));
 	table->Add (_folder, 1, wxEXPAND);
 
 	wxSizer* buttons = CreateSeparatedButtonSizer (wxOK | wxCANCEL);
diff --git a/src/wx/new_film_dialog.h b/src/wx/new_film_dialog.h
index 715f71f51..bfcbd423c 100644
--- a/src/wx/new_film_dialog.h
+++ b/src/wx/new_film_dialog.h
@@ -37,5 +37,5 @@ private:
 #else
 	wxDirPickerCtrl* _folder;
 #endif
-	static std::string _directory;
+	static boost::optional<std::string> _directory;
 };
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index bf5dce4b0..3ff32280d 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+0100\n"
 "PO-Revision-Date: 2013-04-02 19:08-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -22,7 +22,6 @@ msgid "%"
 msgstr "%"
 
 msgid "(restart DCP-o-matic to see language changes)"
-msgstr ""
 
 #: src/wx/film_editor.cc:1276
 msgid "1 channel"
@@ -102,7 +101,7 @@ msgstr "Contenido"
 msgid "Content Type"
 msgstr "Tipo de contenido"
 
-#: src/wx/film_viewer.cc:451
+#: src/wx/film_viewer.cc:455
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
@@ -112,7 +111,7 @@ msgstr "No se pudo decodificar el vídeo para mostrarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "No se pudo crear el DCP: %s"
 
-#: src/wx/film_viewer.cc:125
+#: src/wx/film_viewer.cc:128
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "No se pudo abrir el fichero (%s)"
@@ -122,7 +121,7 @@ msgstr "No se pudo abrir el fichero (%s)"
 msgid "Could not set content: %s"
 msgstr "No se pudo establecer el contenido: %s"
 
-#: src/wx/new_film_dialog.cc:46
+#: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Crear en carpeta"
 
@@ -156,6 +155,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Preferences"
 msgstr "Preferencias DCP-o-matic"
 
+#: src/wx/config_dialog.cc:46
+#, fuzzy
+msgid "DVD-o-matic Preferences"
+msgstr "Preferencias DVD-o-matic"
+
 #: src/wx/audio_dialog.cc:101
 #, fuzzy, c-format
 msgid "DCP-o-matic audio - %s"
@@ -220,7 +224,7 @@ msgstr "Película"
 msgid "Film Properties"
 msgstr "Propiedades de la película"
 
-#: src/wx/new_film_dialog.cc:42
+#: src/wx/new_film_dialog.cc:44
 msgid "Film name"
 msgstr "Nombre de la película"
 
@@ -300,7 +304,7 @@ msgstr "Mis documentos"
 msgid "Name"
 msgstr "Nombre"
 
-#: src/wx/new_film_dialog.cc:33
+#: src/wx/new_film_dialog.cc:35
 msgid "New Film"
 msgstr "Nueva película"
 
@@ -343,7 +347,7 @@ msgstr "Pico"
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/wx/audio_plot.cc:109
+#: src/wx/audio_plot.cc:111
 msgid "Please wait; audio is being analysed..."
 msgstr "Por favor espere, el audio está siendo analizado..."
 
@@ -464,7 +468,7 @@ msgstr "Hilos a utilizar"
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
-#: src/wx/audio_plot.cc:139
+#: src/wx/audio_plot.cc:141
 msgid "Time"
 msgstr "Tiempo"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index aee97956f..3f150bb0e 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/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: 2013-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+0100\n"
 "PO-Revision-Date: 2013-05-10 14:19+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -21,7 +21,8 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:98
-msgid "(restart DCP-o-matic to see language changes)"
+#, fuzzy
+msgid "(restart DVD-o-matic to see language changes)"
 msgstr "(redémarrez DCP-o-matic pour voir les changements de langue)"
 
 #: src/wx/film_editor.cc:1276
@@ -40,8 +41,7 @@ msgstr "A/B mode"
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/wx/audio_dialog.cc:32
-#: src/wx/film_editor.cc:77
+#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77
 msgid "Audio"
 msgstr "Audio"
 
@@ -103,7 +103,7 @@ msgstr "Contenu"
 msgid "Content Type"
 msgstr "Type de Contenu"
 
-#: src/wx/film_viewer.cc:451
+#: src/wx/film_viewer.cc:455
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
@@ -113,7 +113,7 @@ msgstr "Décodage de la vidéo pour visualisation impossible (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Impossible de créer le DCP : %s"
 
-#: src/wx/film_viewer.cc:125
+#: src/wx/film_viewer.cc:128
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "Ouverture du contenu impossible (%s)"
@@ -123,7 +123,7 @@ msgstr "Ouverture du contenu impossible (%s)"
 msgid "Could not set content: %s"
 msgstr "Sélectionner du contenu impossible : %s"
 
-#: src/wx/new_film_dialog.cc:46
+#: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Créer dans le dossier"
 
@@ -156,6 +156,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Preferences"
 msgstr "Préférences DCP-o-matic"
 
+#: src/wx/config_dialog.cc:46
+#, fuzzy
+msgid "DVD-o-matic Preferences"
+msgstr "Préférences de DCP-o-matic"
+
 #: src/wx/audio_dialog.cc:101
 #, c-format
 msgid "DCP-o-matic audio - %s"
@@ -177,8 +182,7 @@ msgstr "Dossier par défaut des nouveaux films"
 msgid "Default format"
 msgstr "Format par défaut"
 
-#: src/wx/film_editor.cc:116
-#: src/wx/job_manager_view.cc:109
+#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:109
 msgid "Details..."
 msgstr "Détails..."
 
@@ -194,8 +198,7 @@ msgstr "Durée"
 msgid "Edit"
 msgstr "Édition"
 
-#: src/wx/config_dialog.cc:121
-#: src/wx/config_dialog.cc:282
+#: src/wx/config_dialog.cc:121 src/wx/config_dialog.cc:282
 #: src/wx/film_editor.cc:312
 msgid "Edit..."
 msgstr "Éditer..."
@@ -221,12 +224,11 @@ msgstr "Film"
 msgid "Film Properties"
 msgstr "Propriétés du film"
 
-#: src/wx/new_film_dialog.cc:42
+#: src/wx/new_film_dialog.cc:44
 msgid "Film name"
 msgstr "Nom du Film"
 
-#: src/wx/film_editor.cc:307
-#: src/wx/filter_dialog.cc:32
+#: src/wx/film_editor.cc:307 src/wx/filter_dialog.cc:32
 msgid "Filters"
 msgstr "Filtres"
 
@@ -262,8 +264,7 @@ msgstr "Hz"
 msgid "I want to play this back at fader"
 msgstr "Je veux le jouer à ce volume"
 
-#: src/wx/config_dialog.cc:201
-#: src/wx/config_dialog.cc:314
+#: src/wx/config_dialog.cc:201 src/wx/config_dialog.cc:314
 msgid "IP address"
 msgstr "Adresse IP"
 
@@ -303,12 +304,11 @@ msgstr "Mes Documents"
 msgid "Name"
 msgstr "Nom"
 
-#: src/wx/new_film_dialog.cc:33
+#: src/wx/new_film_dialog.cc:35
 msgid "New Film"
 msgstr "Nouveau Film"
 
-#: src/wx/film_editor.cc:309
-#: src/wx/film_editor.cc:671
+#: src/wx/film_editor.cc:309 src/wx/film_editor.cc:671
 msgid "None"
 msgstr "Aucun"
 
@@ -334,8 +334,7 @@ msgstr "Enveloppe noire de %dx%d (%.2f:1)\n"
 msgid "Password"
 msgstr "Mot de passe"
 
-#: src/wx/job_manager_view.cc:103
-#: src/wx/job_manager_view.cc:188
+#: src/wx/job_manager_view.cc:103 src/wx/job_manager_view.cc:188
 msgid "Pause"
 msgstr "Pause"
 
@@ -347,7 +346,7 @@ msgstr "Crête"
 msgid "Play"
 msgstr "Lecture"
 
-#: src/wx/audio_plot.cc:109
+#: src/wx/audio_plot.cc:111
 msgid "Please wait; audio is being analysed..."
 msgstr "Merci de patienter ; analyse de la piste son..."
 
@@ -465,7 +464,7 @@ msgstr "Nombre de processus à utiliser"
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/audio_plot.cc:139
+#: src/wx/audio_plot.cc:141
 msgid "Time"
 msgstr "Durée"
 
@@ -537,8 +536,7 @@ msgstr "encoder toutes les images mais lire seulement la sélection"
 msgid "encode only the subset"
 msgstr "encoder seulement la sélection"
 
-#: src/wx/film_editor.cc:694
-#: src/wx/film_editor.cc:697
+#: src/wx/film_editor.cc:694 src/wx/film_editor.cc:697
 msgid "frames"
 msgstr "images"
 
@@ -556,8 +554,7 @@ msgstr "pixels"
 msgid "s"
 msgstr "s"
 
-#: src/wx/properties_dialog.cc:62
-#: src/wx/properties_dialog.cc:63
+#: src/wx/properties_dialog.cc:62 src/wx/properties_dialog.cc:63
 msgid "unknown"
 msgstr "inconnu"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index f667a6f21..92161172a 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/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-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+0100\n"
 "PO-Revision-Date: 2013-04-28 10:27+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -103,7 +103,7 @@ msgstr "Contenuto"
 msgid "Content Type"
 msgstr "Tipo di contenuto"
 
-#: src/wx/film_viewer.cc:451
+#: src/wx/film_viewer.cc:455
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Non posso decodificare il video per guardarlo (%s)"
@@ -113,7 +113,7 @@ msgstr "Non posso decodificare il video per guardarlo (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Non posso creare il DCP: %s"
 
-#: src/wx/film_viewer.cc:125
+#: src/wx/film_viewer.cc:128
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
@@ -123,7 +123,7 @@ msgstr "Non posso aprire il file del contenuto (%s)"
 msgid "Could not set content: %s"
 msgstr "Non posso regolare il contenuto: %s"
 
-#: src/wx/new_film_dialog.cc:46
+#: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Crea nella cartella"
 
@@ -157,6 +157,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Preferences"
 msgstr "Preferenze DCP-o-matic"
 
+#: src/wx/config_dialog.cc:46
+#, fuzzy
+msgid "DVD-o-matic Preferences"
+msgstr "Preferenze DVD-o-matic"
+
 #: src/wx/audio_dialog.cc:101
 #, c-format
 msgid "DCP-o-matic audio - %s"
@@ -221,7 +226,7 @@ msgstr "Film"
 msgid "Film Properties"
 msgstr "Proprietà del film"
 
-#: src/wx/new_film_dialog.cc:42
+#: src/wx/new_film_dialog.cc:44
 msgid "Film name"
 msgstr "Nome del film"
 
@@ -301,7 +306,7 @@ msgstr "Documenti"
 msgid "Name"
 msgstr "Nome"
 
-#: src/wx/new_film_dialog.cc:33
+#: src/wx/new_film_dialog.cc:35
 msgid "New Film"
 msgstr "Nuovo Film"
 
@@ -344,7 +349,7 @@ msgstr "Picco"
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/wx/audio_plot.cc:109
+#: src/wx/audio_plot.cc:111
 msgid "Please wait; audio is being analysed..."
 msgstr "Attendere prego; sto analizzando l'audio..."
 
@@ -465,7 +470,7 @@ msgstr "Threads da usare"
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/audio_plot.cc:139
+#: src/wx/audio_plot.cc:141
 msgid "Time"
 msgstr "Tempo"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index f31d98c38..02df467ca 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/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: 2013-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+0100\n"
 "PO-Revision-Date: 2013-04-09 10:13+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -103,7 +103,7 @@ msgstr "Innehåll"
 msgid "Content Type"
 msgstr "Innehållstyp"
 
-#: src/wx/film_viewer.cc:451
+#: src/wx/film_viewer.cc:455
 #, c-format
 msgid "Could not decode video for view (%s)"
 msgstr "Kunde inte avkoda video för visning (%s)"
@@ -113,7 +113,7 @@ msgstr "Kunde inte avkoda video för visning (%s)"
 msgid "Could not make DCP: %s"
 msgstr "Kunde inte skapa DCP: %s"
 
-#: src/wx/film_viewer.cc:125
+#: src/wx/film_viewer.cc:128
 #, c-format
 msgid "Could not open content file (%s)"
 msgstr "Kunde inte öppna innehållsfilen (%s)"
@@ -123,7 +123,7 @@ msgstr "Kunde inte öppna innehållsfilen (%s)"
 msgid "Could not set content: %s"
 msgstr "Kunde inte fastställa innehåll: %s"
 
-#: src/wx/new_film_dialog.cc:46
+#: src/wx/new_film_dialog.cc:48
 msgid "Create in folder"
 msgstr "Skapa i katalog"
 
@@ -157,6 +157,11 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Preferences"
 msgstr "DCP-o-matic Inställningar"
 
+#: src/wx/config_dialog.cc:46
+#, fuzzy
+msgid "DVD-o-matic Preferences"
+msgstr "DVD-o-matic Inställningar"
+
 #: src/wx/audio_dialog.cc:101
 #, c-format
 msgid "DCP-o-matic audio - %s"
@@ -221,7 +226,7 @@ msgstr "Film"
 msgid "Film Properties"
 msgstr "Film Egenskaper"
 
-#: src/wx/new_film_dialog.cc:42
+#: src/wx/new_film_dialog.cc:44
 msgid "Film name"
 msgstr "film namn"
 
@@ -301,7 +306,7 @@ msgstr "Mina Dokument"
 msgid "Name"
 msgstr "Namn"
 
-#: src/wx/new_film_dialog.cc:33
+#: src/wx/new_film_dialog.cc:35
 msgid "New Film"
 msgstr "Ny Film"
 
@@ -344,7 +349,7 @@ msgstr "Topp"
 msgid "Play"
 msgstr "Spela"
 
-#: src/wx/audio_plot.cc:109
+#: src/wx/audio_plot.cc:111
 msgid "Please wait; audio is being analysed..."
 msgstr "Vänligen vänta; audio analyseras..."
 
@@ -465,7 +470,7 @@ msgstr "Antal trådar att använda"
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
-#: src/wx/audio_plot.cc:139
+#: src/wx/audio_plot.cc:141
 msgid "Time"
 msgstr "Tid"