Merge.

diff --combined src/lib/ab_transcode_job.cc
index 2d6f99c91e8cb7a509bf686154ddf8c1e9f86761,a204677db34910be180bfd9a94fa22bd20857ab5..bdde8a40576459d06328a8c5ca0a0563b787e3dc
--- 1/src/lib/ab_transcode_job.cc
--- 2/src/lib/ab_transcode_job.cc
+++ b/src/lib/ab_transcode_job.cc
@@@ -20,8 -20,12 +20,8 @@@
  #include <stdexcept>
  #include "ab_transcode_job.h"
  #include "film.h"
 -#include "format.h"
 -#include "filter.h"
  #include "ab_transcoder.h"
  #include "config.h"
 -#include "encoder.h"
 -#include "log.h"
  
  #include "i18n.h"
  
@@@ -29,14 -33,15 +29,14 @@@ using std::string
  using boost::shared_ptr;
  
  /** @param f Film to compare.
 - *  @param o Decode options.
   */
 -ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f, DecodeOptions o)
 +ABTranscodeJob::ABTranscodeJob (shared_ptr<Film> f)
        : Job (f)
 -      , _decode_opt (o)
  {
        _film_b.reset (new Film (*_film));
        _film_b->set_scaler (Config::instance()->reference_scaler ());
 -      _film_b->set_filters (Config::instance()->reference_filters ());
 +      /* XXX */
 +//    _film_b->set_filters (Config::instance()->reference_filters ());
  }
  
  string
