Merge branch 'master' of ssh://192.168.1.201/home/carl/git/dvdomatic

24 files changed, 636 insertions, 399 deletions

diff --git a/ChangeLog b/ChangeLog
index c25e5a2dc..0806da963 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2013-06-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.95 released.
+
+2013-06-05  Carl Hetherington  <cth@carlh.net>
+
+	* Fix crash on startup on Windows
+
+2013-06-05  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.94 released.
+
+2013-06-04  Carl Hetherington  <cth@carlh.net>
+
+	* Version 0.94beta2 released.
+
+2013-06-04  Carl Hetherington  <cth@carlh.net>
+
+	* A few fixes to A/B mode.
+
 2013-05-31  Carl Hetherington  <cth@carlh.net>
 
 	* Version 0.94beta1 released.
diff --git a/cscript b/cscript
index dd39befda..f3d532d57 100644
--- a/cscript
+++ b/cscript
@@ -8,7 +8,7 @@ def dependencies(target):
     else:
         return (('openjpeg-cdist', None),
                 ('ffmpeg-cdist', '7a23ec9c771184ab563cfe24ad9b427f38368961'),
-                ('libdcp', 'v0.52'))
+                ('libdcp', 'v0.53'))
 
 def build(env, target):
     cmd = './waf configure --prefix=%s' % env.work_dir_cscript()
