From: Carl Hetherington Date: Sun, 9 Jun 2013 16:28:45 +0000 (+0100) Subject: Merge. X-Git-Tag: v2.0.48~1337^2~326 X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=883d885dc8690519d205c8baa275385af8a39f4b Merge. --- 883d885dc8690519d205c8baa275385af8a39f4b diff --cc src/lib/po/es_ES.po index 58ad48a9c,39b6dfceb..7a07645b7 --- a/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 \n" "Language-Team: Manuel AC \n" diff --cc src/lib/po/fr_FR.po index f7e362eda,9dcbd42c2..f68631bbd --- a/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/sv_SE.po index d9a9c5955,9391801dc..c1c62ca41 --- a/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 \n" "Language-Team: \n" diff --cc src/tools/po/es_ES.po index bceb9ffff,bbae550d7..01d7c1ad2 --- a/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 \n" "Language-Team: Manuel AC \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 a2c91e65e,8a28a0e01..b9e39b392 --- a/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 6507bb69c,662b74bb3..157b1fb19 --- a/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 \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 bf5dce4b0,8bc806755..3ff32280d --- a/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 \n" "Language-Team: Manuel AC \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 aee97956f,5c0a7b63c..3f150bb0e --- a/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 f667a6f21,518bd7dde..92161172a --- a/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 f31d98c38,6eda1cf4b..02df467ca --- a/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 \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 2237758ee,df2178711..21599e171 --- a/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)