Target pot_merge to merge new .pot files with existing .po; update translations accor...

diff --git a/ChangeLog b/ChangeLog
index e9872734dfa1d9abcd56414f37c5d0aa442f744f..955a6104c5955ae9b502ebc2471d9682913da363 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-03-20  Carl Hetherington  <cth@carlh.net>
+
+       * Make exception strings translatable (#81).
+
 2013-03-19  Carl Hetherington  <cth@carlh.net>
 
        * Version 0.78beta2 released.

diff --git a/i18n.py b/i18n.py
index 8e2fd6404e5d4d031c92fc31f72727b1ba95fad0..ce28d25e99d1e6d359132a8fcba6ebeabbf1a78a 100644 (file)
--- 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 887c79862627be9ab7902b389866e2a1075cdcef..56bd03fac95160721b343e1252104b1779f47b9b 100644 (file)
--- 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 <freedcp.net@gmail.com>\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 46e5334500b999b3806318c026ead1d0c7646368..a5a868ca0af09aa066ffde95280a5316426a87c3 100644 (file)
--- 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 <macibro@gmail.com>\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 8b49e59338156f94afa7ae6d39f93247e42fd00b..5d9f5626a2c8217b2814286de0a4ac40fab05b70 100644 (file)
--- 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 f38f07d6ec47159cee9e3e879386755c14b405e1..273c1fc32f5407051b22817bc5b22d87129a2df3 100644 (file)
--- 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 0886f3cb32aeca7d8d334ba36d65697514842570..c22a536fe347be6b39b2ac0633978d4d6f8dcf77 100644 (file)
--- 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 <macibro@gmail.com>\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 64d5efe56e3d8d0c934e5e8a9ef8084c9e2000d3..9f0f5215246dd98f5374a3ed0145835067f2a5d2 100644 (file)
--- 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 f7f888acdb541b98e2fcc00de47f97e3a91b0965..a4cf349f9cf1b7b44b35306069638827e9d5b712 100644 (file)
--- 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 55732911c17269dd828b8f70d2df01018f8dc959..f91279213393548b55ea9c7a2287eb4b98fa14bd 100644 (file)
--- 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 <freedcp.net@gmail.com>\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 c8fa5815a4964e4bdde1bb4c88df326c99a1eb5c..7a9e226347ccd4e1ae0db43ecd2556685ca65c0e 100644 (file)
--- 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 <macibro@gmail.com>\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 cc303f5e801d0b4011cd41f9ed02a507e87350f5..42bb8ca8865ee679440fb0bb1395609ea0a90bf3 100644 (file)
--- 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 b61b3b4cb3f19e3884abd562b14757f1f0c18cfb..2b03c89cb19c756f6d2846669a837f3f650a5a49 100644 (file)
--- a/wscript
+++ b/wscript
@@ -267,3 +267,6 @@ def post(ctx):
 
 def pot(bld):
     bld.recurse('src')
+
+def pot_merge(bld):
+    bld.recurse('src')