@@@ -50,14 -55,18 +50,18 @@@ ABTranscodeJob::run (
  {
        try {
                /* _film_b is the one with reference filters */
 -              ABTranscoder w (_film_b, _film, _decode_opt, this, shared_ptr<Encoder> (new Encoder (_film)));
 +              ABTranscoder w (_film_b, _film, shared_from_this ());
                w.go ();
                set_progress (1);
                set_state (FINISHED_OK);
  
+               _film->log()->log ("A/B transcode job completed successfully");
+ 
        } catch (std::exception& e) {
  
+               set_progress (1);
                set_state (FINISHED_ERROR);
- 
+               _film->log()->log (String::compose ("A/B transcode job failed (%1)", e.what()));
+               throw;
        }
  }

diff --combined src/lib/encoder.cc
index f3745ff98aad53da45e403109518bac768ed29ba,2c989452d012b7773cda11f97c91ee5341e3e0d4..4dff19ea6dbd8bc93f0fd7573c77cc206e6768e5
--- 1/src/lib/encoder.cc
--- 2/src/lib/encoder.cc
+++ b/src/lib/encoder.cc
@@@ -22,13 -22,20 +22,13 @@@
   */
  
  #include <iostream>
 -#include <boost/filesystem.hpp>
 -#include <boost/lexical_cast.hpp>
 -#include <libdcp/picture_asset.h>
  #include "encoder.h"
  #include "util.h"
 -#include "options.h"
  #include "film.h"
  #include "log.h"
 -#include "exceptions.h"
 -#include "filter.h"
  #include "config.h"
  #include "dcp_video_frame.h"
  #include "server.h"
 -#include "format.h"
  #include "cross.h"
  #include "writer.h"
  
@@@ -41,16 -48,18 +41,16 @@@ using std::vector
  using std::list;
  using std::cout;
  using std::make_pair;
 -using namespace boost;
 +using boost::shared_ptr;
 +using boost::optional;
  
  int const Encoder::_history_size = 25;
  
  /** @param f Film that we are encoding */
 -Encoder::Encoder (shared_ptr<Film> f)
 +Encoder::Encoder (shared_ptr<Film> f, shared_ptr<Job> j)
        : _film (f)
 -      , _video_frames_in (0)
 +      , _job (j)
        , _video_frames_out (0)
 -#ifdef HAVE_SWRESAMPLE          
 -      , _swr_context (0)
 -#endif
        , _have_a_real_frame (false)
        , _terminate (false)
  {
@@@ -68,6 -77,35 +68,6 @@@ Encoder::~Encoder (
  void
  Encoder::process_begin ()
  {
 -      if (_film->audio_stream() && _film->audio_stream()->sample_rate() != _film->target_audio_sample_rate()) {
 -#ifdef HAVE_SWRESAMPLE
 -
 -              stringstream s;
 -              s << String::compose (N_("Will resample audio from %1 to %2"), _film->audio_stream()->sample_rate(), _film->target_audio_sample_rate());
 -              _film->log()->log (s.str ());
 -
 -              /* We will be using planar float data when we call the resampler */
 -              _swr_context = swr_alloc_set_opts (
 -                      0,
 -                      _film->audio_stream()->channel_layout(),
 -                      AV_SAMPLE_FMT_FLTP,
 -                      _film->target_audio_sample_rate(),
 -                      _film->audio_stream()->channel_layout(),
 -                      AV_SAMPLE_FMT_FLTP,
 -                      _film->audio_stream()->sample_rate(),
 -                      0, 0
 -                      );
 -              
 -              swr_init (_swr_context);
 -#else
 -              throw EncodeError (_("Cannot resample audio as libswresample is not present"));
 -#endif
 -      } else {
 -#ifdef HAVE_SWRESAMPLE
 -              _swr_context = 0;
 -#endif                
 -      }
 -
        for (int i = 0; i < Config::instance()->num_local_encoding_threads (); ++i) {
                _threads.push_back (new boost::thread (boost::bind (&Encoder::encoder_thread, this, (ServerDescription *) 0)));
        }
@@@ -80,13 -118,37 +80,13 @@@
                }
        }
  
 -      _writer.reset (new Writer (_film));
 +      _writer.reset (new Writer (_film, _job));
  }
  
  
  void
  Encoder::process_end ()
  {
 -#if HAVE_SWRESAMPLE   
 -      if (_film->audio_stream() && _film->audio_stream()->channels() && _swr_context) {
 -
 -              shared_ptr<AudioBuffers> out (new AudioBuffers (_film->audio_stream()->channels(), 256));
 -                      
 -              while (1) {
 -                      int const frames = swr_convert (_swr_context, (uint8_t **) out->data(), 256, 0, 0);
 -
 -                      if (frames < 0) {
 -                              throw EncodeError (_("could not run sample-rate converter"));
 -                      }
 -
 -                      if (frames == 0) {
 -                              break;
 -                      }
 -
 -                      out->set_frames (frames);
 -                      write_audio (out);
 -              }
 -
 -              swr_free (&_swr_context);
 -      }
 -#endif
 -
        boost::mutex::scoped_lock lock (_mutex);
  
        _film->log()->log (String::compose (N_("Clearing queue of %1"), _queue.size ()));
@@@ -131,7 -193,7 +131,7 @@@
   *  or 0 if not known.
   */
  float
 -Encoder::current_frames_per_second () const
 +Encoder::current_encoding_rate () const
  {
        boost::mutex::scoped_lock lock (_history_mutex);
        if (int (_time_history.size()) < _history_size) {
@@@ -169,8 -231,15 +169,8 @@@ Encoder::frame_done (
  }
  
  void
 -Encoder::process_video (shared_ptr<const Image> image, bool same, boost::shared_ptr<Subtitle> sub)
 +Encoder::process_video (shared_ptr<const Image> image, bool same, Time)
  {
 -      FrameRateConversion frc (_film->source_frame_rate(), _film->dcp_frame_rate());
 -      
 -      if (frc.skip && (_video_frames_in % 2)) {
 -              ++_video_frames_in;
 -              return;
 -      }
 -
        boost::mutex::scoped_lock lock (_mutex);
  
        /* Wait until the queue has gone down a bit */
@@@ -198,12 -267,15 +198,12 @@@
                frame_done ();
        } else {
                /* Queue this new frame for encoding */
 -              pair<string, string> const s = Filter::ffmpeg_strings (_film->filters());
                TIMING ("adding to queue of %1", _queue.size ());
 -              _queue.push_back (boost::shared_ptr<DCPVideoFrame> (
 +              /* XXX: padding */
 +              _queue.push_back (shared_ptr<DCPVideoFrame> (
                                          new DCPVideoFrame (
 -                                                image, sub, _film->format()->dcp_size(), _film->format()->dcp_padding (_film),
 -                                                _film->subtitle_offset(), _film->subtitle_scale(),
 -                                                _film->scaler(), _video_frames_out, _film->dcp_frame_rate(), s.second,
 -                                                _film->colour_lut(), _film->j2k_bandwidth(),
 -                                                _film->log()
 +                                                image, _video_frames_out, _film->dcp_video_frame_rate(),
 +                                                _film->colour_lut(), _film->j2k_bandwidth(), _film->log()
                                                  )
                                          ));
                
@@@ -211,13 -283,49 +211,13 @@@
                _have_a_real_frame = true;
        }
  
 -      ++_video_frames_in;
        ++_video_frames_out;
 -
 -      if (frc.repeat) {
 -              _writer->repeat (_video_frames_out);
 -              ++_video_frames_out;
 -              frame_done ();
 -      }
  }
  
  void
 -Encoder::process_audio (shared_ptr<const AudioBuffers> data)
 +Encoder::process_audio (shared_ptr<const AudioBuffers> data, Time)
  {
 -      if (!data->frames ()) {
 -              return;
 -      }
 -      
 -#if HAVE_SWRESAMPLE
 -      /* Maybe sample-rate convert */
 -      if (_swr_context) {
 -
 -              /* Compute the resampled frames count and add 32 for luck */
 -              int const max_resampled_frames = ceil ((int64_t) data->frames() * _film->target_audio_sample_rate() / _film->audio_stream()->sample_rate()) + 32;
 -
 -              shared_ptr<AudioBuffers> resampled (new AudioBuffers (_film->audio_stream()->channels(), max_resampled_frames));
 -
 -              /* Resample audio */
 -              int const resampled_frames = swr_convert (
 -                      _swr_context, (uint8_t **) resampled->data(), max_resampled_frames, (uint8_t const **) data->data(), data->frames()
 -                      );
 -              
 -              if (resampled_frames < 0) {
 -                      throw EncodeError (_("could not run sample-rate converter"));
 -              }
 -
 -              resampled->set_frames (resampled_frames);
 -              
 -              /* And point our variables at the resampled audio */
 -              data = resampled;
 -      }
 -#endif
 -
 -      write_audio (data);
 +      _writer->write (data);
  }
  
  void
@@@ -234,6 -342,8 +234,8 @@@ Encoder::terminate_threads (
                }
                delete *i;
        }
+ 
+       _threads.clear ();
  }
  
  void
@@@ -258,7 -368,7 +260,7 @@@ Encoder::encoder_thread (ServerDescript
                }
  
                TIMING ("encoder thread %1 wakes with queue of %2", boost::this_thread::get_id(), _queue.size());
 -              boost::shared_ptr<DCPVideoFrame> vf = _queue.front ();
 +              shared_ptr<DCPVideoFrame> vf = _queue.front ();
                _film->log()->log (String::compose (N_("Encoder thread %1 pops frame %2 from queue"), boost::this_thread::get_id(), vf->frame()), Log::VERBOSE);
                _queue.pop_front ();
                
@@@ -312,10 -422,34 +314,10 @@@
                }
  
                if (remote_backoff > 0) {
 -                      dvdomatic_sleep (remote_backoff);
 +                      dcpomatic_sleep (remote_backoff);
                }
  
                lock.lock ();
                _condition.notify_all ();
        }
  }
 -
 -void
 -Encoder::write_audio (shared_ptr<const AudioBuffers> data)
 -{
 -      AudioMapping m (_film->audio_channels ());
 -      if (m.dcp_channels() != _film->audio_channels()) {
 -
 -              /* Remap (currently just for mono -> 5.1) */
 -
 -              shared_ptr<AudioBuffers> b (new AudioBuffers (m.dcp_channels(), data->frames ()));
 -              for (int i = 0; i < m.dcp_channels(); ++i) {
 -                      optional<int> s = m.dcp_to_source (static_cast<libdcp::Channel> (i));
 -                      if (!s) {
 -                              b->make_silent (i);
 -                      } else {
 -                              memcpy (b->data()[i], data->data()[s.get()], data->frames() * sizeof(float));
 -                      }
 -              }
 -
 -              data = b;
 -      }
 -
 -      _writer->write (data);
 -}

