Merge master.

6 files changed, 72 insertions, 125 deletions

diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 22a70f813..153a90085 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDVDOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-28 10:35+0000\n"
-"PO-Revision-Date: 2013-03-23 22:42-0500\n"
+"POT-Creation-Date: 2013-03-15 08:39+0000\n"
+"PO-Revision-Date: 2013-04-02 19:10-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
-"Language: es-ES\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/lib/transcode_job.cc:87
 msgid "0%"
@@ -69,7 +69,7 @@ msgstr "Academy"
 msgid "Advertisement"
 msgstr "Publicidad"
 
-#: src/lib/job.cc:72
+#: src/lib/job.cc:71
 msgid "An error occurred whilst handling the file %1."
 msgstr "Ha ocurrido un error con el fichero %1."
 
@@ -89,23 +89,11 @@ msgstr "Bicúbico"
 msgid "Bilinear"
 msgstr "Bilineal"
 
-#: src/lib/job.cc:302
-msgid "Cancelled"
-msgstr ""
-
-#: 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 ""
 "No se puede redimensionar el sonido porque no se encuentra libswresample"
 
-#: src/lib/util.cc:931
-msgid "Centre"
-msgstr ""
-
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
@@ -134,22 +122,22 @@ msgstr "No se pudo escribir el fichero remoto (%1)"
 msgid "Cubic interpolating deinterlacer"
 msgstr "Desentrelazado por interpolación cúbica"
 
-#: src/lib/util.cc:1006
+#: src/lib/util.cc:965
 msgid "DCP and source have the same rate.\n"
 msgstr "La fuente y el DCP tienen la misma velocidad.\n"
 
-#: src/lib/util.cc:1016
+#: src/lib/util.cc:975
 msgid "DCP will run at %1%% of the source speed."
 msgstr "El DCP se reproducirá al %1%% de la velocidad de la fuente."
 
-#: src/lib/util.cc:1009
+#: src/lib/util.cc:968
 msgid "DCP will use every other frame of the source.\n"
 msgstr "El DCP usará fotogramas alternos de la fuente.\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
 msgid "De-blocking"
-msgstr ""
+msgstr "De-blocking"
 
 #: 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
@@ -159,17 +147,17 @@ msgstr "Desentrelazado"
 
 #: src/lib/filter.cc:74
 msgid "Deringing filter"
-msgstr ""
+msgstr "Deringing filter"
 
 #: src/lib/dolby_cp750.cc:27
 msgid "Dolby CP750"
 msgstr "Dolby CP750"
 
-#: src/lib/util.cc:1011
+#: src/lib/util.cc:970
 msgid "Each source frame will be doubled in the DCP.\n"
 msgstr "Se doblará cada fotograma de la fuente en el DCP.\n"
 
-#: src/lib/job.cc:300
+#: src/lib/job.cc:287
 msgid "Error (%1)"
 msgstr "Error (%1)"
 
@@ -183,11 +171,11 @@ msgstr "Examinar contenido de %1"
 
 #: src/lib/filter.cc:72
 msgid "Experimental horizontal deblocking filter 1"
-msgstr ""
+msgstr "Experimental horizontal deblocking filter 1"
 
 #: src/lib/filter.cc:73
 msgid "Experimental vertical deblocking filter 1"
-msgstr ""
+msgstr "Experimental vertical deblocking filter 1"
 
 #: src/lib/filter.cc:79
 msgid "FFMPEG deinterlacer"
@@ -219,7 +207,7 @@ msgstr "Flat sin deformación"
 
 #: src/lib/filter.cc:85
 msgid "Force quantizer"
-msgstr ""
+msgstr "Force quantizer"
 
 #: src/lib/scaler.cc:65
 msgid "Gaussian"
@@ -227,7 +215,7 @@ msgstr "Gaussiano"
 
 #: src/lib/filter.cc:86
 msgid "Gradient debander"
-msgstr ""
+msgstr "Gradient debander"
 
 #: src/lib/filter.cc:89
 msgid "High quality 3D denoiser"
@@ -235,13 +223,13 @@ msgstr "Reductor de ruido 3D de alta calidad"
 
 #: src/lib/filter.cc:68
 msgid "Horizontal deblocking filter"
-msgstr ""
+msgstr "Horizontal deblocking filter"
 
 #: src/lib/filter.cc:70
 msgid "Horizontal deblocking filter A"
-msgstr ""
+msgstr "Horizontal deblocking filter A"
 
-#: src/lib/job.cc:92 src/lib/job.cc:101
+#: 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)"
@@ -251,35 +239,23 @@ msgstr ""
 
 #: src/lib/filter.cc:82
 msgid "Kernel deinterlacer"