diff --git a/debian/changelog b/debian/changelog
index 37185dbb8..eef3c1e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+dvdomatic (0.95-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Wed, 05 Jun 2013 14:29:24 +0100
+
+dvdomatic (0.94-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Wed, 05 Jun 2013 07:48:39 +0100
+
+dvdomatic (0.94beta2-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Carl Hetherington <carl@houllier.lan>  Tue, 04 Jun 2013 22:59:39 +0100
+
 dvdomatic (0.94beta1-1) UNRELEASED; urgency=low
 
   * New upstream release.
diff --git a/platform/windows/installer.nsi.32.in b/platform/windows/installer.nsi.32.in
index 81de3a25c..9f38c925b 100644
--- a/platform/windows/installer.nsi.32.in
+++ b/platform/windows/installer.nsi.32.in
@@ -134,7 +134,7 @@ Section "Uninstall"
 RMDir /r "$INSTDIR\*.*"    
 RMDir "$INSTDIR"
 Delete "$DESKTOP\DVD-o-matic.lnk"
-Delete "$DESKTOP\DVD-o-matic bach converter.lnk"
+Delete "$DESKTOP\DVD-o-matic batch converter.lnk"
 Delete "$DESKTOP\DVD-o-matic encode server.lnk"
 Delete "$SMPROGRAMS\DVD-o-matic\*.*"
 RmDir  "$SMPROGRAMS\DVD-o-matic"
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 944505007..39b6dfceb 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDVDOMATIC\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:10-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -62,7 +62,7 @@ msgstr ""
 msgid "4:3 within Flat"
 msgstr "4:3 en Flat"
 
-#: src/lib/ab_transcode_job.cc:49
+#: src/lib/ab_transcode_job.cc:50
 msgid "A/B transcode %1"
 msgstr "Codificación A/B %1"
 
@@ -107,7 +107,7 @@ msgid "Cannot resample audio as libswresample is not present"
 msgstr ""
 "No se puede redimensionar el sonido porque no se encuentra libswresample"
 
-#: src/lib/util.cc:960
+#: src/lib/util.cc:982
 msgid "Centre"
 msgstr ""
 
@@ -139,16 +139,16 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:1035
+#: src/lib/util.cc:1057
 msgid "DCP and source have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/util.cc:1045
+#: src/lib/util.cc:1067
 #, fuzzy
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente.\n"
 
-#: src/lib/util.cc:1038
+#: src/lib/util.cc:1060
 msgid "DCP will use every other frame of the source.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\n"
 
@@ -171,7 +171,7 @@ msgstr "Deringing filter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1040
+#: src/lib/util.cc:1062
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
@@ -219,7 +219,7 @@ msgstr "Película"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Flat without stretch"
 msgstr "Flat sin deformación"
 
@@ -227,6 +227,10 @@ msgstr "Flat sin deformación"
 msgid "Force quantizer"
 msgstr "Force quantizer"
 
+#: src/lib/format.cc:123
+msgid "Full frame"
+msgstr ""
+
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
 msgstr "Gaussiano"
@@ -263,15 +267,15 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:958
+#: src/lib/util.cc:980
 msgid "Left"
 msgstr ""
 
-#: src/lib/util.cc:962
+#: src/lib/util.cc:984
 msgid "Left surround"
 msgstr ""
 
-#: src/lib/util.cc:961
+#: src/lib/util.cc:983
 msgid "Lfe (sub)"
 msgstr ""
 
@@ -321,15 +325,15 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/util.cc:513
+#: src/lib/util.cc:535
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:959
+#: src/lib/util.cc:981
 msgid "Right"
 msgstr ""
 
-#: src/lib/util.cc:963
+#: src/lib/util.cc:985
 msgid "Right surround"
 msgstr ""
 
@@ -341,7 +345,7 @@ msgstr "error SSH (%1)"
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:127
+#: src/lib/format.cc:131
 msgid "Scope without stretch"
 msgstr "Scope sin deformación"
 
@@ -397,7 +401,7 @@ msgstr "Transitional"
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/lib/ffmpeg_decoder.cc:388
+#: src/lib/ffmpeg_decoder.cc:387
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato de audio desconocido (%1)"
 
@@ -425,11 +429,11 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:296
+#: src/lib/film.cc:300
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:576
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -437,11 +441,11 @@ msgstr "tiempo de conexión agotado"
 msgid "connecting"
 msgstr "conectando"
 
-#: src/lib/film.cc:333
+#: src/lib/film.cc:337
 msgid "content"
 msgstr "contenido"
 
-#: src/lib/film.cc:337
+#: src/lib/film.cc:341
 msgid "content type"
 msgstr "tipo de contenido"
 
@@ -454,19 +458,19 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
-#: src/lib/ffmpeg_decoder.cc:187
+#: src/lib/ffmpeg_decoder.cc:186
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
 
-#: src/lib/ffmpeg_decoder.cc:114
+#: src/lib/ffmpeg_decoder.cc:113
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg_decoder.cc:206
+#: src/lib/ffmpeg_decoder.cc:205
 msgid "could not find subtitle decoder"
 msgstr "no se pudo encontrar decodificador de subtítutlos"
 
-#: src/lib/ffmpeg_decoder.cc:165
+#: src/lib/ffmpeg_decoder.cc:164
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
@@ -488,7 +492,7 @@ msgstr "no se pudo abrir el fichero para lectura"
 msgid "could not read from file %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
-#: src/lib/encoder.cc:137 src/lib/encoder.cc:314
+#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
@@ -513,7 +517,7 @@ msgstr "los ficheros externos de sonido tienen duraciones diferentes"
 msgid "external audio files must be mono"
 msgstr "los ficheros externos de sonido deben ser mono"
 
-#: src/lib/film.cc:329
+#: src/lib/film.cc:333
 msgid "format"
 msgstr "formato"
 
@@ -521,23 +525,23 @@ msgstr "formato"
 msgid "frames per second"
 msgstr "fotogramas por segundo"
 
-#: src/lib/util.cc:128
+#: src/lib/util.cc:134
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:125 src/lib/util.cc:130
+#: src/lib/util.cc:131 src/lib/util.cc:136
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:135
+#: src/lib/util.cc:141
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:137
+#: src/lib/util.cc:143
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:697
+#: src/lib/util.cc:719
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -549,7 +553,7 @@ msgstr ""
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
 
-#: src/lib/film.cc:296 src/lib/film.cc:341
+#: src/lib/film.cc:300 src/lib/film.cc:345
 msgid "name"
 msgstr "nombre"
 
@@ -567,19 +571,19 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/util.cc:511
+#: src/lib/util.cc:533
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/util.cc:140
+#: src/lib/util.cc:146
 msgid "seconds"
 msgstr "segundos"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "still"
 msgstr "imagen fija"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "video"
 msgstr "vídeo"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 81f61d8b8..9dcbd42c2 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-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-21 10:30+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -61,7 +61,7 @@ msgstr "4:3"
 msgid "4:3 within Flat"
 msgstr "4:3 dans Flat"
 
-#: src/lib/ab_transcode_job.cc:49
+#: src/lib/ab_transcode_job.cc:50
 msgid "A/B transcode %1"
 msgstr "Transcodage A/B %1"
 
@@ -105,7 +105,7 @@ msgstr "Format du pixel %1 non géré par %2"
 msgid "Cannot resample audio as libswresample is not present"
 msgstr "Ré-échantillonnage du son impossible : libswresample est absent"
 
-#: src/lib/util.cc:960
+#: src/lib/util.cc:982
 msgid "Centre"
 msgstr "Centre"
 
@@ -137,37 +137,27 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Désentrelacement cubique interpolé"
 
-#: src/lib/util.cc:1035
+#: src/lib/util.cc:1057
 msgid "DCP and source have the same rate.\n"
 msgstr "Le DCP et la source ont les mêmes cadences.\n"
 
-#: src/lib/util.cc:1045
+#: src/lib/util.cc:1067
 #, fuzzy
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "La cadence du DCP sera %1%% par rapport à la source.\n"
 
-#: src/lib/util.cc:1038
+#: src/lib/util.cc:1060
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Le DCP utilisera une image sur deux de la source.\n"
 
-#: src/lib/filter.cc:68
-#: src/lib/filter.cc:69
-#: src/lib/filter.cc:70
-#: src/lib/filter.cc:71
-#: src/lib/filter.cc:72
-#: src/lib/filter.cc:73
+#: src/lib/filter.cc:68 src/lib/filter.cc:69 src/lib/filter.cc:70
+#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
 msgid "De-blocking"
 msgstr "De-bloc"
 
-#: src/lib/filter.cc:75
-#: src/lib/filter.cc:76
-#: src/lib/filter.cc:77
-#: src/lib/filter.cc:78
-#: src/lib/filter.cc:79
-#: src/lib/filter.cc:80
-#: src/lib/filter.cc:81
-#: src/lib/filter.cc:82
-#: src/lib/filter.cc:83
+#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:77
+#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:80
+#: src/lib/filter.cc:81 src/lib/filter.cc:82 src/lib/filter.cc:83
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
@@ -179,7 +169,7 @@ msgstr "Filtre anti bourdonnement"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1040
+#: src/lib/util.cc:1062
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Chaque image source sera dupliquée dans le DCP.\n"
 
@@ -227,7 +217,7 @@ msgstr "Feature"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Flat without stretch"
 msgstr "Flat sans déformation"
 
@@ -235,6 +225,10 @@ msgstr "Flat sans déformation"
 msgid "Force quantizer"
 msgstr "Forcer la quantification"
 
+#: src/lib/format.cc:123
+msgid "Full frame"
+msgstr ""
+
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
 msgstr "Gaussien"
@@ -255,10 +249,13 @@ msgstr "Filtre dé-bloc horizontal"
 msgid "Horizontal deblocking filter A"
 msgstr "Filtre dé-bloc horizontal"
 
-#: src/lib/job.cc:97
-#: src/lib/job.cc:106
-msgid "It is not known what caused this error.  The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
-msgstr "Erreur indéterminée. Merci de rapporter le problème à la liste DVD-o-matic (dvdomatic@carlh.net)"
+#: src/lib/job.cc:97 src/lib/job.cc:106
+msgid ""
+"It is not known what caused this error.  The best idea is to report the "
+"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)"
+msgstr ""
+"Erreur indéterminée. Merci de rapporter le problème à la liste DVD-o-matic "
+"(dvdomatic@carlh.net)"
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
@@ -268,15 +265,15 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:958
+#: src/lib/util.cc:980
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:962
+#: src/lib/util.cc:984
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:961
+#: src/lib/util.cc:983
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -292,11 +289,8 @@ msgstr "Désentrelaceur linéaire interpolé"
 msgid "Median deinterlacer"
 msgstr "Désentrelaceur médian"
 
-#: src/lib/filter.cc:74
-#: src/lib/filter.cc:85
-#: src/lib/filter.cc:86
-#: src/lib/filter.cc:87
-#: src/lib/filter.cc:90
+#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86
+#: src/lib/filter.cc:87 src/lib/filter.cc:90
 msgid "Misc"
 msgstr "Divers"
 
@@ -304,9 +298,7 @@ msgstr "Divers"
 msgid "Motion compensating deinterlacer"
 msgstr "Désentrelaceur par compensation de mouvement"
 
-#: src/lib/filter.cc:84
-#: src/lib/filter.cc:88
-#: src/lib/filter.cc:89
+#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Réduction de bruit"
@@ -331,15 +323,15 @@ msgstr "Public Service Announcement"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/util.cc:513
+#: src/lib/util.cc:535
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:959
+#: src/lib/util.cc:981
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:963
+#: src/lib/util.cc:985
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -351,7 +343,7 @@ msgstr "Erreur SSH (%1)"
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:127
+#: src/lib/format.cc:131
 msgid "Scope without stretch"
 msgstr "Scope sans déformation"
 
@@ -384,8 +376,12 @@ msgid "Test"
 msgstr "Test"
 
 #: src/lib/job.cc:79
-msgid "The drive that the film is stored on is low in disc space.  Free some more space and try again."
-msgstr "Le disque contenant le film est plein. Libérez de l'espace et essayez à nouveau."
+msgid ""
+"The drive that the film is stored on is low in disc space.  Free some more "
+"space and try again."
+msgstr ""
+"Le disque contenant le film est plein. Libérez de l'espace et essayez à "
+"nouveau."
 
 #: src/lib/dcp_content_type.cc:46
 msgid "Trailer"
@@ -403,7 +399,7 @@ msgstr "Transitional"
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/lib/ffmpeg_decoder.cc:388
+#: src/lib/ffmpeg_decoder.cc:387
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Échantillonnage audio (%1) inconnu"
 
@@ -431,11 +427,11 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Un autre filtre de désentrelacement"
 
-#: src/lib/film.cc:296
+#: src/lib/film.cc:300
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:576
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -443,11 +439,11 @@ msgstr "temps de connexion expiré"
 msgid "connecting"
 msgstr "connexion"
 
-#: src/lib/film.cc:333
+#: src/lib/film.cc:337
 msgid "content"
 msgstr "contenu"
 
-#: src/lib/film.cc:337
+#: src/lib/film.cc:341
 msgid "content type"
 msgstr "type de contenu"
 
@@ -459,19 +455,19 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg_decoder.cc:187
+#: src/lib/ffmpeg_decoder.cc:186
 msgid "could not find audio decoder"
 msgstr "décodeur audio introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:114
+#: src/lib/ffmpeg_decoder.cc:113
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:206
+#: src/lib/ffmpeg_decoder.cc:205
 msgid "could not find subtitle decoder"
 msgstr "décodeur de sous-titre introuvable"
 
-#: src/lib/ffmpeg_decoder.cc:165
+#: src/lib/ffmpeg_decoder.cc:164
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
@@ -491,8 +487,7 @@ msgstr "lecture du fichier impossible"
 msgid "could not read from file %1 (%2)"
 msgstr "lecture du fichier impossible %1 (%2)"
 
-#: src/lib/encoder.cc:137
-#: src/lib/encoder.cc:314
+#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
 msgid "could not run sample-rate converter"
 msgstr "conversion de la fréquence d'échantillonnage impossible"
 
@@ -516,7 +511,7 @@ msgstr "Les fichiers audio externes ont des durées différentes"
 msgid "external audio files must be mono"
 msgstr "les fichiers audio externes doivent être en mono"
 
-#: src/lib/film.cc:329
+#: src/lib/film.cc:333
 msgid "format"
 msgstr "format"
 
@@ -524,24 +519,23 @@ msgstr "format"
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:128
+#: src/lib/util.cc:134
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:125
-#: src/lib/util.cc:130
+#: src/lib/util.cc:131 src/lib/util.cc:136
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:135
+#: src/lib/util.cc:141
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:137
+#: src/lib/util.cc:143
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:697
+#: src/lib/util.cc:719
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 non sélectionnée"
 
@@ -553,8 +547,7 @@ msgstr "paramètre %1 manquant"
 msgid "multi-part subtitles not yet supported"
 msgstr "sous-titres en plusieurs parties non supportés"
 
-#: src/lib/film.cc:296
-#: src/lib/film.cc:341
+#: src/lib/film.cc:300 src/lib/film.cc:345
 msgid "name"
 msgstr "nom"
 
@@ -572,19 +565,19 @@ msgstr "sous-titres non-bitmap non supportés actuellement"
 msgid "remaining"
 msgstr "restant"
 
-#: src/lib/util.cc:511
+#: src/lib/util.cc:533
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/util.cc:140
+#: src/lib/util.cc:146
 msgid "seconds"
 msgstr "secondes"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "still"
 msgstr "fixe"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "video"
 msgstr "vidéo"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 6a7486d82..9671c66a7 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/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:26+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -61,7 +61,7 @@ msgstr "4:3"
 msgid "4:3 within Flat"
 msgstr "4:3 all'interno di  Flat"
 
-#: src/lib/ab_transcode_job.cc:49
+#: src/lib/ab_transcode_job.cc:50
 msgid "A/B transcode %1"
 msgstr "Transcodifica A/B %1"
 
@@ -105,7 +105,7 @@ msgstr "Non posso gestire il formato di pixel %1 durante %2"
 msgid "Cannot resample audio as libswresample is not present"
 msgstr "Non posso ricampionare l'audio perchè libswresample non è presente"
 
-#: src/lib/util.cc:960
+#: src/lib/util.cc:982
 msgid "Centre"
 msgstr "Centro"
 
@@ -137,15 +137,15 @@ msgstr "Non posso scrivere il file remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Deinterlacciatore cubico interpolato"
 
-#: src/lib/util.cc:1035
+#: src/lib/util.cc:1057
 msgid "DCP and source have the same rate.\n"
 msgstr "Il DCP e il sorgente hanno la stessa frequenza.\n"
 
-#: src/lib/util.cc:1045
+#: src/lib/util.cc:1067
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "Il DCP andrà al %1%% della velocità del sorgente.\n"
 
-#: src/lib/util.cc:1038
+#: src/lib/util.cc:1060
 msgid "DCP will use every other frame of the source.\n"
 msgstr "Il DCP userà ogni altro fotogramma del sorgente.\n"
 
@@ -168,7 +168,7 @@ msgstr "Filtro deringing"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1040
+#: src/lib/util.cc:1062
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Ogni fotogramma del sorgente sarà raddoppiato nel DCP.\n"
 
@@ -216,7 +216,7 @@ msgstr "Caratteristica"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Flat without stretch"
 msgstr "Flat senza stiramento"
 
@@ -224,6 +224,10 @@ msgstr "Flat senza stiramento"
 msgid "Force quantizer"
 msgstr "Forza quantizzatore"
 
+#: src/lib/format.cc:123
+msgid "Full frame"
+msgstr ""
+
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
 msgstr "Gaussiana"
@@ -260,15 +264,15 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:958
+#: src/lib/util.cc:980
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:962
+#: src/lib/util.cc:984
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:961
+#: src/lib/util.cc:983
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -318,15 +322,15 @@ msgstr "Annuncio di pubblico servizio"
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/util.cc:513
+#: src/lib/util.cc:535
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:959
+#: src/lib/util.cc:981
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:963
+#: src/lib/util.cc:985
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -338,7 +342,7 @@ msgstr "Errore SSH (%1)"
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:127
+#: src/lib/format.cc:131
 msgid "Scope without stretch"
 msgstr "Scope senza stiramento"
 
@@ -394,7 +398,7 @@ msgstr "Di transizione"
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
-#: src/lib/ffmpeg_decoder.cc:388
+#: src/lib/ffmpeg_decoder.cc:387
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Formato di campionamento audio non riconosciuto (%1)"
 
@@ -422,11 +426,11 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Altro filtro di deinterlacciamento"
 
-#: src/lib/film.cc:296
+#: src/lib/film.cc:300
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:576
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -434,11 +438,11 @@ msgstr "connessione scaduta"
 msgid "connecting"
 msgstr "mi sto connettendo"
 
-#: src/lib/film.cc:333
+#: src/lib/film.cc:337
 msgid "content"
 msgstr "contenuto"
 
-#: src/lib/film.cc:337
+#: src/lib/film.cc:341
 msgid "content type"
 msgstr "tipo di contenuto"
 
@@ -450,19 +454,19 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg_decoder.cc:187
+#: src/lib/ffmpeg_decoder.cc:186
 msgid "could not find audio decoder"
 msgstr "non riesco a trovare il decoder audio"
 
-#: src/lib/ffmpeg_decoder.cc:114
+#: src/lib/ffmpeg_decoder.cc:113
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg_decoder.cc:206
+#: src/lib/ffmpeg_decoder.cc:205
 msgid "could not find subtitle decoder"
 msgstr "non riesco a trovare il decoder dei sottotitoli"
 
-#: src/lib/ffmpeg_decoder.cc:165
+#: src/lib/ffmpeg_decoder.cc:164
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
@@ -482,7 +486,7 @@ msgstr "non riesco ad aprire il file per leggerlo"
 msgid "could not read from file %1 (%2)"
 msgstr "non posso leggere dal file %1 (%2)"
 
-#: src/lib/encoder.cc:137 src/lib/encoder.cc:314
+#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
 msgid "could not run sample-rate converter"
 msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 
@@ -506,7 +510,7 @@ msgstr "i files dell'audio esterno hanno durata diversa"
 msgid "external audio files must be mono"
 msgstr "i files dell'audio esterno devono essere mono"
 
-#: src/lib/film.cc:329
+#: src/lib/film.cc:333
 msgid "format"
 msgstr "formato"
 
@@ -514,23 +518,23 @@ msgstr "formato"
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:128
+#: src/lib/util.cc:134
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:125 src/lib/util.cc:130
+#: src/lib/util.cc:131 src/lib/util.cc:136
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:135
+#: src/lib/util.cc:141
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:137
+#: src/lib/util.cc:143
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:697
+#: src/lib/util.cc:719
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -542,7 +546,7 @@ msgstr "persa la regolazione richiesta %1"
 msgid "multi-part subtitles not yet supported"
 msgstr "sottotitoli multi-part non ancora supportati"
 
-#: src/lib/film.cc:296 src/lib/film.cc:341
+#: src/lib/film.cc:300 src/lib/film.cc:345
 msgid "name"
 msgstr "nome"
 
@@ -560,19 +564,19 @@ msgstr "sottotitoli non-bitmap non ancora supportati"
 msgid "remaining"
 msgstr "restano"
 
-#: src/lib/util.cc:511
+#: src/lib/util.cc:533
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/util.cc:140
+#: src/lib/util.cc:146
 msgid "seconds"
 msgstr "secondi"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "still"
 msgstr "ancora"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "video"
 msgstr "video"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 58d336ef8..9391801dc 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/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-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+0100\n"
 "PO-Revision-Date: 2013-04-10 15:35+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "4:3 within Flat"
 msgstr "4:3 innanför Flat"
 
-#: src/lib/ab_transcode_job.cc:49
+#: src/lib/ab_transcode_job.cc:50
 msgid "A/B transcode %1"
 msgstr "A/B konvertera %1"
 
@@ -106,7 +106,7 @@ msgid "Cannot resample audio as libswresample is not present"
 msgstr ""
 "Kan inte omsampla ljudet eftersom libswresample inte finns tillgängligt"
 
-#: src/lib/util.cc:960
+#: src/lib/util.cc:982
 msgid "Centre"
 msgstr "Mitt"
 
@@ -138,15 +138,15 @@ msgstr "Kunde inte skriva till fjärrfil (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Kubiskt interpolerande avflätare"
 
-#: src/lib/util.cc:1035
+#: src/lib/util.cc:1057
 msgid "DCP and source have the same rate.\n"
 msgstr "DCP och källa har samma bildfrekvens.\n"
 
-#: src/lib/util.cc:1045
+#: src/lib/util.cc:1067
 msgid "DCP will run at %1%% of the source speed.\n"
 msgstr "DCP kommer att köras på %1%% av källans hastighet.\n"
 
-#: src/lib/util.cc:1038
+#: src/lib/util.cc:1060
 msgid "DCP will use every other frame of the source.\n"
 msgstr "DCP kommer att använda varannan bild från källan.\n"
 
@@ -169,7 +169,7 @@ msgstr "Avringningsfilter"
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1040
+#: src/lib/util.cc:1062
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Varje bild från källan kommer att användas två gånger i DCPn.\n"
 
@@ -217,7 +217,7 @@ msgstr "Långfilm"
 msgid "Flat"
 msgstr "Flat"
 
-#: src/lib/format.cc:123
+#: src/lib/format.cc:127
 msgid "Flat without stretch"
 msgstr "Flat utan utsträckning"
 
@@ -225,6 +225,10 @@ msgstr "Flat utan utsträckning"
 msgid "Force quantizer"
 msgstr "Tvinga kvantiserare"
 
+#: src/lib/format.cc:123
+msgid "Full frame"
+msgstr ""
+
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
 msgstr "Gaussisk"
@@ -261,15 +265,15 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:958
+#: src/lib/util.cc:980
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:962
+#: src/lib/util.cc:984
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:961
+#: src/lib/util.cc:983
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -319,15 +323,15 @@ msgstr "Offentligt Servicemeddelande"
 msgid "Rating"
 msgstr "Klassificeringsklipp"
 
-#: src/lib/util.cc:513
+#: src/lib/util.cc:535
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:959
+#: src/lib/util.cc:981
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:963
+#: src/lib/util.cc:985
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -339,7 +343,7 @@ msgstr "SSH fel (%1)"
 msgid "Scope"
 msgstr "Scope"
 
-#: src/lib/format.cc:127
+#: src/lib/format.cc:131
 msgid "Scope without stretch"
 msgstr "Scope utan utsträckning"
 
@@ -396,7 +400,7 @@ msgid "Unknown error"
 msgstr "Okänt fel"
 
 # Svengelska
-#: src/lib/ffmpeg_decoder.cc:388
+#: src/lib/ffmpeg_decoder.cc:387
 #, fuzzy
 msgid "Unrecognised audio sample format (%1)"
 msgstr "Okänt audio-sampelformat (%1)"
@@ -426,12 +430,12 @@ msgstr "X"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
-#: src/lib/film.cc:296
+#: src/lib/film.cc:300
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:554
+#: src/lib/util.cc:576
 #, fuzzy
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
@@ -440,11 +444,11 @@ msgstr "uppkopplingen tajmade ur"
 msgid "connecting"
 msgstr "kopplar upp"
 
-#: src/lib/film.cc:333
+#: src/lib/film.cc:337
 msgid "content"
 msgstr "innehåll"
 
-#: src/lib/film.cc:337
+#: src/lib/film.cc:341
 msgid "content type"
 msgstr "innehållstyp"
 
@@ -456,19 +460,19 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg_decoder.cc:187
+#: src/lib/ffmpeg_decoder.cc:186
 msgid "could not find audio decoder"
 msgstr "kunde inte hitta audio-avkodare"
 
-#: src/lib/ffmpeg_decoder.cc:114
+#: src/lib/ffmpeg_decoder.cc:113
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg_decoder.cc:206
+#: src/lib/ffmpeg_decoder.cc:205
 msgid "could not find subtitle decoder"
 msgstr "kunde inte hitta undertext-avkodare"
 
-#: src/lib/ffmpeg_decoder.cc:165
+#: src/lib/ffmpeg_decoder.cc:164
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
@@ -488,7 +492,7 @@ msgstr "kunde inte öppna fil för läsning"
 msgid "could not read from file %1 (%2)"
 msgstr "kunde inte läsa från fil %1 (%2)"
 
-#: src/lib/encoder.cc:137 src/lib/encoder.cc:314
+#: src/lib/encoder.cc:137 src/lib/encoder.cc:318
 msgid "could not run sample-rate converter"
 msgstr "kunde inte köra sampelhastighetskonverteraren"
 
@@ -512,7 +516,7 @@ msgstr "externa audio-filer har olika längder"
 msgid "external audio files must be mono"
 msgstr "externa audio-filer måste vara mono"
 
-#: src/lib/film.cc:329
+#: src/lib/film.cc:333
 msgid "format"
 msgstr "format"
 
@@ -520,23 +524,23 @@ msgstr "format"
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:128
+#: src/lib/util.cc:134
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:125 src/lib/util.cc:130
+#: src/lib/util.cc:131 src/lib/util.cc:136
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:135
+#: src/lib/util.cc:141
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:137
+#: src/lib/util.cc:143
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:697
+#: src/lib/util.cc:719
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -548,7 +552,7 @@ msgstr "saknad nödvändig inställning %1"
 msgid "multi-part subtitles not yet supported"
 msgstr "undertexter i flera delar stöds inte ännu"
 
-#: src/lib/film.cc:296 src/lib/film.cc:341
+#: src/lib/film.cc:300 src/lib/film.cc:345
 msgid "name"
 msgstr "namn"
 
@@ -566,19 +570,19 @@ msgstr "icke-rastergrafiska undertexter stöds inte ännu"
 msgid "remaining"
 msgstr "återstående tid"
 
-#: src/lib/util.cc:511
+#: src/lib/util.cc:533
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/util.cc:140
+#: src/lib/util.cc:146
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "still"
 msgstr "stillbild"
 
-#: src/lib/film.cc:307
+#: src/lib/film.cc:311
 msgid "video"
 msgstr "video"
 
diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc
index 4c3a5260f..71207c4ae 100644
--- a/src/tools/dvdomatic.cc
+++ b/src/tools/dvdomatic.cc
@@ -26,7 +26,7 @@
 #ifdef __WXOSX__
 #include <ApplicationServices/ApplicationServices.h>
 #endif
-#include <wx/aboutdlg.h>
+#include <wx/generic/aboutdlgg.h>
 #include <wx/stdpaths.h>
 #include <wx/cmdline.h>
 #include "wx/film_viewer.h"
@@ -38,6 +38,7 @@
 #include "wx/new_film_dialog.h"
 #include "wx/properties_dialog.h"
 #include "wx/wx_ui_signaller.h"
+#include "wx/about_dialog.h"
 #include "lib/film.h"
 #include "lib/format.h"
 #include "lib/config.h"
@@ -45,7 +46,6 @@
 #include "lib/util.h"
 #include "lib/scaler.h"
 #include "lib/exceptions.h"
-#include "lib/version.h"
 #include "lib/ui_signaller.h"
 #include "lib/log.h"
 
@@ -427,34 +427,9 @@ private:
 	
 	void help_about (wxCommandEvent &)
 	{
-		wxAboutDialogInfo info;
-		info.SetName (_("DVD-o-matic"));
-		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);
+		AboutDialog* d = new AboutDialog (this);
+		d->ShowModal ();
+		d->Destroy ();
 	}
 
 	wxSizer* _top_sizer;
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index 30f568c98..bbae550d7 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-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+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,27 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:178
+#: src/tools/dvdomatic.cc:184
 msgid "&Analyse audio"
 msgstr "&Analizar audio"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:195
 msgid "&Edit"
 msgstr "&Editar"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dvdomatic.cc:170
+msgid "&Exit"
+msgstr ""
+
+#: src/tools/dvdomatic.cc:193
 msgid "&File"
 msgstr "&Archivo"
 
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:198
 msgid "&Help"
 msgstr "&Ayuda"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:197
 msgid "&Jobs"
 msgstr "&Tareas"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dvdomatic.cc:180
 msgid "&Make DCP"
 msgstr "&Crear DCP"
 
@@ -45,7 +49,7 @@ msgstr "&Crear DCP"
 msgid "&Open..."
 msgstr "&Abrir..."
 
-#: src/tools/dvdomatic.cc:171
+#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
 msgid "&Preferences..."
 msgstr "&Preferencias..."
 
@@ -53,48 +57,49 @@ msgstr "&Preferencias..."
 msgid "&Properties..."
 msgstr "&Propiedades..."
 
-#: src/tools/dvdomatic.cc:168
-msgid "&Quit"
-msgstr "&Salir"
-
 #: src/tools/dvdomatic.cc:164
 msgid "&Save"
 msgstr "&Guardar"
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:181
 msgid "&Send DCP to TMS"
 msgstr "&Enviar DCP al TMS"
 
-#: src/tools/dvdomatic.cc:426
+#: src/tools/dvdomatic.cc:438
 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:181
+#: src/tools/dvdomatic.cc:190
 msgid "About"
 msgstr "Acerca de"
 
-#: src/tools/dvdomatic.cc:502
+#: src/tools/dvdomatic.cc:188
+#, fuzzy
+msgid "About DVD-o-matic"
+msgstr "DVD-o-matic"
+
+#: src/tools/dvdomatic.cc:520
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "No se pudo cargar la película %s (%s)"
 
-#: src/tools/dvdomatic.cc:348
+#: src/tools/dvdomatic.cc:360
 #, 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:288 src/tools/dvdomatic.cc:419
-#: src/tools/dvdomatic.cc:506
+#: src/tools/dvdomatic.cc:300 src/tools/dvdomatic.cc:431
+#: src/tools/dvdomatic.cc:524
 msgid "DVD-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:79
 msgid "Film changed"
 msgstr "Película cambiada"
 
-#: src/tools/dvdomatic.cc:425
+#: src/tools/dvdomatic.cc:437
 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 "
@@ -104,31 +109,34 @@ msgstr ""
 msgid "New..."
 msgstr "Nuevo..."
 
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:182
 msgid "S&how DCP"
 msgstr "&Mostrar DCP"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dvdomatic.cc:78
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:328
+#: src/tools/dvdomatic.cc:340
 msgid "Select film to open"
 msgstr "Selecciona la película a abrir"
 
-#: src/tools/dvdomatic.cc:307
+#: src/tools/dvdomatic.cc:319
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:333
+#: src/tools/dvdomatic.cc:345
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 
+#~ msgid "&Quit"
+#~ msgstr "&Salir"
+
 #, 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 6b8f1e783..8a28a0e01 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-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:09+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -16,27 +16,31 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/tools/dvdomatic.cc:178
+#: src/tools/dvdomatic.cc:184
 msgid "&Analyse audio"
 msgstr "&Analyser le son"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:195
 msgid "&Edit"
 msgstr "&Edition"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dvdomatic.cc:170
+msgid "&Exit"
+msgstr ""
+
+#: src/tools/dvdomatic.cc:193
 msgid "&File"
 msgstr "&Fichier"
 
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:198
 msgid "&Help"
 msgstr "&Aide"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:197
 msgid "&Jobs"
 msgstr "&Travaux"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dvdomatic.cc:180
 msgid "&Make DCP"
 msgstr "&Créer le DCP"
 
@@ -44,7 +48,7 @@ msgstr "&Créer le DCP"
 msgid "&Open..."
 msgstr "&Ouvrir..."
 
-#: src/tools/dvdomatic.cc:171
+#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
 msgid "&Preferences..."
 msgstr "&Préférences..."
 
@@ -52,47 +56,49 @@ msgstr "&Préférences..."
 msgid "&Properties..."
 msgstr "&Propriétés..."
 
-#: src/tools/dvdomatic.cc:168
-msgid "&Quit"
-msgstr "&Quitter"
-
 #: src/tools/dvdomatic.cc:164
 msgid "&Save"
 msgstr "&Enregistrer"
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:181
 msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP dans le TMS"
 
-#: 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:438
+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:181
+#: src/tools/dvdomatic.cc:190
 msgid "About"
 msgstr "A Propos"
 
-#: src/tools/dvdomatic.cc:502
+#: src/tools/dvdomatic.cc:188
+#, fuzzy
+msgid "About DVD-o-matic"
+msgstr "DVD-o-matic"
+
+#: src/tools/dvdomatic.cc:520
 #, fuzzy
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %s (%s)"
 
-#: src/tools/dvdomatic.cc:348
+#: src/tools/dvdomatic.cc:360
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dvdomatic.cc:288
-#: src/tools/dvdomatic.cc:419
-#: src/tools/dvdomatic.cc:506
+#: src/tools/dvdomatic.cc:300 src/tools/dvdomatic.cc:431
+#: src/tools/dvdomatic.cc:524
 msgid "DVD-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:79
 msgid "Film changed"
 msgstr "Film changé"
 
-#: src/tools/dvdomatic.cc:425
+#: src/tools/dvdomatic.cc:437
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Création de DCP libre et open-source à partir de presque tout."
 
@@ -100,26 +106,36 @@ msgstr "Création de DCP libre et open-source à partir de presque tout."
 msgid "New..."
 msgstr "Nouveau..."
 
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:182
 msgid "S&how DCP"
 msgstr "Voir le DCP"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dvdomatic.cc:78
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Enregistrer les changements du film \"%s\" avant de fermer ?"
 
-#: src/tools/dvdomatic.cc:328
+#: src/tools/dvdomatic.cc:340
 msgid "Select film to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: 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:319
+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:345
+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"
 
-#: 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"
+#~ msgid "&Quit"
+#~ msgstr "&Quitter"
 
 #, fuzzy
 #~ msgid "The directory %1 already exists."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index d1f0b01bb..2f42c2d54 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-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+0100\n"
 "PO-Revision-Date: 2013-04-28 10:31+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
@@ -17,27 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:178
+#: src/tools/dvdomatic.cc:184
 msgid "&Analyse audio"
 msgstr "&Analizza audio"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:195
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dvdomatic.cc:170
+msgid "&Exit"
+msgstr ""
+
+#: src/tools/dvdomatic.cc:193
 msgid "&File"
 msgstr "&File"
 
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:198
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:197
 msgid "&Jobs"
 msgstr "&Lavori"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dvdomatic.cc:180
 msgid "&Make DCP"
 msgstr "&Crea DCP"
 
@@ -45,7 +49,7 @@ msgstr "&Crea DCP"
 msgid "&Open..."
 msgstr "&Apri..."
 
-#: src/tools/dvdomatic.cc:171
+#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
 msgid "&Preferences..."
 msgstr "&Preferenze..."
 
@@ -53,47 +57,48 @@ msgstr "&Preferenze..."
 msgid "&Properties..."
 msgstr "&Proprieta'..."
 
-#: src/tools/dvdomatic.cc:168
-msgid "&Quit"
-msgstr "&Esci"
-
 #: src/tools/dvdomatic.cc:164
 msgid "&Save"
 msgstr "&Salva"
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:181
 msgid "&Send DCP to TMS"
 msgstr "&Invia DCP a TMS"
 
-#: src/tools/dvdomatic.cc:426
+#: src/tools/dvdomatic.cc:438
 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:181
+#: src/tools/dvdomatic.cc:190
 msgid "About"
 msgstr "Informazioni"
 
-#: src/tools/dvdomatic.cc:502
+#: src/tools/dvdomatic.cc:188
+#, fuzzy
+msgid "About DVD-o-matic"
+msgstr "DVD-o-matic"
+
+#: src/tools/dvdomatic.cc:520
 msgid "Could not load film %1 (%2)"
 msgstr "Non posso caricare il film %s (%s)"
 
-#: src/tools/dvdomatic.cc:348
+#: src/tools/dvdomatic.cc:360
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Non posso aprire il film in %s (%s)"
 
-#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
-#: src/tools/dvdomatic.cc:506
+#: src/tools/dvdomatic.cc:300 src/tools/dvdomatic.cc:431
+#: src/tools/dvdomatic.cc:524
 msgid "DVD-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:79
 msgid "Film changed"
 msgstr "Film modificato"
 
-#: src/tools/dvdomatic.cc:425
+#: src/tools/dvdomatic.cc:437
 msgid "Free, open-source DCP generation from almost anything."
 msgstr "Genera DCP da quasi tutto, free e open-source."
 
@@ -101,30 +106,33 @@ msgstr "Genera DCP da quasi tutto, free e open-source."
 msgid "New..."
 msgstr "Nuovo"
 
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:182
 msgid "S&how DCP"
 msgstr "&Mostra DCP"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dvdomatic.cc:78
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Salvare i cambiamenti del film \"%s\" prima di chiudere?"
 
-#: src/tools/dvdomatic.cc:328
+#: src/tools/dvdomatic.cc:340
 msgid "Select film to open"
 msgstr "Seleziona il film da aprire"
 
-#: src/tools/dvdomatic.cc:307
+#: src/tools/dvdomatic.cc:319
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:333
+#: src/tools/dvdomatic.cc:345
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr ""
 
+#~ msgid "&Quit"
+#~ msgstr "&Esci"
+
 #~ 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 7e88f84b1..662b74bb3 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-05-09 09:51+0100\n"
+"POT-Creation-Date: 2013-06-04 23:59+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,27 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: src/tools/dvdomatic.cc:178
+#: src/tools/dvdomatic.cc:184
 msgid "&Analyse audio"
 msgstr "&Analysera audio"
 
-#: src/tools/dvdomatic.cc:184
+#: src/tools/dvdomatic.cc:195
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: src/tools/dvdomatic.cc:183
+#: src/tools/dvdomatic.cc:170
+msgid "&Exit"
+msgstr ""
+
+#: src/tools/dvdomatic.cc:193
 msgid "&File"
 msgstr "&Fil"
 
-#: src/tools/dvdomatic.cc:186
+#: src/tools/dvdomatic.cc:198
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: src/tools/dvdomatic.cc:185
+#: src/tools/dvdomatic.cc:197
 msgid "&Jobs"
 msgstr "&Jobb"
 
-#: src/tools/dvdomatic.cc:174
+#: src/tools/dvdomatic.cc:180
 msgid "&Make DCP"
 msgstr "&Skapa DCP"
 
@@ -45,7 +49,7 @@ msgstr "&Skapa DCP"
 msgid "&Open..."
 msgstr "&Öppna"
 
-#: src/tools/dvdomatic.cc:171
+#: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
 msgid "&Preferences..."
 msgstr "&Inställningar"
 
@@ -53,47 +57,48 @@ msgstr "&Inställningar"
 msgid "&Properties..."
 msgstr "&Egenskaper"
 
-#: src/tools/dvdomatic.cc:168
-msgid "&Quit"
-msgstr "&Avsluta"
-
 #: src/tools/dvdomatic.cc:164
 msgid "&Save"
 msgstr "&Spara"
 
-#: src/tools/dvdomatic.cc:175
+#: src/tools/dvdomatic.cc:181
 msgid "&Send DCP to TMS"
 msgstr "&Skicka DCP till TMS"
 
-#: src/tools/dvdomatic.cc:426
+#: src/tools/dvdomatic.cc:438
 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:181
+#: src/tools/dvdomatic.cc:190
 msgid "About"
 msgstr "Om"
 
-#: src/tools/dvdomatic.cc:502
+#: src/tools/dvdomatic.cc:188
+#, fuzzy
+msgid "About DVD-o-matic"
+msgstr "DVD-o-matic"
+
+#: src/tools/dvdomatic.cc:520
 msgid "Could not load film %1 (%2)"
 msgstr "Kunde inte öppna filmen %1 (%2)"
 
-#: src/tools/dvdomatic.cc:348
+#: src/tools/dvdomatic.cc:360
 #, c-format
 msgid "Could not open film at %s (%s)"
 msgstr "Kunde inte öppna filmen vid %s (%s)"
 
-#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
-#: src/tools/dvdomatic.cc:506
+#: src/tools/dvdomatic.cc:300 src/tools/dvdomatic.cc:431
+#: src/tools/dvdomatic.cc:524
 msgid "DVD-o-matic"
 msgstr "DVD-o-matic"
 
-#: src/tools/dvdomatic.cc:76
+#: src/tools/dvdomatic.cc:79
 msgid "Film changed"
 msgstr "Film ändrad"
 
-#: src/tools/dvdomatic.cc:425
+#: src/tools/dvdomatic.cc:437
 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."
@@ -102,26 +107,26 @@ msgstr ""
 msgid "New..."
 msgstr "Ny..."
 
-#: src/tools/dvdomatic.cc:176
+#: src/tools/dvdomatic.cc:182
 msgid "S&how DCP"
 msgstr "&Visa DCP"
 
-#: src/tools/dvdomatic.cc:75
+#: src/tools/dvdomatic.cc:78
 #, fuzzy, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "Spara ändringarna till filmen \"%1\" före avslut?"
 
-#: src/tools/dvdomatic.cc:328
+#: src/tools/dvdomatic.cc:340
 msgid "Select film to open"
 msgstr "Välj film att öppna"
 
-#: src/tools/dvdomatic.cc:307
+#: src/tools/dvdomatic.cc:319
 msgid ""
 "The directory %1 already exists and is not empty.  Are you sure you want to "
 "use it?"
 msgstr ""
 
-#: src/tools/dvdomatic.cc:333
+#: src/tools/dvdomatic.cc:345
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
@@ -129,5 +134,8 @@ msgstr ""
 "Du har inte valt en folder. Se till att välja en folder innan du klickar på "
 "Öppna."
 
+#~ msgid "&Quit"
+#~ msgstr "&Avsluta"
+
 #~ msgid "The directory %1 already exists."
 #~ msgstr "Katalogen %1 finns redan."
diff --git a/src/wx/about_dialog.cc b/src/wx/about_dialog.cc
new file mode 100644
index 000000000..84cfbce08
--- /dev/null
+++ b/src/wx/about_dialog.cc
@@ -0,0 +1,146 @@
+/*
+    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/notebook.h>
+#include "lib/version.h"
+#include "lib/compose.hpp"
+#include "about_dialog.h"
+#include "wx_util.h"
+
+using std::vector;
+
+AboutDialog::AboutDialog (wxWindow* parent)
+	: wxDialog (parent, wxID_ANY, _("About DVD-o-matic"))
+{
+	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
+	
+	wxFont title_font (*wxNORMAL_FONT);
+	title_font.SetPointSize (title_font.GetPointSize() + 4);
+	title_font.SetWeight (wxFONTWEIGHT_BOLD);
+
+	wxFont version_font (*wxNORMAL_FONT);
+	version_font.SetWeight (wxFONTWEIGHT_BOLD);
+	
+	wxStaticText* t = new wxStaticText (this, wxID_ANY, _("DVD-o-matic"));
+	t->SetFont (title_font);
+	sizer->Add (t, wxSizerFlags().Centre().Border());
+
+	wxString s;
+	if (strcmp (dvdomatic_git_commit, "release") == 0) {
+		t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1", dvdomatic_version)));
+	} else {
+		t = new wxStaticText (this, wxID_ANY, std_to_wx (String::compose ("Version %1 git %2", dvdomatic_version, dvdomatic_git_commit)));
+	}
+	t->SetFont (version_font);
+	sizer->Add (t, wxSizerFlags().Centre().Border());
+	sizer->AddSpacer (12);
+
+	t = new wxStaticText (
+		this, wxID_ANY,
+		_("Free, open-source DCP generation from almost anything."),
+		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
+		);
+	
+	sizer->Add (t, wxSizerFlags().Centre().Border());
+
+	t = new wxStaticText (
+		this, wxID_ANY,
+		_("(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen"),
+		wxDefaultPosition, wxDefaultSize, wxALIGN_CENTER
+		);
+	
+	sizer->Add (t, wxSizerFlags().Centre().Border());
+
+	_notebook = new wxNotebook (this, wxID_ANY);
+
+	wxArrayString written_by;
+	written_by.Add (wxT ("Carl Hetherington"));
+	written_by.Add (wxT ("Terrence Meiczinger"));
+	written_by.Add (wxT ("Paul Davis"));
+	written_by.Add (wxT ("Ole Laursen"));
+	add_section (_("Written by"), written_by);
+
+	wxArrayString translated_by;
+	translated_by.Add (wxT ("Olivier Perriere"));
+	translated_by.Add (wxT ("Lilian Lefranc"));
+	translated_by.Add (wxT ("Thierry Journet"));
+	translated_by.Add (wxT ("Massimiliano Broggi"));
+	translated_by.Add (wxT ("Manuel AC"));
+	translated_by.Add (wxT ("Adam Klotblixt"));
+	add_section (_("Translated by"), translated_by);
+
+	wxArrayString supported_by;
+	supported_by.Add (wxT ("Carsten Kurz"));
+	supported_by.Add (wxT ("Wolfgang Woehl"));
+	supported_by.Add (wxT ("Manual AC"));
+	supported_by.Add (wxT ("Theo Lipfert"));
+	supported_by.Add (wxT ("Olivier Lemaire"));
+	supported_by.Add (wxT ("Andrä Steiner"));
+	supported_by.Add (wxT ("Jonathan Jensen"));
+	supported_by.Add (wxT ("Kjarten Michaelsen"));
+	supported_by.Add (wxT ("Jussi Siponen"));
+	supported_by.Add (wxT ("Cinema Clarici"));
+	supported_by.Add (wxT ("Evan Freeze"));
+	supported_by.Add (wxT ("Flor Guillaume"));
+	supported_by.Add (wxT ("Adam Klotblixt "));
+	supported_by.Add (wxT ("Lilian Lefranc"));
+	supported_by.Add (wxT ("Gavin Lewarne"));
+	supported_by.Add (wxT ("Lasse Salling"));
+	supported_by.Add (wxT ("Andres Fink"));
+	supported_by.Add (wxT ("Kieran Carroll"));
+	add_section (_("Supported by"), supported_by);
+
+	sizer->Add (_notebook, wxSizerFlags().Centre().Border().Expand());
+	
+#if 0	
+	info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic"));
+#endif
+
+	SetSizerAndFit (sizer);
+}
+
+void
+AboutDialog::add_section (wxString name, wxArrayString credits)
+{
+	static bool first = true;
+	int const N = 3;
+
+	wxPanel* panel = new wxPanel (_notebook, wxID_ANY);
+	wxSizer* overall_sizer = new wxBoxSizer (wxHORIZONTAL);
+
+	vector<wxSizer*> sizers;
+	
+	for (int i = 0; i < N; ++i) {
+		sizers.push_back (new wxBoxSizer (wxVERTICAL));
+		overall_sizer->Add (sizers.back (), 1, wxEXPAND | wxALL, 6);
+	}
+
+	int c = 0;
+	for (size_t i = 0; i < credits.Count(); ++i) {
+		add_label_to_sizer (sizers[c], panel, credits[i]);
+		++c;
+		if (c == N) {
+			c = 0;
+		}
+	}
+
+	panel->SetSizerAndFit (overall_sizer);
+	_notebook->AddPage (panel, name, first);
+	first = false;
+}
diff --git a/src/wx/about_dialog.h b/src/wx/about_dialog.h
new file mode 100644
index 000000000..a78abb93e
--- /dev/null
+++ b/src/wx/about_dialog.h
@@ -0,0 +1,34 @@
+/*
+    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/wx.h>
+
+class wxNotebook;
+
+class AboutDialog : public wxDialog
+{
+public:
+	AboutDialog (wxWindow *);
+
+private:
+	void add_section (wxString, wxArrayString);
+
+	wxNotebook* _notebook;
+};
+
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 efc8436c5..8bc806755 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdvdomatic-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,7 @@ msgid "%"
 msgstr "%"
 
 #: src/wx/config_dialog.cc:98
-msgid "(restart DCP-o-matic to see language changes)"
+msgid "(restart DVD-o-matic to see language changes)"
 msgstr ""
 
 #: src/wx/film_editor.cc:1276
@@ -103,7 +103,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)"
@@ -113,7 +113,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)"
@@ -123,7 +123,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"
 
@@ -149,15 +149,15 @@ msgstr "Velocidad DCP"
 msgid "DCP Name"
 msgstr "Nombre DCP"
 
-#: src/wx/config_dialog.cc:46
-#, fuzzy
-msgid "DCP-o-matic Preferences"
-msgstr "Preferencias DVD-o-matic"
-
 #: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 msgid "DVD-o-matic"
 msgstr "DVD-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 "DVD-o-matic audio - %s"
@@ -222,7 +222,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"
 
@@ -302,7 +302,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"
 
@@ -345,7 +345,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..."
 
@@ -466,7 +466,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 ad138d45a..5c0a7b63c 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-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"
 
@@ -148,15 +148,15 @@ msgstr "Cadence image du DCP"
 msgid "DCP Name"
 msgstr "Nom du DCP"
 
-#: src/wx/config_dialog.cc:46
-msgid "DCP-o-matic Preferences"
-msgstr "Préférences de DCP-o-matic"
-
-#: src/wx/wx_util.cc:63
-#: src/wx/wx_util.cc:71
+#: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 msgid "DVD-o-matic"
 msgstr "DVD-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 "DVD-o-matic audio - %s"
@@ -178,8 +178,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..."
 
@@ -195,8 +194,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..."
@@ -222,12 +220,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"
 
@@ -263,8 +260,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"
 
@@ -304,12 +300,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"
 
@@ -335,8 +330,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"
 
@@ -348,7 +342,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..."
 
@@ -466,7 +460,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"
 
@@ -538,8 +532,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"
 
@@ -557,8 +550,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 37ee492fe..518bd7dde 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"
@@ -23,7 +23,7 @@ msgstr "%"
 
 #: src/wx/config_dialog.cc:98
 #, fuzzy
-msgid "(restart DCP-o-matic to see language changes)"
+msgid "(restart DVD-o-matic to see language changes)"
 msgstr "(riavviare DVD-o-matic per vedere i cambiamenti di lingua)"
 
 #: src/wx/film_editor.cc:1276
@@ -104,7 +104,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)"
@@ -114,7 +114,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)"
@@ -124,7 +124,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"
 
@@ -150,15 +150,15 @@ msgstr "Frequenza fotogrammi del DCP"
 msgid "DCP Name"
 msgstr "Nome del DCP"
 
-#: src/wx/config_dialog.cc:46
-#, fuzzy
-msgid "DCP-o-matic Preferences"
-msgstr "Preferenze DVD-o-matic"
-
 #: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 msgid "DVD-o-matic"
 msgstr "DVD-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 "DVD-o-matic audio - %s"
@@ -223,7 +223,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"
 
@@ -303,7 +303,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"
 
@@ -346,7 +346,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..."
 
@@ -467,7 +467,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 7c10aebcb..6eda1cf4b 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/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-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"
@@ -23,7 +23,7 @@ msgstr "%"
 
 #: src/wx/config_dialog.cc:98
 #, fuzzy
-msgid "(restart DCP-o-matic to see language changes)"
+msgid "(restart DVD-o-matic to see language changes)"
 msgstr "(starta om DVD-o-matic för att se språkändringar)"
 
 #: src/wx/film_editor.cc:1276
@@ -104,7 +104,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)"
@@ -114,7 +114,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)"
@@ -124,7 +124,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"
 
@@ -150,15 +150,15 @@ msgstr "DCP bildhastighet"
 msgid "DCP Name"
 msgstr "DCP Namn"
 
-#: src/wx/config_dialog.cc:46
-#, fuzzy
-msgid "DCP-o-matic Preferences"
-msgstr "DVD-o-matic Inställningar"
-
 #: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 msgid "DVD-o-matic"
 msgstr "DVD-o-matic"
 
+#: 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 "DVD-o-matic audio - %s"
@@ -223,7 +223,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"
 
@@ -303,7 +303,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"
 
@@ -346,7 +346,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..."
 
@@ -467,7 +467,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"
 
diff --git a/src/wx/wscript b/src/wx/wscript
index 42bb8ca88..1c5e3b8cc 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -4,6 +4,7 @@ from waflib import Logs
 import i18n
 
 sources = """
+          about_dialog.cc
           audio_dialog.cc
           audio_plot.cc
           config_dialog.cc
diff --git a/test/pixel_formats_test.cc b/test/pixel_formats_test.cc
index 84f2a33ce..b788b3219 100644
--- a/test/pixel_formats_test.cc
+++ b/test/pixel_formats_test.cc
@@ -65,6 +65,7 @@ BOOST_AUTO_TEST_CASE (pixel_formats_test)
 		f->width = 640;
 		f->height = 480;
 		f->format = static_cast<int> (i->format);
+                av_frame_get_buffer (f, true);
 		SimpleImage t (f);
 		BOOST_CHECK_EQUAL(t.components(), i->components);
 		BOOST_CHECK_EQUAL(t.lines(0), i->lines[0]);
diff --git a/wscript b/wscript
index 1d471f043..df2178711 100644
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.94beta1'
+VERSION = '0.96pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -61,7 +61,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', '-O2')
 
     if not conf.options.static:
-        conf.check_cfg(package = 'libdcp', atleast_version = '0.49', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+        conf.check_cfg(package = 'libdcp', atleast_version = '0.52', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
         conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
         conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
         conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)