diff --combined src/lib/po/es_ES.po
index 58ad48a9c9fd2d411910c38a8da878acf9f06759,39b6dfceb25d2ce070ef6c36ddfd40449ddcf799..7a07645b7088eb3371c6f965067c9f7e1edee301
--- 1/src/lib/po/es_ES.po
--- 2/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: LIBDVDOMATIC\n"
 +"Project-Id-Version: LIBDCPOMATIC\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 +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 +107,7 @@@ msgid "Cannot resample audio as libswre
  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 +139,16 @@@ msgstr "No se pudo escribir el fichero 
  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 +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 +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 +227,10 @@@
  msgid "Force quantizer"
  msgstr "Force quantizer"
  
+ #: src/lib/format.cc:123
+ msgid "Full frame"
+ msgstr ""
+ 
  #: src/lib/scaler.cc:65
  msgid "Gaussian"
  msgstr "Gaussiano"
@@@ -250,10 -254,10 +254,10 @@@ msgstr "Horizontal deblocking filter A
  #: 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)"
 +"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
  msgstr ""
  "Error desconocido. La mejor idea es informar del problema a la lista de "
 -"correo de DVD-O-matic (dvdomatic@carlh.net)"
 +"correo de DCP-o-matic (dcpomatic@carlh.net)"
  
  #: src/lib/filter.cc:82
  msgid "Kernel deinterlacer"