-msgstr ""
+msgstr "Kernel deinterlacer"
 
 #: src/lib/scaler.cc:66
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:929
-msgid "Left"
-msgstr ""
-
-#: src/lib/util.cc:933
-msgid "Left surround"
-msgstr ""
-
-#: src/lib/util.cc:932
-msgid "Lfe (sub)"
-msgstr ""
-
 #: src/lib/filter.cc:75
 msgid "Linear blend deinterlacer"
-msgstr ""
+msgstr "Linear blend deinterlacer"
 
 #: src/lib/filter.cc:76
 msgid "Linear interpolating deinterlacer"
-msgstr ""
+msgstr "Linear interpolating deinterlacer"
 
 #: src/lib/filter.cc:78
 msgid "Median deinterlacer"
-msgstr ""
+msgstr "Median deinterlacer"
 
 #: 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
@@ -288,24 +264,24 @@ msgstr "Miscelánea"
 
 #: src/lib/filter.cc:81
 msgid "Motion compensating deinterlacer"
-msgstr ""
+msgstr "Motion compensating deinterlacer"
 
 #: src/lib/filter.cc:84 src/lib/filter.cc:88 src/lib/filter.cc:89
 #: src/lib/filter.cc:91
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/lib/job.cc:298
+#: src/lib/job.cc:285
 msgid "OK (ran for %1)"
 msgstr "OK (ejecución %1)"
 
 #: src/lib/filter.cc:91
 msgid "Overcomplete wavelet denoiser"
-msgstr ""
+msgstr "Overcomplete wavelet denoiser"
 
 #: src/lib/dcp_content_type.cc:51
 msgid "Policy"
-msgstr ""
+msgstr "Policy"
 
 #: src/lib/dcp_content_type.cc:52
 msgid "Public Service Announcement"
@@ -315,18 +291,10 @@ msgstr "Anuncio de servicio público"
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:458
 msgid "Rec 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:930
-msgid "Right"
-msgstr ""
-
-#: src/lib/util.cc:934
-msgid "Right surround"
-msgstr ""
-
 #: src/lib/scp_dcp_job.cc:133
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
@@ -345,7 +313,7 @@ msgstr "Cortometraje"
 
 #: src/lib/scaler.cc:67
 msgid "Sinc"
-msgstr ""
+msgstr "Sinc"
 
 #: src/lib/format.cc:76
 msgid "Source scaled to 1.19:1"
@@ -401,7 +369,7 @@ msgstr "Fuente escalada a Scope conservando el ratio de aspecto"
 
 #: src/lib/scaler.cc:68
 msgid "Spline"
-msgstr ""
+msgstr "Spline"
 
 #: src/lib/dcp_content_type.cc:50
 msgid "Teaser"
@@ -413,13 +381,13 @@ msgstr "Filtro telecine"
 
 #: src/lib/filter.cc:84
 msgid "Temporal noise reducer"
-msgstr ""
+msgstr "Temporal noise reducer"
 
 #: src/lib/dcp_content_type.cc:47
 msgid "Test"
 msgstr "Test"
 
-#: src/lib/job.cc:77
+#: 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."
@@ -439,7 +407,7 @@ msgstr "Codificar %1"
 msgid "Transitional"
 msgstr "Transitional"
 
-#: src/lib/job.cc:100
+#: src/lib/job.cc:95
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -449,15 +417,15 @@ msgstr "Formato de audio desconocido (%1)"
 
 #: src/lib/filter.cc:87
 msgid "Unsharp mask and Gaussian blur"
-msgstr ""
+msgstr "Máscara de desenfoque Gaussiano"
 
 #: src/lib/filter.cc:69
 msgid "Vertical deblocking filter"
-msgstr ""
+msgstr "Vertical deblocking filter"
 
 #: src/lib/filter.cc:71
 msgid "Vertical deblocking filter A"
-msgstr ""
+msgstr "Vertical deblocking filter A"
 
 #: src/lib/scp_dcp_job.cc:101
 msgid "Waiting"
@@ -469,13 +437,17 @@ msgstr "X"
 
 #: src/lib/filter.cc:83
 msgid "Yet Another Deinterlacing Filter"
-msgstr ""
+msgstr "Yet Another Deinterlacing Filter"
+
+#: src/lib/encoder.cc:271
+msgid "adding to queue of %1"
+msgstr "añadiendo a la cola de %1"
 
 #: src/lib/film.cc:263
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:540
+#: src/lib/util.cc:499
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -495,11 +467,6 @@ msgstr "tipo de contenido"
 msgid "copying %1"
 msgstr "copiando %1"
 
