Merge.

diff --cc src/lib/ab_transcode_job.cc
Simple merge

diff --cc src/lib/encoder.cc
Simple merge

diff --cc 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"

diff --cc 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"

diff --cc src/lib/po/it_IT.po
Simple merge

diff --cc 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"

diff --cc 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"
@@@ -94,13 -99,7 +99,13 @@@ msgstr "DCP-o-matic
  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 "

diff --cc 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"

diff --cc 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"
@@@ -84,12 -89,12 +89,12 @@@ msgstr "Kunde inte öppna filmen %1 (%2
  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"
  
@@@ -106,12 -111,12 +111,12 @@@ msgstr "Ny...
  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"
  

diff --cc 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"
@@@ -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"

diff --cc 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"
@@@ -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"

diff --cc 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
@@@ -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"

diff --cc 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"
@@@ -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"

diff --cc wscript
index 2237758eee8ce84c902c7967a683a55de545fdc9,df2178711fa5f0c11cfc431a5bfbf972915c87c1..21599e171fe689b1d1d71d040f360f6ca124edfc
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -61,8 -61,7 +61,8 @@@ 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 = '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)