@@@ -263,15 -267,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 +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 +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 +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 +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 +441,11 @@@
  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 +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 +492,7 @@@ msgstr "no se pudo abrir el fichero par
  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 +517,7 @@@ msgstr "los ficheros externos de sonid
  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 +525,23 @@@
  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 +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 +571,19 @@@ msgstr "todavía no se soportan subtít
  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 --combined src/lib/po/fr_FR.po
index f7e362edafbcd72ce55a19956c25f7a1689680ca,9dcbd42c2f97de7028b2c1989073f24684ca2476..f68631bbd97b21955516aebb0ec44f23bc0ef583
--- 1/src/lib/po/fr_FR.po
--- 2/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: DVD-o-matic FRENCH\n"
 +"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-21 10:30+0100\n"
  "Last-Translator: \n"
  "Language-Team: \n"
@@@ -61,7 -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 +105,7 @@@ msgstr "Format du pixel %1 non géré p
  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 +137,27 @@@ msgstr "Écriture vers fichier distant 
  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 +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 +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 +225,10 @@@
  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 +249,10 @@@ 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 DCP-o-matic mailing list (dcpomatic@carlh.net)"
 +msgstr "Erreur indéterminée. Merci de rapporter le problème à la liste DCP-o-matic (dcpomatic@carlh.net)"
  
  #: src/lib/filter.cc:82
  msgid "Kernel deinterlacer"
@@@ -268,15 -265,15 +262,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 +286,8 @@@ msgstr "Désentrelaceur linéaire inter
  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 +295,7 @@@
  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 +320,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 +340,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 +373,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 +396,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 +424,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 +436,11 @@@
  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 +452,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 +484,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 +508,7 @@@ msgstr "Les fichiers audio externes on
  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 +516,23 @@@
  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 +544,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 +562,19 @@@ msgstr "sous-titres non-bitmap non supp
  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 --combined src/lib/po/it_IT.po
index 1a46e67be31c9f70d96634ab9bd4d6697aebb9c5,9671c66a712634e59ef47bb676d5f2b1ea1e8b2d..0ddfa7721c2a63a725c38553d6c9f7f32b1e35d9
--- 1/src/lib/po/it_IT.po
--- 2/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@@ -7,7 -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 +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 +105,7 @@@ msgstr "Non posso gestire il formato d
  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 +137,15 @@@ msgstr "Non posso scrivere il file remo
  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 +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 +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 +224,10 @@@
  msgid "Force quantizer"
  msgstr "Forza quantizzatore"
  
+ #: src/lib/format.cc:123
+ msgid "Full frame"
+ msgstr ""
+ 
  #: src/lib/scaler.cc:65
  msgid "Gaussian"
  msgstr "Gaussiana"
@@@ -247,10 -251,10 +251,10 @@@ msgstr "Filtro A sblocco orizzontale
  #: 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)"
 +"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
  msgstr ""
  "Non sappiamo cosa ha causato questo errore. La cosa migliore è inviare un "
 -"report del problema alla mailing list di DVD-o-matic (dvdomatic@carlh.net)"
 +"report del problema alla mailing list di DCP-o-matic (dcpomatic@carlh.net)"
  
  #: src/lib/filter.cc:82
  msgid "Kernel deinterlacer"
@@@ -260,15 -264,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 +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 +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 +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 +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 +438,11 @@@
  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 +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 +486,7 @@@ msgstr "non riesco ad aprire il file pe
  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 +510,7 @@@ msgstr "i files dell'audio esterno hann
  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 +518,23 @@@
  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 +546,7 @@@ msgstr "persa la regolazione richiesta 
  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 +564,19 @@@ msgstr "sottotitoli non-bitmap non anco
  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 --combined src/lib/po/sv_SE.po
