From c51af5046c1d9e0175fcc22bd8484adfc3e07642 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 13 Mar 2013 16:53:17 +0000 Subject: Bump libdcp version. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index ad46e3d75..e7e809f73 100644 --- a/wscript +++ b/wscript @@ -54,7 +54,7 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-O2') if not conf.options.static: - conf.check_cfg(package = 'libdcp', atleast_version = '0.40', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) + conf.check_cfg(package = 'libdcp', atleast_version = '0.41', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True) conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True) conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True) conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True) -- cgit v1.2.3 From ab13859cd30879e63f068ca8d27334e8a0bc44d8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 14 Mar 2013 15:14:07 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 27c102f73..a21795db8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-14 Carl Hetherington + + * Version 0.77beta1 released. + 2013-03-14 Carl Hetherington * Work-around lack of support for hard links. diff --git a/debian/changelog b/debian/changelog index e23ebfbd4..4a3f68e48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.77beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 14 Mar 2013 15:14:01 +0000 + dvdomatic (0.76-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index e7e809f73..c3619c010 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.77pre' +VERSION = '0.77beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d82aeaf82c75954fc27a0cfbc8dadcf9158cf1be Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 14 Mar 2013 15:50:48 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index a21795db8..bf51a681d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-14 Carl Hetherington + + * Version 0.77beta2 released. + 2013-03-14 Carl Hetherington * Version 0.77beta1 released. diff --git a/debian/changelog b/debian/changelog index 4a3f68e48..9d391d9e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.77beta2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 14 Mar 2013 15:50:43 +0000 + dvdomatic (0.77beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index c3619c010..34139ba9e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.77beta1' +VERSION = '0.77beta2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 2a949f3490bb051a5f3dcddf13c5ad872d702636 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 14 Mar 2013 17:12:09 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index bf51a681d..502085ed0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-14 Carl Hetherington + + * Version 0.77 released. + 2013-03-14 Carl Hetherington * Version 0.77beta2 released. diff --git a/debian/changelog b/debian/changelog index 9d391d9e2..c87666416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.77-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 14 Mar 2013 17:12:03 +0000 + dvdomatic (0.77beta2-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 34139ba9e..ea0aa8a6b 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.77beta2' +VERSION = '0.77' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ad8df4e3c3e8a1ecf62e4c7bc6872b4c5839e667 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 14 Mar 2013 17:12:11 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index ea0aa8a6b..690313009 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.77' +VERSION = '0.78pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 3ee345fa72f61642c7cabdf61e4b3344f758c22e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 19 Mar 2013 20:51:05 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 3d525adf7..e2e1bb155 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-19 Carl Hetherington + + * Version 0.78beta1 released. + 2013-03-19 Carl Hetherington * Add it_IT translation from Massimiliano Broggi. diff --git a/debian/changelog b/debian/changelog index c87666416..e1ef6804d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 19 Mar 2013 20:50:54 +0000 + dvdomatic (0.77-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 690313009..a681a51aa 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78pre' +VERSION = '0.78beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ce0da5c8e89d67abdb4e106488a55695b97ad640 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 19 Mar 2013 21:35:55 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index e2e1bb155..e9872734d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-19 Carl Hetherington + + * Version 0.78beta2 released. + 2013-03-19 Carl Hetherington * Version 0.78beta1 released. diff --git a/debian/changelog b/debian/changelog index e1ef6804d..3b27d2f14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 19 Mar 2013 21:35:50 +0000 + dvdomatic (0.78beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index a681a51aa..b61b3b4cb 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta1' +VERSION = '0.78beta2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From bacdb2fee1a921060ad40e2db14c4e787ae188a9 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Mar 2013 10:41:25 +0000 Subject: Target pot_merge to merge new .pot files with existing .po; update translations accordingly. --- ChangeLog | 4 ++ i18n.py | 11 ++++- src/lib/po/fr_FR.po | 102 ++++++++++++++++++++++++------------------ src/lib/po/it_IT.po | 42 +++++++++++++++--- src/lib/wscript | 3 ++ src/tools/po/fr_FR.po | 16 +++---- src/tools/po/it_IT.po | 8 ++-- src/tools/wscript | 3 ++ src/wscript | 5 +++ src/wx/po/fr_FR.po | 120 +++++++++++++++++++++++--------------------------- src/wx/po/it_IT.po | 110 ++++++++++++++++++++++----------------------- src/wx/wscript | 3 ++ wscript | 3 ++ 13 files changed, 247 insertions(+), 183 deletions(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index e9872734d..955a6104c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-20 Carl Hetherington + + * Make exception strings translatable (#81). + 2013-03-19 Carl Hetherington * Version 0.78beta2 released. diff --git a/i18n.py b/i18n.py index 8e2fd6404..ce28d25e9 100644 --- a/i18n.py +++ b/i18n.py @@ -2,6 +2,10 @@ import glob import os from waflib import Logs +def command(c): + print c + os.system(c) + def pot(dir, sources, name): s = "" for f in sources.split('\n'): @@ -16,8 +20,11 @@ def pot(dir, sources, name): except: pass - os.system('xgettext -d %s -s --keyword=_ --add-comments=/ -p %s -o %s.pot %s' % (name, d, name, s)) - + command('xgettext -d %s -s --keyword=_ --add-comments=/ -p %s -o %s.pot %s' % (name, d, name, s)) + +def pot_merge(dir, name): + for f in glob.glob(os.path.join(os.getcwd(), dir, 'po', '*.po')): + command('msgmerge %s %s.pot -o %s' % (f, os.path.join('build', dir, name), f)) def po_to_mo(dir, name, bld): for f in glob.glob(os.path.join(os.getcwd(), dir, 'po', '*.po')): diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po index 887c79862..56bd03fac 100644 --- a/src/lib/po/fr_FR.po +++ b/src/lib/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DVD-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-05 13:49+0000\n" +"POT-Creation-Date: 2013-03-20 10:29+0000\n" "PO-Revision-Date: 2013-03-20 00:39+0100\n" "Last-Translator: FreeDCP.net \n" "Language-Team: \n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/lib/transcode_job.cc:90 +#: src/lib/transcode_job.cc:87 msgid "0%" msgstr "0%" @@ -72,7 +72,7 @@ msgstr "Advertisement" msgid "An error occurred whilst handling the file %1." msgstr "Une erreur s'est produite lors du traitement du fichier %1." -#: src/lib/analyse_audio_job.cc:48 +#: src/lib/analyse_audio_job.cc:49 msgid "Analyse audio of %1" msgstr "Analyse du son de %1" @@ -88,6 +88,10 @@ msgstr "Bicubique" msgid "Bilinear" msgstr "Bilin??aire" +#: src/lib/exceptions.cc:60 +msgid "Cannot handle pixel format %1 during %2" +msgstr "" + #: src/lib/encoder.cc:101 msgid "Cannot resample audio as libswresample is not present" msgstr "R??-??chantillonnage du son impossible : libswresample est absent" @@ -132,24 +136,14 @@ msgstr "La cadence du DCP sera %1%% par rapport ?? la source" 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" @@ -237,10 +231,13 @@ msgstr "Filtre d??bloc horizontal" msgid "Horizontal deblocking filter A" msgstr "Filtre d??-bloc horizontal" -#: src/lib/job.cc:87 -#: src/lib/job.cc:96 -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:87 src/lib/job.cc:96 +msgid "" +"It is not known what caused this error. The best idea is to report the " +"problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)" +msgstr "" +"Erreur ind??termin??e. Merci de rapporter le probl??me ?? la liste DVD-o-" +"matic (dvdomatic@carlh.net)" #: src/lib/filter.cc:82 msgid "Kernel deinterlacer" @@ -262,11 +259,8 @@ msgstr "D??sentrelaceur lin??aire interpol??" msgid "Median deinterlacer" msgstr "D??sentrelaceur m??dian" -#: src/lib/filter.cc:74 -#: src/lib/filter.cc:85 -#: src/lib/filter.cc:86 -#: src/lib/filter.cc:87 -#: src/lib/filter.cc:90 +#: src/lib/filter.cc:74 src/lib/filter.cc:85 src/lib/filter.cc:86 +#: src/lib/filter.cc:87 src/lib/filter.cc:90 msgid "Misc" msgstr "Divers" @@ -274,9 +268,7 @@ msgstr "Divers" msgid "Motion compensating deinterlacer" msgstr "D??sentrelaceur par compensation de mouvement" -#: src/lib/filter.cc:84 -#: src/lib/filter.cc:88 -#: src/lib/filter.cc:89 +#: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89 #: src/lib/filter.cc:91 msgid "Noise reduction" msgstr "R??duction de bruit" @@ -398,8 +390,12 @@ msgid "Test" msgstr "Test" #: src/lib/job.cc:76 -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" @@ -473,6 +469,11 @@ msgstr "type de contenu" msgid "copying %1" msgstr "copie de %1" +#: src/lib/exceptions.cc:36 +#, fuzzy +msgid "could not create file %1" +msgstr "??criture vers fichier distant (%1) impossible" + #: src/lib/ffmpeg_decoder.cc:191 msgid "could not find audio decoder" msgstr "d??codeur audio introuvable" @@ -489,16 +490,25 @@ msgstr "d??codeur de sous-titre introuvable" msgid "could not find video decoder" msgstr "d??codeur vid??o introuvable" -#: src/lib/external_audio_decoder.cc:72 +#: src/lib/sndfile_decoder.cc:72 msgid "could not open external audio file for reading" msgstr "lecture du fichier audio externe impossible" +#: src/lib/exceptions.cc:29 +#, fuzzy +msgid "could not open file %1" +msgstr "lecture du fichier impossible" + #: src/lib/dcp_video_frame.cc:388 msgid "could not open file for reading" msgstr "lecture du fichier impossible" -#: src/lib/encoder.cc:137 -#: src/lib/encoder.cc:314 +#: src/lib/exceptions.cc:44 +#, fuzzy +msgid "could not read from file %1 (%2)" +msgstr "Cr??ation du dossier distant %1 (%2) impossible" + +#: src/lib/encoder.cc:137 src/lib/encoder.cc:314 msgid "could not run sample-rate converter" msgstr "conversion de la fr??quence d'??chantillonnage impossible" @@ -510,6 +520,11 @@ msgstr "d??marrage de session SCP (%1) impossible" msgid "could not start SSH session" msgstr "d??marrage de session SSH impossible" +#: src/lib/exceptions.cc:50 +#, fuzzy +msgid "could not write to file %1 (%2)" +msgstr "??criture vers fichier distant (%1) impossible" + #: src/lib/encoder.cc:247 msgid "decoder sleeps with queue of %1" msgstr "d??codeur en veille avec %1 en file d'attente" @@ -518,11 +533,11 @@ msgstr "d??codeur en veille avec %1 en file d'attente" msgid "decoder wakes with queue of %1" msgstr "reprise du d??codage avec %1 en file d'attente" -#: src/lib/external_audio_decoder.cc:94 +#: src/lib/sndfile_decoder.cc:94 msgid "external audio files have differing lengths" msgstr "Les fichiers audio externes ont des dur??es diff??rentes" -#: src/lib/external_audio_decoder.cc:76 +#: src/lib/sndfile_decoder.cc:76 msgid "external audio files must be mono" msgstr "les fichiers audio externes doivent ??tre en mono" @@ -530,7 +545,7 @@ msgstr "les fichiers audio externes doivent ??tre en mono" msgid "format" msgstr "format" -#: src/lib/transcode_job.cc:103 +#: src/lib/transcode_job.cc:100 msgid "frames per second" msgstr "images par seconde" @@ -538,8 +553,7 @@ msgstr "images par seconde" msgid "hour" msgstr "heure" -#: src/lib/util.cc:112 -#: src/lib/util.cc:117 +#: src/lib/util.cc:112 src/lib/util.cc:117 msgid "hours" msgstr "heures" @@ -555,12 +569,15 @@ msgstr "minutes" msgid "missing key %1 in key-value set" msgstr "cl?? %1 non s??lectionn??e" +#: src/lib/exceptions.cc:54 +msgid "missing required setting %1" +msgstr "" + #: src/lib/subtitle.cc:52 msgid "multi-part subtitles not yet supported" msgstr "sous-titres en plusieurs parties non support??s" -#: src/lib/film.cc:263 -#: src/lib/film.cc:308 +#: src/lib/film.cc:263 src/lib/film.cc:308 msgid "name" msgstr "nom" @@ -593,4 +610,3 @@ msgstr "fixe" #: src/lib/film.cc:274 msgid "video" msgstr "vid??o" - diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po index 46e533450..a5a868ca0 100644 --- a/src/lib/po/it_IT.po +++ b/src/lib/po/it_IT.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-15 08:39+0000\n" +"POT-Creation-Date: 2013-03-20 10:29+0000\n" "PO-Revision-Date: 2013-03-18 16:46+0100\n" "Last-Translator: Maci \n" "Language-Team: \n" +"Language: Italiano\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.5\n" -"Language: Italiano\n" #: src/lib/transcode_job.cc:87 msgid "0%" @@ -89,6 +89,10 @@ msgstr "Bicubica" msgid "Bilinear" msgstr "Bilineare" +#: src/lib/exceptions.cc:60 +msgid "Cannot handle pixel format %1 during %2" +msgstr "" + #: src/lib/encoder.cc:101 msgid "Cannot resample audio as libswresample is not present" msgstr "Non posso ricampionare l'audio perchè libswresample non è presente" @@ -233,8 +237,8 @@ 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 "" -"Non sappiamo cosa ha causato questo errore. La cosa migliore è di inviare un " -"report del problema alla mailing list di DVD-o-matic (dvdomatic@carlh.net)" +"Non sappiamo cosa ha causato questo errore. La cosa migliore è di inviare " +"un report del problema alla mailing list di DVD-o-matic (dvdomatic@carlh.net)" #: src/lib/filter.cc:82 msgid "Kernel deinterlacer" @@ -466,6 +470,11 @@ msgstr "tipo di contenuto" msgid "copying %1" msgstr "copia %1" +#: src/lib/exceptions.cc:36 +#, fuzzy +msgid "could not create file %1" +msgstr "Non posso scrivere il file remoto (%1)" + #: src/lib/ffmpeg_decoder.cc:191 msgid "could not find audio decoder" msgstr "non riesco a trovare il decoder audio" @@ -482,14 +491,24 @@ msgstr "non riesco a trovare il decoder dei sottotitoli" msgid "could not find video decoder" msgstr "non riesco a trovare il decoder video" -#: src/lib/external_audio_decoder.cc:72 +#: src/lib/sndfile_decoder.cc:72 msgid "could not open external audio file for reading" msgstr "non riesco ad aprire il file dell'audio esterno per leggerlo" +#: src/lib/exceptions.cc:29 +#, fuzzy +msgid "could not open file %1" +msgstr "non riesco ad aprire il file per leggerlo" + #: src/lib/dcp_video_frame.cc:388 msgid "could not open file for reading" msgstr "non riesco ad aprire il file per leggerlo" +#: src/lib/exceptions.cc:44 +#, fuzzy +msgid "could not read from file %1 (%2)" +msgstr "Non posso creare la directory remota %1 (%2)" + #: src/lib/encoder.cc:137 src/lib/encoder.cc:314 msgid "could not run sample-rate converter" msgstr "non riesco a lanciare il convertitore della frequenza di campionamento" @@ -502,6 +521,11 @@ msgstr "non posso avviare la sessione SCP (%1)" msgid "could not start SSH session" msgstr "non posso avviare la sessione SSH" +#: src/lib/exceptions.cc:50 +#, fuzzy +msgid "could not write to file %1 (%2)" +msgstr "Non posso scrivere il file remoto (%1)" + #: src/lib/encoder.cc:247 msgid "decoder sleeps with queue of %1" msgstr "il decoder è in pausa con la coda di %1" @@ -510,11 +534,11 @@ msgstr "il decoder è in pausa con la coda di %1" msgid "decoder wakes with queue of %1" msgstr "il decoder riparte con la coda di %1" -#: src/lib/external_audio_decoder.cc:94 +#: src/lib/sndfile_decoder.cc:94 msgid "external audio files have differing lengths" msgstr "i files dell'audio esterno hanno durata diversa" -#: src/lib/external_audio_decoder.cc:76 +#: src/lib/sndfile_decoder.cc:76 msgid "external audio files must be mono" msgstr "i files dell'audio esterno devono essere mono" @@ -546,6 +570,10 @@ msgstr "minuti" msgid "missing key %1 in key-value set" msgstr "persa la chiave %1 tra i valori chiave" +#: src/lib/exceptions.cc:54 +msgid "missing required setting %1" +msgstr "" + #: src/lib/subtitle.cc:52 msgid "multi-part subtitles not yet supported" msgstr "sottotitoli multi-part non ancora supportati" diff --git a/src/lib/wscript b/src/lib/wscript index 8b49e5933..5d9f5626a 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -75,3 +75,6 @@ def build(bld): def pot(bld): i18n.pot(os.path.join('src', 'lib'), sources, 'libdvdomatic') + +def pot_merge(bld): + i18n.pot_merge(os.path.join('src', 'lib'), 'libdvdomatic') diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po index f38f07d6e..273c1fc32 100644 --- a/src/tools/po/fr_FR.po +++ b/src/tools/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DVD-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-05 13:49+0000\n" +"POT-Creation-Date: 2013-03-20 10:29+0000\n" "PO-Revision-Date: 2013-03-13 22:33+0100\n" "Last-Translator: \n" "Language-Team: \n" @@ -65,14 +65,16 @@ msgid "&Send DCP to TMS" msgstr "&Envoyer le DCP dans le TMS" #: src/tools/dvdomatic.cc:409 -msgid "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen" -msgstr "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole Laursen" +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:180 msgid "About" msgstr "A Propos" -#: src/tools/dvdomatic.cc:482 +#: src/tools/dvdomatic.cc:500 msgid "Could not load film %1 (%2)" msgstr "Impossible de charger le film %1 (%2)" @@ -81,9 +83,8 @@ msgstr "Impossible de charger le film %1 (%2)" msgid "Could not open film at %s (%s)" msgstr "Impossible d'ouvrir le film ?? %s (%s)" -#: src/tools/dvdomatic.cc:287 -#: src/tools/dvdomatic.cc:402 -#: src/tools/dvdomatic.cc:486 +#: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402 +#: src/tools/dvdomatic.cc:504 msgid "DVD-o-matic" msgstr "DVD-o-matic" @@ -111,4 +112,3 @@ msgstr "S??lectionner le film ?? ouvrir" #, c-format msgid "The directory %s already exists." msgstr "Le dossier %s existe d??j??." - diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po index 0886f3cb3..c22a536fe 100644 --- a/src/tools/po/it_IT.po +++ b/src/tools/po/it_IT.po @@ -7,15 +7,15 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-15 08:39+0000\n" +"POT-Creation-Date: 2013-03-20 10:29+0000\n" "PO-Revision-Date: 2013-03-18 15:20+0100\n" "Last-Translator: Maci \n" "Language-Team: \n" +"Language: Italiano\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.5\n" -"Language: Italiano\n" #: src/tools/dvdomatic.cc:177 msgid "&Analyse audio" @@ -75,7 +75,7 @@ msgstr "" msgid "About" msgstr "Informazioni" -#: src/tools/dvdomatic.cc:497 +#: src/tools/dvdomatic.cc:500 msgid "Could not load film %1 (%2)" msgstr "Non posso caricare il film %1 (%2)" @@ -85,7 +85,7 @@ msgid "Could not open film at %s (%s)" msgstr "Non posso aprire il film a %s (%s)" #: src/tools/dvdomatic.cc:287 src/tools/dvdomatic.cc:402 -#: src/tools/dvdomatic.cc:501 +#: src/tools/dvdomatic.cc:504 msgid "DVD-o-matic" msgstr "DVD-o-matic" diff --git a/src/tools/wscript b/src/tools/wscript index 64d5efe56..9f0f52152 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -27,3 +27,6 @@ def build(bld): def pot(bld): i18n.pot(os.path.join('src', 'tools'), 'dvdomatic.cc', 'dvdomatic') + +def pot_merge(bld): + i18n.pot_merge(os.path.join('src', 'tools'), 'dvdomatic') diff --git a/src/wscript b/src/wscript index f7f888acd..a4cf349f9 100644 --- a/src/wscript +++ b/src/wscript @@ -12,3 +12,8 @@ def pot(bld): bld.recurse('lib') bld.recurse('wx') bld.recurse('tools') + +def pot_merge(bld): + bld.recurse('lib') + bld.recurse('wx') + bld.recurse('tools') diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po index 55732911c..f91279213 100644 --- a/src/wx/po/fr_FR.po +++ b/src/wx/po/fr_FR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: DVD-o-matic FRENCH\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-05 13:49+0000\n" +"POT-Creation-Date: 2013-03-20 10:29+0000\n" "PO-Revision-Date: 2013-03-20 00:34+0100\n" "Last-Translator: FreeDCP.net \n" "Language-Team: \n" @@ -16,15 +16,15 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/wx/film_editor.cc:441 +#: src/wx/film_editor.cc:440 msgid "%" msgstr "%" -#: src/wx/film_editor.cc:1226 +#: src/wx/film_editor.cc:1229 msgid "1 channel" msgstr "1 canal" -#: src/wx/film_editor.cc:185 +#: src/wx/film_editor.cc:184 msgid "A/B" msgstr "A/B" @@ -32,16 +32,15 @@ msgstr "A/B" msgid "Add" msgstr "Ajouter" -#: src/wx/audio_dialog.cc:32 -#: src/wx/film_editor.cc:78 +#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77 msgid "Audio" msgstr "Audio" -#: src/wx/film_editor.cc:382 +#: src/wx/film_editor.cc:381 msgid "Audio Delay" msgstr "D??lai audio" -#: src/wx/film_editor.cc:370 +#: src/wx/film_editor.cc:369 msgid "Audio Gain" msgstr "Gain audio" @@ -54,7 +53,7 @@ msgstr "Langue audio (ex. FR)" msgid "Bad setting for %s (%s)" msgstr "Mauvais param??tre pour %s (%s)" -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:296 msgid "Bottom crop" msgstr "D??coupe bas" @@ -66,7 +65,7 @@ msgstr "Parcourir..." msgid "But I have to use fader" msgstr "Je souhaite utiliser ce volume" -#: src/wx/film_editor.cc:375 +#: src/wx/film_editor.cc:374 msgid "Calculate..." msgstr "Calcul..." @@ -74,15 +73,15 @@ msgstr "Calcul..." msgid "Channels" msgstr "Canaux" -#: src/wx/film_editor.cc:326 +#: src/wx/film_editor.cc:325 msgid "Colour look-up table" msgstr "Espace colorim??trique" -#: src/wx/film_editor.cc:121 +#: src/wx/film_editor.cc:120 msgid "Content" msgstr "Contenu" -#: src/wx/film_editor.cc:131 +#: src/wx/film_editor.cc:130 msgid "Content Type" msgstr "Type de Contenu" @@ -101,7 +100,7 @@ msgstr "Impossible de cr??er le DCP : %s" msgid "Could not open content file (%s)" msgstr "Ouverture du contenu impossible (%s)" -#: src/wx/film_editor.cc:505 +#: src/wx/film_editor.cc:504 #, c-format msgid "Could not set content: %s" msgstr "S??lectionner du contenu impossible : %s" @@ -114,11 +113,11 @@ msgstr "Cr??er dans le dossier" msgid "DCI name" msgstr "Nom DCI" -#: src/wx/film_editor.cc:142 +#: src/wx/film_editor.cc:141 msgid "DCP Frame Rate" msgstr "Cadence image du DCP" -#: src/wx/film_editor.cc:110 +#: src/wx/film_editor.cc:109 msgid "DCP Name" msgstr "Nom du DCP" @@ -142,8 +141,7 @@ msgstr "D??tails du nom DCI par d??faut" msgid "Default directory for new films" msgstr "Dossier par d??faut des nouveaux films" -#: src/wx/film_editor.cc:117 -#: src/wx/job_manager_view.cc:88 +#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:88 msgid "Details..." msgstr "D??tails..." @@ -151,7 +149,7 @@ msgstr "D??tails..." msgid "Disk space required" msgstr "Espace disque requis" -#: src/wx/film_editor.cc:192 +#: src/wx/film_editor.cc:191 msgid "Duration" msgstr "Dur??e" @@ -159,9 +157,8 @@ msgstr "Dur??e" msgid "Edit" msgstr "??dition" -#: src/wx/config_dialog.cc:84 -#: src/wx/config_dialog.cc:103 -#: src/wx/film_editor.cc:309 +#: src/wx/config_dialog.cc:84 src/wx/config_dialog.cc:103 +#: src/wx/film_editor.cc:308 msgid "Edit..." msgstr "??diter..." @@ -169,7 +166,7 @@ msgstr "??diter..." msgid "Encoding Servers" msgstr "Serveurs d'encodage" -#: src/wx/film_editor.cc:177 +#: src/wx/film_editor.cc:176 msgid "End" msgstr "Fin" @@ -177,7 +174,7 @@ msgstr "Fin" msgid "Facility (e.g. DLA)" msgstr "Laboratoire (ex. DLA)" -#: src/wx/film_editor.cc:74 +#: src/wx/film_editor.cc:73 msgid "Film" msgstr "Film" @@ -189,12 +186,11 @@ msgstr "Propri??t??s du film" msgid "Film name" msgstr "Nom du Film" -#: src/wx/film_editor.cc:304 -#: src/wx/filter_dialog.cc:32 +#: src/wx/film_editor.cc:303 src/wx/filter_dialog.cc:32 msgid "Filters" msgstr "Filtres" -#: src/wx/film_editor.cc:269 +#: src/wx/film_editor.cc:268 msgid "Format" msgstr "Format" @@ -218,7 +214,7 @@ msgstr "Gb" msgid "Host name or IP address" msgstr "Nom de l'h??te ou adresse IP" -#: src/wx/film_editor.cc:1230 +#: src/wx/film_editor.cc:1233 msgid "Hz" msgstr "Hz" @@ -230,19 +226,19 @@ msgstr "Je veux le jouer ?? ce volume" msgid "IP address" msgstr "Adresse IP" -#: src/wx/film_editor.cc:336 +#: src/wx/film_editor.cc:335 msgid "JPEG2000 bandwidth" msgstr "Qualit?? JPEG2000" -#: src/wx/film_editor.cc:282 +#: src/wx/film_editor.cc:281 msgid "Left crop" msgstr "D??coupe gauche" -#: src/wx/film_editor.cc:165 +#: src/wx/film_editor.cc:164 msgid "Length" msgstr "Longueur" -#: src/wx/film_editor.cc:340 +#: src/wx/film_editor.cc:339 msgid "MBps" msgstr "MBps" @@ -250,7 +246,7 @@ msgstr "MBps" msgid "My Documents" msgstr "Mes Documents" -#: src/wx/film_editor.cc:105 +#: src/wx/film_editor.cc:104 msgid "Name" msgstr "Nom" @@ -258,16 +254,15 @@ msgstr "Nom" msgid "New Film" msgstr "Nouveau Film" -#: src/wx/film_editor.cc:306 -#: src/wx/film_editor.cc:663 +#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664 msgid "None" msgstr "Aucun" -#: src/wx/film_editor.cc:136 +#: src/wx/film_editor.cc:135 msgid "Original Frame Rate" msgstr "Cadence d'images originale" -#: src/wx/film_editor.cc:160 +#: src/wx/film_editor.cc:159 msgid "Original Size" msgstr "Taille Originale" @@ -307,7 +302,7 @@ msgstr "??chelle de r??f??rence pour A7B" msgid "Remove" msgstr "Supprimer" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:286 msgid "Right crop" msgstr "D??coupe droite" @@ -315,15 +310,15 @@ msgstr "D??coupe droite" msgid "Running" msgstr "Progression" -#: src/wx/film_editor.cc:316 +#: src/wx/film_editor.cc:315 msgid "Scaler" msgstr "Mise ?? l'??chelle" -#: src/wx/film_editor.cc:408 +#: src/wx/film_editor.cc:407 msgid "Select Audio File" msgstr "S??lectionner le fichier son" -#: src/wx/film_editor.cc:122 +#: src/wx/film_editor.cc:121 msgid "Select Content File" msgstr "S??lectionner le fichier vid??o" @@ -331,7 +326,7 @@ msgstr "S??lectionner le fichier vid??o" msgid "Server" msgstr "Serveur" -#: src/wx/film_editor.cc:365 +#: src/wx/film_editor.cc:364 msgid "Show Audio..." msgstr "Montrer le son..." @@ -339,7 +334,7 @@ msgstr "Montrer le son..." msgid "Smoothing" msgstr "Lissage" -#: src/wx/film_editor.cc:174 +#: src/wx/film_editor.cc:173 msgid "Start" msgstr "D??but" @@ -351,15 +346,15 @@ msgstr "Studio (ex. TCF)" msgid "Subtitle Language (e.g. FR)" msgstr "Langue de sous-titres (ex. FR)" -#: src/wx/film_editor.cc:432 +#: src/wx/film_editor.cc:431 msgid "Subtitle Offset" msgstr "D??calage du sous-titre" -#: src/wx/film_editor.cc:437 +#: src/wx/film_editor.cc:436 msgid "Subtitle Scale" msgstr "Taille du sous-titre" -#: src/wx/film_editor.cc:80 +#: src/wx/film_editor.cc:79 msgid "Subtitles" msgstr "Sous-titres" @@ -399,15 +394,15 @@ msgstr "Nombre de processus ?? utiliser sur cet h??te" msgid "Time" msgstr "Dur??e" -#: src/wx/film_editor.cc:292 +#: src/wx/film_editor.cc:291 msgid "Top crop" msgstr "D??coupe haut" -#: src/wx/film_editor.cc:172 +#: src/wx/film_editor.cc:171 msgid "Trim frames" msgstr "Images coup??es" -#: src/wx/film_editor.cc:126 +#: src/wx/film_editor.cc:125 msgid "Trust content's header" msgstr "Faire confiance ?? l'en-t??te" @@ -415,31 +410,31 @@ msgstr "Faire confiance ?? l'en-t??te" msgid "Type" msgstr "Type" -#: src/wx/film_editor.cc:115 +#: src/wx/film_editor.cc:114 msgid "Use DCI name" msgstr "Utiliser le nom DCI" -#: src/wx/film_editor.cc:146 +#: src/wx/film_editor.cc:145 msgid "Use best" msgstr "Automatique" -#: src/wx/film_editor.cc:392 +#: src/wx/film_editor.cc:391 msgid "Use content's audio" msgstr "Utiliser le son int??gr??" -#: src/wx/film_editor.cc:402 +#: src/wx/film_editor.cc:401 msgid "Use external audio" msgstr "Utiliser une source audio externe" -#: src/wx/film_editor.cc:76 +#: src/wx/film_editor.cc:75 msgid "Video" msgstr "Vid??o" -#: src/wx/film_editor.cc:425 +#: src/wx/film_editor.cc:424 msgid "With Subtitles" msgstr "Avec sous-titres" -#: src/wx/film_editor.cc:1228 +#: src/wx/film_editor.cc:1231 msgid "channels" msgstr "canaux" @@ -447,27 +442,24 @@ msgstr "canaux" msgid "counting..." msgstr "calcul..." -#: src/wx/film_editor.cc:374 +#: src/wx/film_editor.cc:373 msgid "dB" msgstr "dB" -#: src/wx/film_editor.cc:689 -#: src/wx/film_editor.cc:691 +#: src/wx/film_editor.cc:690 src/wx/film_editor.cc:692 msgid "frames" msgstr "images" #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time -#: src/wx/film_editor.cc:387 +#: src/wx/film_editor.cc:386 msgid "ms" msgstr "ms" #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time -#: src/wx/film_editor.cc:198 +#: src/wx/film_editor.cc:197 msgid "s" msgstr "s" -#: src/wx/properties_dialog.cc:62 -#: src/wx/properties_dialog.cc:63 +#: src/wx/properties_dialog.cc:62 src/wx/properties_dialog.cc:63 msgid "unknown" msgstr "inconnu" - diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po index c8fa5815a..7a9e22634 100644 --- a/src/wx/po/it_IT.po +++ b/src/wx/po/it_IT.po @@ -7,25 +7,25 @@ msgid "" msgstr "" "Project-Id-Version: IT VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-03-15 08:39+0000\n" +"POT-Creation-Date: 2013-03-20 10:29+0000\n" "PO-Revision-Date: 2013-03-18 17:51+0100\n" "Last-Translator: Maci \n" "Language-Team: \n" +"Language: Italiano\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.5.5\n" -"Language: Italiano\n" -#: src/wx/film_editor.cc:441 +#: src/wx/film_editor.cc:440 msgid "%" msgstr "%" -#: src/wx/film_editor.cc:1230 +#: src/wx/film_editor.cc:1229 msgid "1 channel" msgstr "Canale 1" -#: src/wx/film_editor.cc:185 +#: src/wx/film_editor.cc:184 msgid "A/B" msgstr "A/B" @@ -33,15 +33,15 @@ msgstr "A/B" msgid "Add" msgstr "Aggiungi" -#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:78 +#: src/wx/audio_dialog.cc:32 src/wx/film_editor.cc:77 msgid "Audio" msgstr "Audio" -#: src/wx/film_editor.cc:382 +#: src/wx/film_editor.cc:381 msgid "Audio Delay" msgstr "Ritardo dell'audio" -#: src/wx/film_editor.cc:370 +#: src/wx/film_editor.cc:369 msgid "Audio Gain" msgstr "Guadagno dell'audio" @@ -54,7 +54,7 @@ msgstr "Lingua dell'audio (es. EN)" msgid "Bad setting for %s (%s)" msgstr "Valore sbagliato per %s (%s)" -#: src/wx/film_editor.cc:297 +#: src/wx/film_editor.cc:296 msgid "Bottom crop" msgstr "Taglio inferiore" @@ -66,7 +66,7 @@ msgstr "Sfoglia..." msgid "But I have to use fader" msgstr "Ma devo usare il fader" -#: src/wx/film_editor.cc:375 +#: src/wx/film_editor.cc:374 msgid "Calculate..." msgstr "Calcola..." @@ -74,15 +74,15 @@ msgstr "Calcola..." msgid "Channels" msgstr "Canali" -#: src/wx/film_editor.cc:326 +#: src/wx/film_editor.cc:325 msgid "Colour look-up table" msgstr "Tabella per ricerca del colore" -#: src/wx/film_editor.cc:121 +#: src/wx/film_editor.cc:120 msgid "Content" msgstr "Contenuto" -#: src/wx/film_editor.cc:131 +#: src/wx/film_editor.cc:130 msgid "Content Type" msgstr "Tipo di contenuto" @@ -101,7 +101,7 @@ msgstr "Non posso creare il DCP: %s" msgid "Could not open content file (%s)" msgstr "Non posso aprire il file del contenuto (%s)" -#: src/wx/film_editor.cc:505 +#: src/wx/film_editor.cc:504 #, c-format msgid "Could not set content: %s" msgstr "Non posso regolare il contenuto: %s" @@ -114,11 +114,11 @@ msgstr "Crea nella cartella" msgid "DCI name" msgstr "Nome del DCP" -#: src/wx/film_editor.cc:142 +#: src/wx/film_editor.cc:141 msgid "DCP Frame Rate" msgstr "Frequenza fotogrammi del DCP" -#: src/wx/film_editor.cc:110 +#: src/wx/film_editor.cc:109 msgid "DCP Name" msgstr "Nome del DCP" @@ -142,7 +142,7 @@ msgstr "Dettagli del nome di default DCI" msgid "Default directory for new films" msgstr "Directory di default per i nuovi films" -#: src/wx/film_editor.cc:117 src/wx/job_manager_view.cc:88 +#: src/wx/film_editor.cc:116 src/wx/job_manager_view.cc:88 msgid "Details..." msgstr "Dettagli" @@ -150,7 +150,7 @@ msgstr "Dettagli" msgid "Disk space required" msgstr "Spazio su disco rischiesto" -#: src/wx/film_editor.cc:192 +#: src/wx/film_editor.cc:191 msgid "Duration" msgstr "Durata" @@ -159,7 +159,7 @@ msgid "Edit" msgstr "Modifica" #: src/wx/config_dialog.cc:84 src/wx/config_dialog.cc:103 -#: src/wx/film_editor.cc:309 +#: src/wx/film_editor.cc:308 msgid "Edit..." msgstr "Modifica..." @@ -167,7 +167,7 @@ msgstr "Modifica..." msgid "Encoding Servers" msgstr "Servers di codifica" -#: src/wx/film_editor.cc:177 +#: src/wx/film_editor.cc:176 msgid "End" msgstr "Fine" @@ -175,7 +175,7 @@ msgstr "Fine" msgid "Facility (e.g. DLA)" msgstr "Facility (es. DLA)" -#: src/wx/film_editor.cc:74 +#: src/wx/film_editor.cc:73 msgid "Film" msgstr "Film" @@ -187,11 +187,11 @@ msgstr "Proprietà del film" msgid "Film name" msgstr "Nome del film" -#: src/wx/film_editor.cc:304 src/wx/filter_dialog.cc:32 +#: src/wx/film_editor.cc:303 src/wx/filter_dialog.cc:32 msgid "Filters" msgstr "Filtri" -#: src/wx/film_editor.cc:269 +#: src/wx/film_editor.cc:268 msgid "Format" msgstr "Formato" @@ -215,7 +215,7 @@ msgstr "Gb" msgid "Host name or IP address" msgstr "Nome dell'Host o indirizzo IP" -#: src/wx/film_editor.cc:1234 +#: src/wx/film_editor.cc:1233 msgid "Hz" msgstr "Hz" @@ -227,19 +227,19 @@ msgstr "Voglio riprodurrlo back at fader" msgid "IP address" msgstr "Indirizzo IP" -#: src/wx/film_editor.cc:336 +#: src/wx/film_editor.cc:335 msgid "JPEG2000 bandwidth" msgstr "Banda passante JPEG2000" -#: src/wx/film_editor.cc:282 +#: src/wx/film_editor.cc:281 msgid "Left crop" msgstr "Taglio sinistro" -#: src/wx/film_editor.cc:165 +#: src/wx/film_editor.cc:164 msgid "Length" msgstr "Lunghezza" -#: src/wx/film_editor.cc:340 +#: src/wx/film_editor.cc:339 msgid "MBps" msgstr "MBps" @@ -247,7 +247,7 @@ msgstr "MBps" msgid "My Documents" msgstr "Documenti" -#: src/wx/film_editor.cc:105 +#: src/wx/film_editor.cc:104 msgid "Name" msgstr "Nome" @@ -255,15 +255,15 @@ msgstr "Nome" msgid "New Film" msgstr "Nuovo Film" -#: src/wx/film_editor.cc:306 src/wx/film_editor.cc:665 +#: src/wx/film_editor.cc:305 src/wx/film_editor.cc:664 msgid "None" msgstr "Nessuno" -#: src/wx/film_editor.cc:136 +#: src/wx/film_editor.cc:135 msgid "Original Frame Rate" msgstr "Frequenza Fotogrammi Originale" -#: src/wx/film_editor.cc:160 +#: src/wx/film_editor.cc:159 msgid "Original Size" msgstr "Dimensione Originale" @@ -303,7 +303,7 @@ msgstr "Scalatura di riferimento per A/B" msgid "Remove" msgstr "Rimuovi" -#: src/wx/film_editor.cc:287 +#: src/wx/film_editor.cc:286 msgid "Right crop" msgstr "Taglio destro" @@ -311,15 +311,15 @@ msgstr "Taglio destro" msgid "Running" msgstr "In corso" -#: src/wx/film_editor.cc:316 +#: src/wx/film_editor.cc:315 msgid "Scaler" msgstr "Scaler" -#: src/wx/film_editor.cc:408 +#: src/wx/film_editor.cc:407 msgid "Select Audio File" msgstr "Seleziona File Audio" -#: src/wx/film_editor.cc:122 +#: src/wx/film_editor.cc:121 msgid "Select Content File" msgstr "Seleziona FIle del Contenuto" @@ -327,7 +327,7 @@ msgstr "Seleziona FIle del Contenuto" msgid "Server" msgstr "Server" -#: src/wx/film_editor.cc:365 +#: src/wx/film_editor.cc:364 msgid "Show Audio..." msgstr "Mostra Audio..." @@ -335,7 +335,7 @@ msgstr "Mostra Audio..." msgid "Smoothing" msgstr "Levigatura" -#: src/wx/film_editor.cc:174 +#: src/wx/film_editor.cc:173 msgid "Start" msgstr "Avvio" @@ -347,15 +347,15 @@ msgstr "Studio (es. TCF)" msgid "Subtitle Language (e.g. FR)" msgstr "Lingua dei Sottotitoli (es. FR)" -#: src/wx/film_editor.cc:432 +#: src/wx/film_editor.cc:431 msgid "Subtitle Offset" msgstr "Sfalsamento dei Sottotitoli" -#: src/wx/film_editor.cc:437 +#: src/wx/film_editor.cc:436 msgid "Subtitle Scale" msgstr "Scala dei Sottotitoli" -#: src/wx/film_editor.cc:80 +#: src/wx/film_editor.cc:79 msgid "Subtitles" msgstr "Sottotitoli" @@ -395,15 +395,15 @@ msgstr "Threads da usare per codificare su questo host" msgid "Time" msgstr "Tempo" -#: src/wx/film_editor.cc:292 +#: src/wx/film_editor.cc:291 msgid "Top crop" msgstr "Taglio superiore" -#: src/wx/film_editor.cc:172 +#: src/wx/film_editor.cc:171 msgid "Trim frames" msgstr "Taglia fotogrammi" -#: src/wx/film_editor.cc:126 +#: src/wx/film_editor.cc:125 msgid "Trust content's header" msgstr "Conferma l'intestazione del contenuto" @@ -411,31 +411,31 @@ msgstr "Conferma l'intestazione del contenuto" msgid "Type" msgstr "Tipo" -#: src/wx/film_editor.cc:115 +#: src/wx/film_editor.cc:114 msgid "Use DCI name" msgstr "Usa nome DCI" -#: src/wx/film_editor.cc:146 +#: src/wx/film_editor.cc:145 msgid "Use best" msgstr "Usa il migliore" -#: src/wx/film_editor.cc:392 +#: src/wx/film_editor.cc:391 msgid "Use content's audio" msgstr "Usa l'audio del contenuto" -#: src/wx/film_editor.cc:402 +#: src/wx/film_editor.cc:401 msgid "Use external audio" msgstr "Usa l'audio esterno" -#: src/wx/film_editor.cc:76 +#: src/wx/film_editor.cc:75 msgid "Video" msgstr "Video" -#: src/wx/film_editor.cc:425 +#: src/wx/film_editor.cc:424 msgid "With Subtitles" msgstr "Con Sottotitoli" -#: src/wx/film_editor.cc:1232 +#: src/wx/film_editor.cc:1231 msgid "channels" msgstr "canali" @@ -443,21 +443,21 @@ msgstr "canali" msgid "counting..." msgstr "conteggio..." -#: src/wx/film_editor.cc:374 +#: src/wx/film_editor.cc:373 msgid "dB" msgstr "dB" -#: src/wx/film_editor.cc:691 src/wx/film_editor.cc:693 +#: src/wx/film_editor.cc:690 src/wx/film_editor.cc:692 msgid "frames" msgstr "fotogrammi" #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time -#: src/wx/film_editor.cc:387 +#: src/wx/film_editor.cc:386 msgid "ms" msgstr "ms" #. / TRANSLATORS: `s' here is an abbreviation for seconds, the unit of time -#: src/wx/film_editor.cc:198 +#: src/wx/film_editor.cc:197 msgid "s" msgstr "s" diff --git a/src/wx/wscript b/src/wx/wscript index cc303f5e8..42bb8ca88 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -44,3 +44,6 @@ def build(bld): def pot(bld): i18n.pot(os.path.join('src', 'wx'), sources, 'libdvdomatic-wx') + +def pot_merge(bld): + i18n.pot_merge(os.path.join('src', 'wx'), 'libdvdomatic-wx') diff --git a/wscript b/wscript index b61b3b4cb..2b03c89cb 100644 --- a/wscript +++ b/wscript @@ -267,3 +267,6 @@ def post(ctx): def pot(bld): bld.recurse('src') + +def pot_merge(bld): + bld.recurse('src') -- cgit v1.2.3 From 3b0f20e678459744e7fe5c2f3672050bafaff961 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Mar 2013 10:49:24 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 955a6104c..223cee01e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-20 Carl Hetherington + + * Version 0.78beta3 released. + 2013-03-20 Carl Hetherington * Make exception strings translatable (#81). diff --git a/debian/changelog b/debian/changelog index 3b27d2f14..595a213d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 20 Mar 2013 10:49:17 +0000 + dvdomatic (0.78beta2-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 2b03c89cb..464e7900f 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta2' +VERSION = '0.78beta3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From bcdc0ce108405479c47ef39b9b796074938b16ba Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 20 Mar 2013 15:01:15 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 223cee01e..4277f22b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-20 Carl Hetherington + + * Version 0.78beta4 released. + 2013-03-20 Carl Hetherington * Version 0.78beta3 released. diff --git a/debian/changelog b/debian/changelog index 595a213d1..ed660b9cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta4-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 20 Mar 2013 15:01:10 +0000 + dvdomatic (0.78beta3-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 464e7900f..4f81e4934 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta3' +VERSION = '0.78beta4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 9d283e1f5ed5b06dea2ff818daf4eff2a7e8cae5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 21 Mar 2013 11:37:50 +0000 Subject: Another attempt to fix i18n. --- src/lib/util.cc | 8 +++++++- windows/installer.nsi.32.in | 5 +++-- windows/installer.nsi.64.in | 6 +++--- wscript | 5 +++-- 4 files changed, 16 insertions(+), 8 deletions(-) (limited to 'wscript') diff --git a/src/lib/util.cc b/src/lib/util.cc index abbc35749..765835bc4 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -251,8 +251,14 @@ dvdomatic_setup () void dvdomatic_setup_i18n (string lang) { +#ifdef DVDOMATIC_WINDOWS + string const e = "LANGUAGE=" + lang; + putenv (e.c_str()); +#endif + + setlocale (LC_ALL, ""); + textdomain ("libdvdomatic"); bindtextdomain ("libdvdomatic", LOCALE_PREFIX); - setlocale (LC_ALL, lang.c_str ()); } /** @param start Start position for the crop within the image. diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index 4911585de..b79703ff1 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -93,10 +93,11 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\bin\fr_FR" +SetOutPath "$INSTDIR\locale\fr_FR" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" +File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" -SetOutPath "$INSTDIR\bin\it_IT" +SetOutPath "$INSTDIR\locale\it_IT" File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 295f926b6..21980e61a 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -103,11 +103,11 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\bin\fr_FR" +SetOutPath "$INSTDIR\locale\fr_FR" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" +File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" - -SetOutPath "$INSTDIR\bin\it_IT" +SetOutPath "$INSTDIR\locale\it_IT" File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" diff --git a/wscript b/wscript index 4f81e4934..171b71181 100644 --- a/wscript +++ b/wscript @@ -22,11 +22,11 @@ def configure(conf): conf.load('winres') conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', - '-Wall', '-Wno-attributes', '-Wextra', - '-DLOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']]) + '-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']) + conv.env.append_value('CXXFLAGS', '-DLOCALE_PREFIX="../locale"') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: @@ -37,6 +37,7 @@ def configure(conf): boost_thread = 'boost_thread_win32-mt' else: conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX') + conf.env.append_value('CXXFLAGS', '-DLOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') -- cgit v1.2.3 From f94ed8f663a5ce6e55484c10dcade6d7b7d2e5ed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 21 Mar 2013 12:05:44 +0000 Subject: Fix typo. --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 171b71181..24ebfe548 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,7 @@ def configure(conf): if conf.options.target_windows: conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE']) - conv.env.append_value('CXXFLAGS', '-DLOCALE_PREFIX="../locale"') + conf.env.append_value('CXXFLAGS', '-DLOCALE_PREFIX="../locale"') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: -- cgit v1.2.3 From 1c207805aef4443c5fb6c102e5be8a5b50002868 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 21 Mar 2013 16:31:48 +0000 Subject: Add Manual Acevedo's initial Spanish translation. Hopefully finally fix up translations on Windows. --- src/lib/config.cc | 7 +++ src/lib/config.h | 1 + src/lib/util.cc | 27 ++++++++-- src/lib/util.h | 4 ++ src/tools/dvdomatic.cc | 32 ++++++++---- src/tools/po/es_ES.po | 117 ++++++++++++++++++++++++++++++++++++++++++++ windows/installer.nsi.32.in | 6 ++- windows/installer.nsi.64.in | 4 +- wscript | 3 +- 9 files changed, 181 insertions(+), 20 deletions(-) create mode 100644 src/tools/po/es_ES.po (limited to 'wscript') diff --git a/src/lib/config.cc b/src/lib/config.cc index ad132437a..5dce3748d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -167,3 +167,10 @@ Config::default_directory_or (string a) const return _default_directory; } + +void +Config::drop () +{ + delete _instance; + _instance = 0; +} diff --git a/src/lib/config.h b/src/lib/config.h index 0e9c4a60a..ee46166e6 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -169,6 +169,7 @@ public: void write () const; static Config* instance (); + static void drop (); private: Config (); diff --git a/src/lib/util.cc b/src/lib/util.cc index 03c1f43dd..593d0e760 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -246,17 +246,36 @@ dvdomatic_setup () ui_thread = this_thread::get_id (); } +#ifdef DVDOMATIC_WINDOWS +boost::filesystem::path +mo_path () +{ + wchar_t buffer[512]; + GetModuleFileName (0, buffer, 512 * sizeof(wchar_t)); + boost::filesystem::path p (buffer); + p = p.parent_path (); + p = p.parent_path (); + p /= "locale"; + return p; +} +#endif + void dvdomatic_setup_i18n (string lang) { + setlocale (LC_ALL, ""); + textdomain ("libdvdomatic"); + #ifdef DVDOMATIC_WINDOWS string const e = "LANGUAGE=" + lang; putenv (e.c_str()); + + bindtextdomain ("libdvdomatic", mo_path().string().c_str()); #endif - - setlocale (LC_ALL, ""); - textdomain ("libdvdomatic"); - bindtextdomain ("libdvdomatic", LOCALE_PREFIX); + +#ifdef DVDOMATIC_POSIX + bindtextdomain ("libdvdomatic", POSIX_LOCALE_PREFIX); +#endif } /** @param start Start position for the crop within the image. diff --git a/src/lib/util.h b/src/lib/util.h index 60498be5a..3d251cf06 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -30,6 +30,7 @@ #include #include #include +#include #include extern "C" { #include @@ -60,6 +61,9 @@ extern std::string md5_digest (std::string); extern std::string md5_digest (void const *, int); extern void ensure_ui_thread (); extern std::string audio_channel_name (int); +#ifdef DVDOMATIC_WINDOWS +extern boost::filesystem::path mo_path (); +#endif typedef int SourceFrame; diff --git a/src/tools/dvdomatic.cc b/src/tools/dvdomatic.cc index aa936523d..4a778100c 100644 --- a/src/tools/dvdomatic.cc +++ b/src/tools/dvdomatic.cc @@ -416,10 +416,11 @@ private: info.SetDevelopers (authors); wxArrayString translators; - translators.Add (wxT ("Olivier Perriere (freedcp.net)")); + translators.Add (wxT ("Olivier Perriere")); translators.Add (wxT ("Lilian Lefranc")); translators.Add (wxT ("Thierry Journet")); translators.Add (wxT ("Massimiliano Broggi")); + translators.Add (wxT ("Manuel Acevedo")); info.SetTranslators (translators); info.SetWebSite (wxT ("http://carlh.net/software/dvdomatic")); @@ -456,9 +457,9 @@ setup_i18n () if (wxLocale::IsAvailable (language)) { locale = new wxLocale (language, wxLOCALE_LOAD_DEFAULT); -#ifdef __WXGTK__ - locale->AddCatalogLookupPathPrefix (wxT (LOCALE_PREFIX "/locale")); -#endif +#ifdef DVDOMATIC_WINDOWS + locale->AddCatalogLookupPathPrefix (std_to_wx (mo_path().string())); +#endif locale->AddCatalog (wxT ("libdvdomatic-wx")); locale->AddCatalog (wxT ("dvdomatic")); @@ -485,15 +486,26 @@ class App : public wxApp unsetenv ("UBUNTU_MENUPROXY"); #endif - /* This needs to be before setup_i18n, as setup_i18n() will - create a Config object, which needs Scalers to have - been created. + wxInitAllImageHandlers (); + + /* Enable i18n; this will create a Config object + to look for a force-configured language. This Config + object will be wrong, however, because dvdomatic_setup + hasn't yet been called and there aren't any scalers, filters etc. + set up yet. + */ + setup_i18n (); + + /* Set things up, including scalers / filters etc. + which will now be internationalised correctly. */ dvdomatic_setup (); - wxInitAllImageHandlers (); - setup_i18n (); - + /* Force the configuration to be re-loaded correctly next + time it is needed. + */ + Config::drop (); + if (!film_to_load.empty() && boost::filesystem::is_directory (film_to_load)) { try { film.reset (new Film (film_to_load)); diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po new file mode 100644 index 000000000..78eecb306 --- /dev/null +++ b/src/tools/po/es_ES.po @@ -0,0 +1,117 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: DVDOMATIC\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-03-15 08:39+0000\n" +"PO-Revision-Date: 2013-03-20 17:05-0500\n" +"Last-Translator: Manuel AC \n" +"Language-Team: Manuel AC \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.5\n" +"Language: ES-ES\n" + +#: src/tools/dvdomatic.cc:177 +msgid "&Analyse audio" +msgstr "&Analizar sonido" + +#: src/tools/dvdomatic.cc:183 +msgid "&Edit" +msgstr "&Editar" + +#: src/tools/dvdomatic.cc:182 +msgid "&File" +msgstr "&Archivo" + +#: src/tools/dvdomatic.cc:185 +msgid "&Help" +msgstr "&Ayuda" + +#: src/tools/dvdomatic.cc:184 +msgid "&Jobs" +msgstr "&Tareas" + +#: src/tools/dvdomatic.cc:173 +msgid "&Make DCP" +msgstr "&Hacer DCP" + +#: src/tools/dvdomatic.cc:161 +msgid "&Open..." +msgstr "&Abrir..." + +#: src/tools/dvdomatic.cc:170 +msgid "&Preferences..." +msgstr "&Preferencias..." + +#: src/tools/dvdomatic.cc:165 +msgid "&Properties..." +msgstr "&Propiedades..." + +#: src/tools/dvdomatic.cc:167 +msgid "&Quit" +msgstr "&Salir" + +#: src/tools/dvdomatic.cc:163 +msgid "&Save" +msgstr "&Guardar" + +#: src/tools/dvdomatic.cc:174 +msgid "&Send DCP to TMS" +msgstr "&Enviar DCP al TMS" + +#: src/tools/dvdomatic.cc:409 +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:180 +msgid "About" +msgstr "Acerca de" + +#: src/tools/dvdomatic.cc:497 +msgid "Could not load film %1 (%2)" +msgstr "No se pudo cargar la película %1 (%2)" + +#: src/tools/dvdomatic.cc:331 +#, 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:287 src/tools/dvdomatic.cc:402 +#: src/tools/dvdomatic.cc:501 +msgid "DVD-o-matic" +msgstr "DVD-o-matic" + +#: src/tools/dvdomatic.cc:75 +msgid "Film changed" +msgstr "Película cambiada" + +#: src/tools/dvdomatic.cc:408 +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 " +"abierto." + +#: src/tools/dvdomatic.cc:160 +msgid "New..." +msgstr "Nuevo..." + +#: src/tools/dvdomatic.cc:175 +msgid "S&how DCP" +msgstr "&Mostrar DCP" + +#: src/tools/dvdomatic.cc:319 +msgid "Select film to open" +msgstr "Selecciona la película a abrir" + +#: src/tools/dvdomatic.cc:303 +#, c-format +msgid "The directory %s already exists." +msgstr "La carpeta %s ya existe." diff --git a/windows/installer.nsi.32.in b/windows/installer.nsi.32.in index b79703ff1..b2bb2f3a9 100644 --- a/windows/installer.nsi.32.in +++ b/windows/installer.nsi.32.in @@ -93,14 +93,16 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\locale\fr_FR" +SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\it_IT" +SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" +SetOutPath "$INSTDIR\locale\es\LC_MESSAGES" +File "%binaries%/src/tools/mo/es_ES/dvdomatic.mo" CreateShortCut "$DESKTOP\DVD-o-matic.lnk" "$INSTDIR\bin\dvdomatic.exe" "" CreateShortCut "$DESKTOP\DVD-o-matic encode server.lnk" "$INSTDIR\bin\servomatic_gui.exe" "" diff --git a/windows/installer.nsi.64.in b/windows/installer.nsi.64.in index 21980e61a..921178591 100644 --- a/windows/installer.nsi.64.in +++ b/windows/installer.nsi.64.in @@ -103,11 +103,11 @@ File "%deps%/etc/ImageMagick/delegates.xml" SetOutPath "$PROFILE\.magick" File "%deps%/etc/ImageMagick/delegates.xml" -SetOutPath "$INSTDIR\locale\fr_FR" +SetOutPath "$INSTDIR\locale\fr\LC_MESSAGES" File "%binaries%/src/lib/mo/fr_FR/libdvdomatic.mo" File "%binaries%/src/wx/mo/fr_FR/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/fr_FR/dvdomatic.mo" -SetOutPath "$INSTDIR\locale\it_IT" +SetOutPath "$INSTDIR\locale\it\LC_MESSAGES" File "%binaries%/src/lib/mo/it_IT/libdvdomatic.mo" File "%binaries%/src/wx/mo/it_IT/libdvdomatic-wx.mo" File "%binaries%/src/tools/mo/it_IT/dvdomatic.mo" diff --git a/wscript b/wscript index 24ebfe548..612abdf22 100644 --- a/wscript +++ b/wscript @@ -26,7 +26,6 @@ def configure(conf): 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', '-DLOCALE_PREFIX="../locale"') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: @@ -37,7 +36,7 @@ def configure(conf): boost_thread = 'boost_thread_win32-mt' else: conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX') - conf.env.append_value('CXXFLAGS', '-DLOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']) + conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') -- cgit v1.2.3 From 0a798ac7e9f46becd037f74cd3ec9ae40873bfc3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 21 Mar 2013 16:32:26 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 4277f22b5..dbac7b378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-21 Carl Hetherington + + * Version 0.78beta5 released. + 2013-03-20 Carl Hetherington * Version 0.78beta4 released. diff --git a/debian/changelog b/debian/changelog index ed660b9cc..f5037d78d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta5-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 21 Mar 2013 16:32:21 +0000 + dvdomatic (0.78beta4-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 612abdf22..1a507fbc2 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta4' +VERSION = '0.78beta5' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 8a04a7c6626c7b668695799072c862b5b0f961de Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 Mar 2013 00:08:20 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index c04339236..e6702bc8b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-25 Carl Hetherington + + * Version 0.78beta6 released. + 2013-03-24 Carl Hetherington * Add UI option to select interface language. diff --git a/debian/changelog b/debian/changelog index f5037d78d..372b53124 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta6-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 25 Mar 2013 00:08:10 +0000 + dvdomatic (0.78beta5-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 1a507fbc2..3532b81de 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta5' +VERSION = '0.78beta6' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 0ac282ff4af3f6ea8fe097a61f1b666a3ef81c04 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Mar 2013 00:20:46 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 30179a5ea..0e4f2d1b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Carl Hetherington + + * Version 0.78beta7 released. + 2013-03-25 Carl Hetherington * Add option to set user interface language. diff --git a/debian/changelog b/debian/changelog index 372b53124..7ae0b8a70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta7-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 26 Mar 2013 00:19:21 +0000 + dvdomatic (0.78beta6-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 3532b81de..46bd16de1 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta6' +VERSION = '0.78beta7' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 011f2e1ef50bf670fcb0053677f35cd8fd6666b3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Mar 2013 00:59:46 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 03af7d2b7..7d3a113c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Carl Hetherington + + * Version 0.78beta8 released. + 2013-03-26 Carl Hetherington * Add button to cancel jobs. diff --git a/debian/changelog b/debian/changelog index 7ae0b8a70..569d6d5a0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta8-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 26 Mar 2013 00:59:36 +0000 + dvdomatic (0.78beta7-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 46bd16de1..a7209c9b5 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta7' +VERSION = '0.78beta8' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6a6496723b5cd368e595d524540972ace409589d Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Mar 2013 10:36:11 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 7d3a113c2..ba414af06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Carl Hetherington + + * Version 0.78beta9 released. + 2013-03-26 Carl Hetherington * Version 0.78beta8 released. diff --git a/debian/changelog b/debian/changelog index 569d6d5a0..453fe95e6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta9-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 26 Mar 2013 10:36:05 +0000 + dvdomatic (0.78beta8-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index a7209c9b5..5cb6f496e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta8' +VERSION = '0.78beta9' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 29fa6e41013b65de6aeada6ec16f530c1f8c4803 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Mar 2013 11:35:20 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index ba414af06..845c99fe0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Carl Hetherington + + * Version 0.78beta10 released. + 2013-03-26 Carl Hetherington * Version 0.78beta9 released. diff --git a/debian/changelog b/debian/changelog index 453fe95e6..49307a89b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta10-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 26 Mar 2013 11:35:15 +0000 + dvdomatic (0.78beta9-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 5cb6f496e..a25f3b5fc 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta9' +VERSION = '0.78beta10' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d4b0043f4024d3b51fbb2b527994a569f3245a6c Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Mar 2013 17:34:54 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 845c99fe0..ba8da3548 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Carl Hetherington + + * Version 0.78beta11 released. + 2013-03-26 Carl Hetherington * Version 0.78beta10 released. diff --git a/debian/changelog b/debian/changelog index 49307a89b..997827533 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta11-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 26 Mar 2013 17:34:49 +0000 + dvdomatic (0.78beta10-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index a25f3b5fc..79807e323 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta10' +VERSION = '0.78beta11' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 2f10afc2a4cc2156245a5db593ba7476c6caa4f5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 26 Mar 2013 21:15:22 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index ba8da3548..2cfca8d04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-26 Carl Hetherington + + * Version 0.78beta12 released. + 2013-03-26 Carl Hetherington * Version 0.78beta11 released. diff --git a/debian/changelog b/debian/changelog index 997827533..f694dbf8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta12-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 26 Mar 2013 21:13:54 +0000 + dvdomatic (0.78beta11-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 79807e323..b36d3dc61 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta11' +VERSION = '0.78beta12' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b0ee9cbda4595cb5a63dfc5a598f0e322eddc085 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 27 Mar 2013 12:26:59 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 2cfca8d04..d54762901 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-27 Carl Hetherington + + * Version 0.78beta13 released. + 2013-03-26 Carl Hetherington * Version 0.78beta12 released. diff --git a/debian/changelog b/debian/changelog index f694dbf8d..82fe8bad5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta13-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 27 Mar 2013 12:26:55 +0000 + dvdomatic (0.78beta12-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index b36d3dc61..b5f21a445 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta12' +VERSION = '0.78beta13' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6e62d321ea504a337f29a64d937c5881902099cd Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Mar 2013 10:38:31 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index dafdb3e75..9dba8fede 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-28 Carl Hetherington + + * Version 0.78beta14 released. + 2013-03-27 Carl Hetherington * Fix erroneous disk space reporting (#85). diff --git a/debian/changelog b/debian/changelog index 82fe8bad5..4109e5c3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta14-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 28 Mar 2013 10:38:07 +0000 + dvdomatic (0.78beta13-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index b5f21a445..fb728ec40 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta13' +VERSION = '0.78beta14' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6f3c03c4c64a50c755d21e0ced97d52f20310ea0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Mar 2013 14:26:06 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 9dba8fede..4defa2b22 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-28 Carl Hetherington + + * Version 0.78beta15 released. + 2013-03-28 Carl Hetherington * Version 0.78beta14 released. diff --git a/debian/changelog b/debian/changelog index 4109e5c3b..3abd284e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta15-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 28 Mar 2013 14:25:56 +0000 + dvdomatic (0.78beta14-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index fb728ec40..56a68dced 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta14' +VERSION = '0.78beta15' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 0fcbe0064489b7a651ef3543e4e8200c8622cca6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 28 Mar 2013 16:29:06 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 4defa2b22..9240556b8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-28 Carl Hetherington + + * Version 0.78beta16 released. + 2013-03-28 Carl Hetherington * Version 0.78beta15 released. diff --git a/debian/changelog b/debian/changelog index 3abd284e2..bf02c7a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78beta16-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Thu, 28 Mar 2013 16:28:05 +0000 + dvdomatic (0.78beta15-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 56a68dced..4e4db2178 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta15' +VERSION = '0.78beta16' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From ae43625121256298f8bda22d449af25451c61d64 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 31 Mar 2013 02:43:15 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 9240556b8..f01bab90b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-31 Carl Hetherington + + * Version 0.78 released. + 2013-03-28 Carl Hetherington * Version 0.78beta16 released. diff --git a/debian/changelog b/debian/changelog index bf02c7a4f..6ee87130a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.78-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 31 Mar 2013 02:43:03 +0100 + dvdomatic (0.78beta16-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 4e4db2178..4cc55b5de 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78beta16' +VERSION = '0.78' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e85b9a7afbce6f4871239ba7b396c47ef76809ad Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 31 Mar 2013 02:43:17 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 4cc55b5de..6744dfd37 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.78' +VERSION = '0.79pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a667372b027a2281945010cdc58c9e0582a4c298 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Apr 2013 22:37:12 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 48f146dce..f8ddd967d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-01 Carl Hetherington + + * Version 0.79 released. + 2013-04-01 Carl Hetherington * Fix some missing translated strings diff --git a/debian/changelog b/debian/changelog index 6ee87130a..5e056126f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.79-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Mon, 01 Apr 2013 22:37:03 +0100 + dvdomatic (0.78-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 6744dfd37..fb15284cf 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.79pre' +VERSION = '0.79' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 5234903ff236915d0080df08da23a82266be9c59 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 1 Apr 2013 22:37:14 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index fb15284cf..7ee3899e7 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.79' +VERSION = '0.80pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From e7aad9759e44ff3e1aa17ad8d5548a02646a67c5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Apr 2013 16:22:04 +0100 Subject: Fix servomatic_gui start-up on Linux (#98). --- icons/taskbar_icon.png | Bin 0 -> 141 bytes src/tools/servomatic_gui.cc | 24 ++++++++++++++++++++++-- wscript | 4 ++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 icons/taskbar_icon.png (limited to 'wscript') diff --git a/icons/taskbar_icon.png b/icons/taskbar_icon.png new file mode 100644 index 000000000..fd6b6e968 Binary files /dev/null and b/icons/taskbar_icon.png differ diff --git a/src/tools/servomatic_gui.cc b/src/tools/servomatic_gui.cc index dd169725f..52ec0a3a3 100644 --- a/src/tools/servomatic_gui.cc +++ b/src/tools/servomatic_gui.cc @@ -94,7 +94,15 @@ class TaskBarIcon : public wxTaskBarIcon public: TaskBarIcon () { +#ifdef __WXMSW__ wxIcon icon (std_to_wx ("taskbar_icon")); +#endif +#ifdef __WXGTK__ + wxInitAllImageHandlers(); + wxBitmap bitmap (wxString::Format ("%s/taskbar_icon.png", POSIX_ICON_PREFIX), wxBITMAP_TYPE_PNG); + wxIcon icon; + icon.CopyFromBitmap (bitmap); +#endif SetIcon (icon, std_to_wx ("DVD-o-matic encode server")); Connect (ID_status, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler (TaskBarIcon::status)); @@ -128,20 +136,31 @@ public: App () : wxApp () , _thread (0) + , _icon (0) {} private: bool OnInit () { + if (!wxApp::OnInit ()) { + return false; + } + dvdomatic_setup (); - new TaskBarIcon; - + _icon = new TaskBarIcon; _thread = new thread (bind (&App::main_thread, this)); + return true; } + int OnExit () + { + delete _icon; + return wxApp::OnExit (); + } + void main_thread () { Server server (memory_log); @@ -149,6 +168,7 @@ private: } boost::thread* _thread; + TaskBarIcon* _icon; }; IMPLEMENT_APP (App) diff --git a/wscript b/wscript index 7ee3899e7..f7c696433 100644 --- a/wscript +++ b/wscript @@ -37,6 +37,7 @@ def configure(conf): else: conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_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']) boost_lib_suffix = '' boost_thread = 'boost_thread' conf.env.append_value('LINKFLAGS', '-pthread') @@ -231,6 +232,9 @@ def build(bld): for r in ['22x22', '32x32', '48x48', '64x64', '128x128']: bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r) + if not bld.env.TARGET_WINDOWS: + bld.install_files('${PREFIX}/share/dvdomatic', 'icons/taskbar_icon.png') + bld.add_post_fun(post) def dist(ctx): -- cgit v1.2.3 From 0b40592a5f2e751a3aa0e3c827e2d2f5fe62bfaa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Apr 2013 18:21:38 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index cf9eef43e..d0cde20e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-07 Carl Hetherington + + * Version 0.80beta1 released. + 2013-04-07 Carl Hetherington * Make the audio plot expand in height when its diff --git a/debian/changelog b/debian/changelog index 5e056126f..b8f2af35d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.80beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 07 Apr 2013 18:21:33 +0100 + dvdomatic (0.79-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index f7c696433..b5ae2226a 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.80pre' +VERSION = '0.80beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 33bbfca8588a9c63354d9e9c12b8e7ac087a9abc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Apr 2013 22:19:40 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index d0cde20e8..3842839b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-07 Carl Hetherington + + * Version 0.80beta2 released. + 2013-04-07 Carl Hetherington * Version 0.80beta1 released. diff --git a/debian/changelog b/debian/changelog index b8f2af35d..f2322c89f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.80beta2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 07 Apr 2013 22:19:34 +0100 + dvdomatic (0.80beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index b5ae2226a..b77deae68 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.80beta1' +VERSION = '0.80beta2' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 0e8364674b5963a08ce44fa9234b4e1cb64f29a6 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Apr 2013 22:44:33 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 3842839b2..a141fbcb9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-07 Carl Hetherington + + * Version 0.80beta3 released. + 2013-04-07 Carl Hetherington * Version 0.80beta2 released. diff --git a/debian/changelog b/debian/changelog index f2322c89f..813dcc920 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.80beta3-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 07 Apr 2013 22:44:29 +0100 + dvdomatic (0.80beta2-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index b77deae68..33d84de43 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.80beta2' +VERSION = '0.80beta3' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a102c3ef9e89890150ff6a4ccf94dcdaf41cf657 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Apr 2013 23:08:53 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index a141fbcb9..ac3596942 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-07 Carl Hetherington + + * Version 0.80beta4 released. + 2013-04-07 Carl Hetherington * Version 0.80beta3 released. diff --git a/debian/changelog b/debian/changelog index 813dcc920..cff75590a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.80beta4-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 07 Apr 2013 23:08:49 +0100 + dvdomatic (0.80beta3-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 33d84de43..019689321 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.80beta3' +VERSION = '0.80beta4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1bc2742666ef87dbb24a6b4fed365f74d0aa1846 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Apr 2013 23:48:32 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index ac3596942..e01a5f2bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-07 Carl Hetherington + + * Version 0.80 released. + 2013-04-07 Carl Hetherington * Version 0.80beta4 released. diff --git a/debian/changelog b/debian/changelog index cff75590a..3d8f8ee88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.80-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Sun, 07 Apr 2013 23:48:12 +0100 + dvdomatic (0.80beta4-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 019689321..fd1da8327 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.80beta4' +VERSION = '0.80' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 1c74296932d5f60d481f40115f2b611ea31463a8 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 7 Apr 2013 23:48:34 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index fd1da8327..c053149c1 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.80' +VERSION = '0.81pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From acf64698f9a3ef131bfc4ea2aeef9f5f1c526ff0 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Apr 2013 15:37:32 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index d8e6a18dd..3ce5fed19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-09 Carl Hetherington + + * Version 0.81beta1 released. + 2013-04-08 Carl Hetherington * Add 16:9-within-Scope format. diff --git a/debian/changelog b/debian/changelog index 3d8f8ee88..5f19c1a2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.81beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 09 Apr 2013 15:37:32 +0100 + dvdomatic (0.80-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index c053149c1..f3d6af817 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.81pre' +VERSION = '0.81beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 6854dbeff5f9782aa69be45549af0af0baa5d860 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Apr 2013 19:48:04 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 3ce5fed19..a82e58eb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-09 Carl Hetherington + + * Version 0.81 released. + 2013-04-09 Carl Hetherington * Version 0.81beta1 released. diff --git a/debian/changelog b/debian/changelog index 5f19c1a2e..06bc76ce8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.81-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 09 Apr 2013 19:48:04 +0100 + dvdomatic (0.81beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index f3d6af817..dc3e3b15a 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.81beta1' +VERSION = '0.81' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b8b2fd0b0aeaa1ec95171eaf12c462ff8b555e0e Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Apr 2013 19:48:04 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index dc3e3b15a..ac9c416e2 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.81' +VERSION = '0.82pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From d4fb7e10b828374ac14fdd33624d5bf12bdc0405 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Apr 2013 21:48:56 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index a82e58eb3..4c1d6f4c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-09 Carl Hetherington + + * Version 0.82beta1 released. + 2013-04-09 Carl Hetherington * Version 0.81 released. diff --git a/debian/changelog b/debian/changelog index 06bc76ce8..63d21ef07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.82beta1-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 09 Apr 2013 21:48:56 +0100 + dvdomatic (0.81-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index ac9c416e2..11ef9bf23 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.82pre' +VERSION = '0.82beta1' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 75a40396ba757ec268b52283a55410a6ab9da303 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Apr 2013 23:43:35 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index 4c1d6f4c4..3888c7170 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-09 Carl Hetherington + + * Version 0.82 released. + 2013-04-09 Carl Hetherington * Version 0.82beta1 released. diff --git a/debian/changelog b/debian/changelog index 63d21ef07..7151b0dbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.82-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Tue, 09 Apr 2013 23:43:35 +0100 + dvdomatic (0.82beta1-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index 11ef9bf23..99e570c1e 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.82beta1' +VERSION = '0.82' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From a7f74b6789ec6c482d5b2a825d69cab145bf7098 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Tue, 9 Apr 2013 23:43:35 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 99e570c1e..e63c8ed87 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.82' +VERSION = '0.83pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 41f7714d7b0fc5af7cb83bd233fbca6a6f657e68 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Apr 2013 12:48:25 +0100 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 6 ++++++ wscript | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) (limited to 'wscript') diff --git a/ChangeLog b/ChangeLog index e96637b0d..833aa085d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-04-10 Carl Hetherington + + * Version 0.83 released. + 2013-04-10 Carl Hetherington * Fix incorrect scaling using flat-no-stretch and scope-no-stretch diff --git a/debian/changelog b/debian/changelog index 7151b0dbe..d1cea437d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dvdomatic (0.83-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Carl Hetherington Wed, 10 Apr 2013 12:48:25 +0100 + dvdomatic (0.82-1) UNRELEASED; urgency=low * New upstream release. diff --git a/wscript b/wscript index e63c8ed87..6b8a43491 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.83pre' +VERSION = '0.83' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 01bb4ca21bea60137dce7201d9a37a0cf5691812 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Apr 2013 12:48:25 +0100 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'wscript') diff --git a/wscript b/wscript index 6b8a43491..10c06a74d 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dvdomatic' -VERSION = '0.83' +VERSION = '0.84pre' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3