-#: src/lib/exceptions.cc:36
-#, fuzzy
-msgid "could not create file %1"
-msgstr "No se pudo escribir el fichero remoto (%1)"
-
 #: src/lib/ffmpeg_decoder.cc:191
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
@@ -516,24 +483,14 @@ msgstr "no se pudo encontrar decodificador de subtítutlos"
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
-#: src/lib/sndfile_decoder.cc:72
+#: src/lib/external_audio_decoder.cc:72
 msgid "could not open external audio file for reading"
 msgstr "no se pudo leer el fichero externo  de audio"
 
-#: src/lib/exceptions.cc:29
-#, fuzzy
-msgid "could not open file %1"
-msgstr "no se pudo abrir el fichero para lectura"
-
 #: src/lib/dcp_video_frame.cc:388
 msgid "could not open file for reading"
 msgstr "no se pudo abrir el fichero para lectura"
 
-#: src/lib/exceptions.cc:44
-#, fuzzy
-msgid "could not read from file %1 (%2)"
-msgstr "No se pudo crear la carpeta remota %1 (%2)"
-
 #: src/lib/encoder.cc:137 src/lib/encoder.cc:314
 msgid "could not run sample-rate converter"
 msgstr "no se pudo ejecutar el conversor de velocidad"
@@ -546,16 +503,19 @@ msgstr "no se pudo abrir la sesión SCP (%1)"
 msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
-#: src/lib/exceptions.cc:50
-#, fuzzy
-msgid "could not write to file %1 (%2)"
-msgstr "No se pudo escribir el fichero remoto (%1)"
+#: src/lib/encoder.cc:247
+msgid "decoder sleeps with queue of %1"
+msgstr ""
+
+#: src/lib/encoder.cc:249
+msgid "decoder wakes with queue of %1"
+msgstr ""
 
-#: src/lib/sndfile_decoder.cc:94
+#: src/lib/external_audio_decoder.cc:94
 msgid "external audio files have differing lengths"
 msgstr "los ficheros externos de sonido tienen duraciones diferentes"
 
-#: src/lib/sndfile_decoder.cc:76
+#: src/lib/external_audio_decoder.cc:76
 msgid "external audio files must be mono"
 msgstr "los ficheros externos de sonido deben ser mono"
 
@@ -583,14 +543,10 @@ msgstr "minuto"
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:683
+#: src/lib/util.cc:642
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
-#: src/lib/exceptions.cc:54
-msgid "missing required setting %1"
-msgstr ""
-
 #: src/lib/subtitle.cc:52
 msgid "multi-part subtitles not yet supported"
 msgstr "todavía no se soportan subtítulos en múltiples partes"
@@ -609,11 +565,11 @@ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
 #. / TRANSLATORS: remaining here follows an amount of time that is remaining
 #. / on an operation.
-#: src/lib/job.cc:295
+#: src/lib/job.cc:282
 msgid "remaining"
 msgstr "pendiente"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:456
 msgid "sRGB"
 msgstr "sRGB"
 
@@ -628,6 +584,3 @@ msgstr "imagen fija"
 #: src/lib/film.cc:274
 msgid "video"
 msgstr "vídeo"
-
-#~ msgid "adding to queue of %1"
-#~ msgstr "añadiendo a la cola de %1"
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index f14cdafa1..7bd003c08 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-28 10:35+0000\n"
+"POT-Creation-Date: 2013-04-01 21:21+0100\n"
 "PO-Revision-Date: 2013-03-20 00:39+0100\n"
 "Last-Translator: FreeDCP.net <freedcp.net@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 6de01e576..b4278d93c 100644
--- a/src/lib/po/it_IT.po
+++ b/src/lib/po/it_IT.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: IT VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-28 10:35+0000\n"
+"POT-Creation-Date: 2013-04-01 21:21+0100\n"
 "PO-Revision-Date: 2013-03-20 11:45+0100\n"
 "Last-Translator: Maci <macibro@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 151e3ef58..9af19206f 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,11 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DVD-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-03-28 10:35+0000\n"
-"PO-Revision-Date: 2013-03-28 10:40+0100\n"
+"POT-Creation-Date: 2013-04-01 21:21+0100\n"
+"PO-Revision-Date: 2013-04-04 10:22+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -104,7 +103,7 @@ msgstr ""
 
 #: src/lib/util.cc:931
 msgid "Centre"
-msgstr ""
+msgstr "Mitt"
 
 #: src/lib/scp_dcp_job.cc:109
 msgid "Copy DCP to TMS"