index d9a9c5955b05d0d71bca2c2fe9718d7b75c55e51,9391801dcf10457fc877372a186adce871b41968..c1c62ca41397f4fbe0b6f48b4de2f1272ab90009
--- 1/src/lib/po/sv_SE.po
--- 2/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: DVD-o-matic\n"
 +"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-10 15:35+0100\n"
  "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
  "Language-Team: \n"
@@@ -61,7 -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 +106,7 @@@ msgid "Cannot resample audio as libswre
  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 +138,15 @@@ msgstr "Kunde inte skriva till fjärrfi
  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 +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 +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 +225,10 @@@
  msgid "Force quantizer"
  msgstr "Tvinga kvantiserare"
  
+ #: src/lib/format.cc:123
+ msgid "Full frame"
+ msgstr ""
+ 
  #: src/lib/scaler.cc:65
  msgid "Gaussian"
  msgstr "Gaussisk"
@@@ -248,10 -252,10 +252,10 @@@ msgstr "Filter för horisontal kantighe
  #: 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)"
 +"problem to the DCP-o-matic mailing list (dcpomatic@carlh.net)"
  msgstr ""
  "Det är inte känt vad som orsakade detta fel. Bästa sättet att rapportera "
 -"problemet är till DVD-o-matics mejl-lista (dvdomatic@carlh.net)"
 +"problemet är till DCP-o-matics mejl-lista (dcpomatic@carlh.net)"
  
  #: src/lib/filter.cc:82
  msgid "Kernel deinterlacer"
@@@ -261,15 -265,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 +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 +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 +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 +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 +444,11 @@@
  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 +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 +492,7 @@@ msgstr "kunde inte öppna fil för läs
  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 +516,7 @@@ msgstr "externa audio-filer har olika l
  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 +524,23 @@@
  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 +552,7 @@@ msgstr "saknad nödvändig inställnin
  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 +570,19 @@@ msgstr "icke-rastergrafiska undertexte
  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 --combined src/tools/po/es_ES.po
index bceb9ffff011f1dc5ec4eb170bd2ca31882a6e19,bbae550d77718971513035634ed63378b835b1e6..01d7c1ad29a574931252c2b71a299a5c208fda77
--- 1/src/tools/po/es_ES.po
--- 2/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: DVDOMATIC\n"
 +"Project-Id-Version: DCPOMATIC\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 +17,31 @@@
  "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 +49,7 @@@
  msgid "&Open..."
  msgstr "&Abrir..."
  
- #: src/tools/dvdomatic.cc:171
+ #: src/tools/dvdomatic.cc:173 src/tools/dvdomatic.cc:176
  msgid "&Preferences..."
  msgstr "&Preferencias..."
  
@@@ -53,54 -57,49 +57,55 @@@
  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:300 src/tools/dvdomatic.cc:431
 -#: src/tools/dvdomatic.cc:524
 -msgid "DVD-o-matic"
 -msgstr "DVD-o-matic"
 +#: src/tools/dcpomatic.cc:287 src/tools/dcpomatic.cc:410
 +#: src/tools/dcpomatic.cc:531
 +msgid "DCP-o-matic"
 +msgstr "DCP-o-matic"
  
 -#: src/tools/dvdomatic.cc:79
 +#: src/tools/dcpomatic.cc:75
  msgid "Film changed"
  msgstr "Película cambiada"
  
 -#: src/tools/dvdomatic.cc:437
 +#: src/tools/dcpomatic.cc:416
 +#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
 +#: src/tools/dvdomatic.cc:506
- msgid "DVD-o-matic"
- msgstr "DVD-o-matic"
++msgid "DCP-o-matic"
++msgstr "DCP-o-matic"
 +
 +#: src/tools/dvdomatic.cc:425
  msgid "Free, open-source DCP generation from almost anything."
  msgstr ""
  "Generación de DCP a partir de casi cualquier fuente, libre y de código "
@@@ -110,31 -109,34 +115,34 @@@
  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 --combined src/tools/po/fr_FR.po
index a2c91e65ee19d8cfcd1cf041df65a8d6d9b66ab6,8a28a0e015041220d9c7d1fcb619114ca185e858..b9e39b3929e0035f0b1f9aa123ffcae5f5b97c17
--- 1/src/tools/po/fr_FR.po
--- 2/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: DVD-o-matic FRENCH\n"
 +"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:09+0100\n"
  "Last-Translator: \n"
  "Language-Team: \n"
