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

3 files changed, 97 insertions, 50 deletions

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 <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 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 <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 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')