@@ -157,9 +156,7 @@ msgstr "Kantighetsutjämning"
 msgid "De-interlacing"
 msgstr "Avflätning"
 
-# Ja vad heter "dering" på svenska?
 #: src/lib/filter.cc:74
-#, fuzzy
 msgid "Deringing filter"
 msgstr "Avringningsfilter"
 
@@ -209,7 +206,7 @@ msgstr "Snabb bilinjär"
 
 #: src/lib/dcp_content_type.cc:44
 msgid "Feature"
-msgstr "Egenskap"
+msgstr "Långfilm"
 
 #: src/lib/format.cc:120
 msgid "Flat"
@@ -261,15 +258,15 @@ msgstr "Lanczos"
 
 #: src/lib/util.cc:929
 msgid "Left"
-msgstr ""
+msgstr "Vänster"
 
 #: src/lib/util.cc:933
 msgid "Left surround"
-msgstr ""
+msgstr "Vänster surround"
 
 #: src/lib/util.cc:932
 msgid "Lfe (sub)"
-msgstr ""
+msgstr "Lfe (sub)"
 
 #: src/lib/filter.cc:75
 msgid "Linear blend deinterlacer"
@@ -315,7 +312,7 @@ msgstr "Offentligt Servicemeddelande"
 
 #: src/lib/dcp_content_type.cc:49
 msgid "Rating"
-msgstr "Klassificering"
+msgstr "Klassificeringsklipp"
 
 #: src/lib/util.cc:499
 msgid "Rec 709"
@@ -323,11 +320,11 @@ msgstr "Rec 709"
 
 #: src/lib/util.cc:930
 msgid "Right"
-msgstr ""
+msgstr "Höger"
 
 #: src/lib/util.cc:934
 msgid "Right surround"
-msgstr ""
+msgstr "Höger surround"
 
 #: src/lib/scp_dcp_job.cc:133
 msgid "SSH error (%1)"
@@ -406,9 +403,7 @@ msgstr ""
 msgid "Spline"
 msgstr "Spline"
 
-# Möjligen "Aptitretare"
 #: src/lib/dcp_content_type.cc:50
-#, fuzzy
 msgid "Teaser"
 msgstr "Teaser"
 
@@ -442,13 +437,13 @@ msgstr "Konvertera %1"
 
 #: src/lib/dcp_content_type.cc:48
 msgid "Transitional"
-msgstr "Övergångs-"
+msgstr "Övergångsklipp"
 
 #: src/lib/job.cc:100
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-# Ganska svengelskt...
+# Svengelska
 #: src/lib/ffmpeg_decoder.cc:396
 #, fuzzy
 msgid "Unrecognised audio sample format (%1)"
@@ -474,9 +469,8 @@ msgstr "Väntar"
 msgid "X"
 msgstr "X"
 
-# Filtret heter så, ska ej översättas?
+# Filtret heter så, ska ej översättas
 #: src/lib/filter.cc:83
-#, fuzzy
 msgid "Yet Another Deinterlacing Filter"
 msgstr "Yet Another Deinterlacing Filter"
 
@@ -484,7 +478,7 @@ msgstr "Yet Another Deinterlacing Filter"
 msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
-# mer svengelska
+# Svengelska
 #: src/lib/util.cc:540
 #, fuzzy
 msgid "connect timed out"
diff --git a/src/lib/util.cc b/src/lib/util.cc
index 760b826c7..654546e62 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -301,6 +301,7 @@ dvdomatic_setup_i18n (string lang)
 
 #ifdef DVDOMATIC_WINDOWS
 	bindtextdomain ("libdvdomatic", mo_path().string().c_str());
+	bind_textdomain_codeset ("libdvdomatic", "UTF8");
 #endif	
 
 #ifdef DVDOMATIC_POSIX
diff --git a/src/lib/wscript b/src/lib/wscript
index 896598a0e..8f0e851e3 100644
--- a/src/lib/wscript
+++ b/src/lib/wscript
@@ -54,7 +54,6 @@ sources = """
           types.cc
           ui_signaller.cc
           util.cc
-          version.cc
           video_content.cc
           video_decoder.cc
           video_source.cc
@@ -76,7 +75,7 @@ def build(bld):
                  """
     if bld.env.TARGET_WINDOWS:
         obj.uselib += ' WINSOCK2'
-    obj.source = sources
+    obj.source = sources + " version.cc"
     obj.target = 'dvdomatic'
 
     i18n.po_to_mo(os.path.join('src', 'lib'), 'libdvdomatic', bld)