@@@ -16,27 -16,31 +16,31 @@@
  "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 +48,7 @@@
  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 +56,49 @@@
  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 +106,36 @@@
  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 --combined src/tools/po/sv_SE.po
index 6507bb69cd688f32da0dc5a554dc6856ced4152e,662b74bb39dab3cd4daf82654bd8865bcaae86b6..157b1fb19a2f38a5d1f259346dd28b51ad30a627
--- 1/src/tools/po/sv_SE.po
--- 2/src/tools/po/sv_SE.po
+++ b/src/tools/po/sv_SE.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: DVD-o-matic\n"
 +"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:12+0100\n"
  "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
  "Language-Team: \n"
@@@ -17,27 -17,31 +17,31 @@@
  "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 +49,7 @@@
  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 +57,48 @@@
  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:300 src/tools/dvdomatic.cc:431
 -#: src/tools/dvdomatic.cc:524
 -msgid "DVD-o-matic"
 -msgstr "DVD-o-matic"
 +#: src/tools/dvdomatic.cc:288 src/tools/dvdomatic.cc:419
 +#: src/tools/dvdomatic.cc:506
 +msgid "DCP-o-matic"
 +msgstr "DCP-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 +107,26 @@@
  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?"
 +msgstr "Spara ändringarna till filmen \"%s\" 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 +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 --combined src/wx/po/es_ES.po
index bf5dce4b08e69d60c72de97ce20b4bde28d3b98a,8bc80675561edb758520f3875bab0909d2fe37b2..3ff32280d7c3b4afb606ab7d04c8be082efb571d
--- 1/src/wx/po/es_ES.po
--- 2/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: libdvdomatic-wx\n"
 +"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"
@@@ -21,8 -21,9 +21,7 @@@
  msgid "%"
  msgstr "%"
  
 -#: src/wx/config_dialog.cc:98
 -msgid "(restart DVD-o-matic to see language changes)"
 -msgstr ""
 +msgid "(restart DCP-o-matic to see language changes)"
- msgstr ""
  
  #: src/wx/film_editor.cc:1276
  msgid "1 channel"
@@@ -102,7 -103,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 -113,7 +111,7 @@@
  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 -123,7 +121,7 @@@
  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"
  
@@@ -148,18 -149,19 +147,23 @@@ msgstr "Velocidad DCP
  msgid "DCP Name"
  msgstr "Nombre DCP"
  
 -#: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 -msgid "DVD-o-matic"
 -msgstr "DVD-o-matic"
 +#: src/wx/wx_util.cc:61
 +msgid "DCP-o-matic"
 +msgstr "DCP-o-matic"
 +
 +#: src/wx/config_dialog.cc:44
 +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 "DVD-o-matic audio - %s"
 -msgstr "Audio DVD-o-matic - %1"
 +msgid "DCP-o-matic audio - %s"
 +msgstr "Audio DCP-o-matic - %1"
  
  #: src/wx/config_dialog.cc:120
  msgid "Default DCI name details"
@@@ -220,7 -222,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 -302,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 -345,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 -466,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 --combined src/wx/po/fr_FR.po
index aee97956f49d728a69ad4f242694f2e33e994e64,5c0a7b63c780cc0dc8e821cc5848f8120d1d0959..3f150bb0edc88d4b3e52fb5448c62c19117ddb4e
--- 1/src/wx/po/fr_FR.po
--- 2/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: DVD-o-matic FRENCH\n"
 +"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 +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 +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 +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 +113,7 @@@
  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 +123,7 @@@
  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,18 -148,19 +148,23 @@@ msgstr "Cadence image du DCP
  msgid "DCP Name"
  msgstr "Nom du DCP"
  
 -#: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 -msgid "DVD-o-matic"
 -msgstr "DVD-o-matic"
 +#: src/wx/wx_util.cc:61
 +msgid "DCP-o-matic"
 +msgstr "DCP-o-matic"
 +
 +#: src/wx/config_dialog.cc:44
 +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 "DVD-o-matic audio - %s"
 -msgstr "Son DVD-o-matic  - %s"
 +msgid "DCP-o-matic audio - %s"
 +msgstr "Son DCP-o-matic  - %s"
  
  #: src/wx/config_dialog.cc:120
  msgid "Default DCI name details"
@@@ -177,8 -178,7 +182,7 @@@ msgstr "Dossier par défaut des nouveau
  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 -194,7 +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 -220,11 +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 -260,7 +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 -300,11 +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 -330,7 +334,7 @@@ msgstr "Enveloppe noire de %dx%d (%.2f:
  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 -342,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 -460,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 -532,7 +536,7 @@@ msgstr "encoder toutes les images mais 
  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 -550,7 +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 --combined src/wx/po/it_IT.po
index f667a6f2147715b6b2a12c88fc3313b606ff79af,518bd7ddef1a9583edcdcc00d7d075533626260a..92161172a4fb3c11bd1f42f7eadedfe92720799e
--- 1/src/wx/po/it_IT.po
--- 2/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@@ -7,7 -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"
@@@ -21,9 -21,10 +21,9 @@@
  msgid "%"
  msgstr "%"
  
 -#: src/wx/config_dialog.cc:98
 -#, fuzzy
 -msgid "(restart DVD-o-matic to see language changes)"
 -msgstr "(riavviare DVD-o-matic per vedere i cambiamenti di lingua)"
 +#: src/wx/config_dialog.cc:61
 +msgid "(restart DCP-o-matic to see language changes)"
 +msgstr "(riavviare DCP-o-matic per vedere i cambiamenti di lingua)"
  
  #: src/wx/film_editor.cc:1276
  msgid "1 channel"
@@@ -103,7 -104,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 -114,7 +113,7 @@@
  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 -124,7 +123,7 @@@
  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"
  
@@@ -149,18 -150,19 +149,23 @@@ msgstr "Frequenza fotogrammi del DCP
  msgid "DCP Name"
  msgstr "Nome del DCP"
  
 -#: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 -msgid "DVD-o-matic"
 -msgstr "DVD-o-matic"
 +#: src/wx/wx_util.cc:61
 +msgid "DCP-o-matic"
 +msgstr "DCP-o-matic"
 +
 +#: src/wx/config_dialog.cc:44
 +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 "DVD-o-matic audio - %s"
 -msgstr "Audio DVD-o-matic - %s"
 +msgid "DCP-o-matic audio - %s"
 +msgstr "Audio DCP-o-matic - %s"
  
  #: src/wx/config_dialog.cc:120
  msgid "Default DCI name details"
@@@ -221,7 -223,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 -303,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 -346,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 -467,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 --combined src/wx/po/sv_SE.po
index f31d98c38a1d75ff7d7124bdc435b82c50d521ad,6eda1cf4bf52a1780b11183f9b2a5c60902819f1..02df467ca4b503b7f187e68ea8da7c584055cf9e
--- 1/src/wx/po/sv_SE.po
--- 2/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@@ -5,9 -5,9 +5,9 @@@
  #
  msgid ""
  msgstr ""
 -"Project-Id-Version: DVD-o-matic\n"
 +"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"
@@@ -21,9 -21,10 +21,9 @@@
  msgid "%"
  msgstr "%"
  
 -#: src/wx/config_dialog.cc:98
 -#, fuzzy
 -msgid "(restart DVD-o-matic to see language changes)"
 -msgstr "(starta om DVD-o-matic för att se språkändringar)"
 +#: src/wx/config_dialog.cc:61
 +msgid "(restart DCP-o-matic to see language changes)"
 +msgstr "(starta om DCP-o-matic för att se språkändringar)"
  
  #: src/wx/film_editor.cc:1276
  msgid "1 channel"
@@@ -103,7 -104,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 -114,7 +113,7 @@@
  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 -124,7 +123,7 @@@
  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"
  
@@@ -149,18 -150,19 +149,23 @@@ msgstr "DCP bildhastighet
  msgid "DCP Name"
  msgstr "DCP Namn"
  
 -#: src/wx/wx_util.cc:63 src/wx/wx_util.cc:71
 -msgid "DVD-o-matic"
 -msgstr "DVD-o-matic"
 +#: src/wx/wx_util.cc:61
 +msgid "DCP-o-matic"
 +msgstr "DCP-o-matic"
 +
 +#: src/wx/config_dialog.cc:44
 +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 "DVD-o-matic audio - %s"
 -msgstr "DVD-o-matic audio - %s"
 +msgid "DCP-o-matic audio - %s"
 +msgstr "DCP-o-matic audio - %s"
  
  #: src/wx/config_dialog.cc:120
  msgid "Default DCI name details"
@@@ -221,7 -223,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 -303,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 -346,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 -467,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"
  

diff --combined wscript
index 2237758eee8ce84c902c7967a683a55de545fdc9,df2178711fa5f0c11cfc431a5bfbf972915c87c1..21599e171fe689b1d1d71d040f360f6ca124edfc
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -2,8 -2,8 +2,8 @@@ import subproces
  import os
  import sys
  
 -APPNAME = 'dvdomatic'
 -VERSION = '0.96pre'
 +APPNAME = 'dcpomatic'
 +VERSION = '1.00pre'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -22,11 -22,11 +22,11 @@@ def configure(conf)
      if conf.options.target_windows:
          conf.load('winres')
  
 -    conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing',
 +    conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-D__STDC_LIMIT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing',
                                         '-Wall', '-Wno-attributes', '-Wextra'])
  
      if conf.options.target_windows:
 -        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
 +        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
          wxrc = os.popen('wx-config --rescomp').read().split()[1:]
          conf.env.append_value('WINRCFLAGS', wxrc)
          if conf.options.enable_debug:
@@@ -39,9 -39,9 +39,9 @@@
          boost_lib_suffix = '-mt'
          boost_thread = 'boost_thread_win32-mt'
      else:
 -        conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX')
 +        conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX')
          conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX'])
 -        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dvdomatic"' % conf.env['PREFIX'])
 +        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['PREFIX'])
          boost_lib_suffix = ''
          boost_thread = 'boost_thread'
          conf.env.append_value('LINKFLAGS', '-pthread')
@@@ -56,19 -56,18 +56,19 @@@
      conf.env.TARGET_LINUX = not conf.options.target_windows and not conf.options.osx
  
      if conf.options.enable_debug:
 -        conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG'])
 +        conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG'])
      else:
          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 = 'libcxml', atleast_version = '0.01', args = '--cflags --libs', uselib_store = 'CXML', 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)
          conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True)
          conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True)
 -        conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = False)
 +        conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = True)
          conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
      else:
          # This is hackio grotesquio for static builds (ie for .deb packages).  We need to link some things
@@@ -79,9 -78,6 +79,9 @@@
          conf.env.HAVE_DCP = 1
          conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
          conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2']
 +        conf.env.HAVE_CXML = 1
 +        conf.env.STLIB_CXML = ['cxml']
 +        conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'XML++', mandatory = True)
          conf.env.HAVE_AVFORMAT = 1
          conf.env.STLIB_AVFORMAT = ['avformat']
          conf.env.HAVE_AVFILTER = 1
@@@ -93,10 -89,14 +93,10 @@@
          conf.env.STLIB_AVUTIL = ['avutil']
          conf.env.HAVE_SWSCALE = 1
          conf.env.STLIB_SWSCALE = ['swscale']
 -        conf.env.HAVE_SWRESAMPLE = 1
 -        conf.env.STLIB_SWRESAMPLE = ['swresample']
          conf.env.HAVE_POSTPROC = 1
          conf.env.STLIB_POSTPROC = ['postproc']
 -
 -        # This doesn't seem to be set up, and we need it otherwise resampling support
 -        # won't be included.  Hack upon a hack, obviously
 -        conf.env.append_value('CXXFLAGS', ['-DHAVE_SWRESAMPLE=1'])
 +        conf.env.HAVE_SWRESAMPLE = 1
 +        conv.env.STLIB_SWRESAMPLE = ['swresample']
  
      conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
      conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
@@@ -202,10 -202,10 +202,10 @@@ def build(bld)
          bld.recurse('platform/osx')
  
      for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
 -        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
 +        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r)
  
      if not bld.env.TARGET_WINDOWS:
 -        bld.install_files('${PREFIX}/share/dvdomatic', 'icons/taskbar_icon.png')
 +        bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png')
  
      bld.add_post_fun(post)
  
@@@ -227,8 -227,8 +227,8 @@@ def create_version_cc(version)
  
      try:
          text =  '#include "version.h"\n'
 -        text += 'char const * dvdomatic_git_commit = \"%s\";\n' % commit
 -        text += 'char const * dvdomatic_version = \"%s\";\n' % version
 +        text += 'char const * dcpomatic_git_commit = \"%s\";\n' % commit
 +        text += 'char const * dcpomatic_version = \"%s\";\n' % version
          print('Writing version information to src/lib/version.cc')
          o = open('src/lib/version.cc', 'w')
          o.write(text)