Merge master.

6 files changed, 254 insertions, 206 deletions

diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 68418910c..32a4b67e2 100644
--- a/src/lib/po/de_DE.po
+++ b/src/lib/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-13 02:32+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -102,7 +102,7 @@ msgstr "Abgebrochen"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kann dieses Pixelformat %1 während %2 nicht bearbeiten"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Center"
 
@@ -217,7 +217,13 @@ msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
 msgid "Could not decode image file (%1)"
 msgstr "Bilddatei konnte nicht dekodiert werden"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "%1 konnte nicht geöffnet werden."
 
@@ -357,7 +363,7 @@ msgstr "Gauss Filter"
 msgid "Gradient debander"
 msgstr "Gradient Glätter"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -385,23 +391,23 @@ msgstr "Kernel De-Interlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround links"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
@@ -489,19 +495,19 @@ msgstr "Freigabehinweis"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround rechts"
 
@@ -601,7 +607,7 @@ msgstr "Überleitung"
 msgid "Unexpected ZIP file contents"
 msgstr "Ungültiger ZIP Inhalt"
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Ungültiges Bildformat vom Server erhalten"
 
@@ -621,7 +627,7 @@ msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "VI"
 
@@ -657,7 +663,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "Zeit für Verbindung abgelaufen"
 
@@ -685,7 +691,15 @@ msgstr "Datei %1 konnte nicht erstellt werden."
 msgid "could not find stream information"
 msgstr "Keine Spur-Information gefunden"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "Ton Dekoder nicht gefunden."
+
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "Bild-Dekoder nicht gefunden"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "Ton MXF kann nicht in das DCP verschoben werden (%1)"
 
@@ -729,19 +743,19 @@ msgstr "SSH Session konnte nicht gestartet werden"
 msgid "could not write to file %1 (%2)"
 msgstr "Datei %1 konnte nicht geschrieben werden (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "error during async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "error during async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "error during async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
@@ -749,23 +763,23 @@ msgstr "error during async_write (%1)"
 msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "Stunde"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "Stunden"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "Minute"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "Minuten"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "Key %1 in Key-value set fehlt"
 
@@ -799,12 +813,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB nicht linearisiert"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "Sekunden"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "Sekunden"
 
@@ -816,12 +830,6 @@ msgstr "Standbild"
 msgid "unknown"
 msgstr "unbekannt"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "Ton Dekoder nicht gefunden."
-
-#~ msgid "could not find video decoder"
-#~ msgstr "Bild-Dekoder nicht gefunden"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "Nur Bitmap Untertitel werden unterstützt"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index e874c6415..5dc99462b 100644
--- a/src/lib/po/es_ES.po
+++ b/src/lib/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-04-20 10:12-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -101,7 +101,7 @@ msgstr "Cancelado"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "No se puede usar el formato de pixel %1 para %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centro"
 
@@ -212,7 +212,13 @@ msgstr "No se pudo crear la carpeta remota %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "No se pudo crear el fichero (%1)"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
@@ -349,7 +355,7 @@ msgstr "Gaussiano"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -378,23 +384,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
@@ -479,19 +485,19 @@ msgstr "Clasificación"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround derecha"
 
@@ -591,7 +597,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -611,7 +617,7 @@ msgstr "Máscara de desenfoque Gaussiano"
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -647,7 +653,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -676,6 +682,14 @@ msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
 #: src/lib/writer.cc:430
+msgid "could not find audio decoder"
+msgstr "no se encontró el decodificador de audio"
+
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "no se pudo encontrar decodificador de vídeo"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "no s puedo mover el audio MXF en el DCP (%1)"
 
@@ -719,19 +733,19 @@ msgstr "no se pudo abrir la sesión SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "No se pudo escribir en el fichero (%1)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "error durante async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
@@ -739,23 +753,23 @@ msgstr "error durante async_write (%1)"
 msgid "frames per second"
 msgstr "imágenes por segundo"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minutos"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "falta la clave %1 en el par clave-valor"
 
@@ -789,12 +803,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "segundos"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "segundos"
 
@@ -806,12 +820,6 @@ msgstr "imagen fija"
 msgid "unknown"
 msgstr "desconocido"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "no se encontró el decodificador de audio"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "no se pudo encontrar decodificador de vídeo"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "todavía no se soportan subtítulos que no son en mapas de bits"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 474da73f9..bf8dc04f7 100644
--- a/src/lib/po/fr_FR.po
+++ b/src/lib/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-07-14 12:04+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -101,7 +101,7 @@ msgstr "Annulé"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Format du pixel %1 non géré par %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centre"
 
@@ -216,7 +216,13 @@ msgstr "Création du dossier distant %1 (%2) impossible"
 msgid "Could not decode image file (%1)"
 msgstr "Impossible de décoder le ficher image"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "lecture du fichier %1 impossible"
 
@@ -355,7 +361,7 @@ msgstr "Gaussien"
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -383,23 +389,23 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -483,19 +489,19 @@ msgstr "Classification"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -594,7 +600,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Type d'image non conforme reçu par le serveur"
 
@@ -614,7 +620,7 @@ msgstr "Adoucissement et flou Gaussien"
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -650,7 +656,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -678,7 +684,15 @@ msgstr "Écriture vers fichier distant (%1) impossible"
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "décodeur audio introuvable"
+
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "décodeur vidéo introuvable"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "ne peut déplacer un MXF son dans le DCP (%1)"
 
@@ -724,19 +738,19 @@ msgstr "démarrage de session SSH impossible"
 msgid "could not write to file %1 (%2)"
 msgstr "Écriture vers fichier distant (%1) impossible (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "erreur pendant async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "erreur pendant async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "erreur pendant async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "erreur pendant async_write (%1)"
 
@@ -744,23 +758,23 @@ msgstr "erreur pendant async_write (%1)"
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minutes"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "clé %1 manquante dans le réglage"
 
@@ -794,12 +808,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "secondes"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondes"
 
@@ -811,12 +825,6 @@ msgstr "%1 [restant]"
 msgid "unknown"
 msgstr "Inconnu"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "décodeur audio introuvable"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "décodeur vidéo introuvable"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "sous-titres non-bitmap non supportés actuellement"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index a22ccee3c..a3b1b9de7 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: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-02-03 10:48+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -102,7 +102,7 @@ msgstr "Cancellato"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Non posso gestire il formato di pixel %1 durante %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centro"
 
@@ -220,7 +220,13 @@ msgstr "Non posso creare la directory remota %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Non riesco ad aprire %1"
 
@@ -361,7 +367,7 @@ msgstr "Gaussiana"
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr ""
 
@@ -390,24 +396,24 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -493,20 +499,20 @@ msgstr "Punteggio"
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Surround destro"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -609,7 +615,7 @@ msgstr "Di transizione"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -629,7 +635,7 @@ msgstr "Maschera unsharp e sfocatura Gaussiana"
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr ""
 
@@ -666,7 +672,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -690,11 +696,19 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "non riesco a trovare il decoder audio"
+
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "non riesco a trovare il decoder video"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr ""
 
@@ -740,19 +754,19 @@ msgstr "non posso avviare la sessione SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "non posso scrivere il file (%1)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr ""
 
@@ -760,23 +774,23 @@ msgstr ""
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minuti"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "persa la chiave %1 tra i valori chiave"
 
@@ -810,12 +824,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non linearizzato"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "secondi"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondi"
 
@@ -829,12 +843,6 @@ msgstr "ancora"
 msgid "unknown"
 msgstr "Errore sconosciuto"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "non riesco a trovare il decoder audio"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "non riesco a trovare il decoder video"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "sottotitoli non-bitmap non ancora supportati"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 81a1e626b..414eacdc5 100644
--- a/src/lib/po/nl_NL.po
+++ b/src/lib/po/nl_NL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-09-04 20:34+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -102,7 +102,7 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Midden"
 
@@ -211,7 +211,13 @@ msgstr "Kan geen remote map maken %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "Kan beeldbestand niet decoderen"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Kan niet openen %1"
 
@@ -351,7 +357,7 @@ msgstr "Gaussian"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -379,23 +385,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -483,19 +489,19 @@ msgstr "Beoordeling"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Rechts surround"
 
@@ -594,7 +600,7 @@ msgstr "Bumper"
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Onverwacht beeldtype ontvangen door server"
 
@@ -614,7 +620,7 @@ msgstr "Unsharp mask and Gaussian blur"
 msgid "Untitled"
 msgstr "Niet benoemd"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -650,7 +656,7 @@ msgstr ""
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
@@ -674,11 +680,19 @@ msgstr "kopieeren %1"
 msgid "could not create file %1"
 msgstr "kan geen bestand maken %1"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "kan geen audio decoder vinden"
+
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "kan geen stream informatie vinden"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "kan geen videodecoder vinden"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kan MXF audio niet plaatsen in DCP (%1)"
 
@@ -722,19 +736,19 @@ msgstr "kan SSH sessie niet starten"
 msgid "could not write to file %1 (%2)"
 msgstr "kan niet schrijven naar bestand %1 (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "fout met async_accepteren (FTP) (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "fout met async_verbinden (FTP) (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "fout met async_lezen (FTP) (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "fout met async_schrijven (FTP) (%1)"
 
@@ -742,23 +756,23 @@ msgstr "fout met async_schrijven (FTP) (%1)"
 msgid "frames per second"
 msgstr "frames per seconde"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "uur"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "uren"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuut"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minuten"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "ontbrekende key %1 in key-value set"
 
@@ -792,11 +806,11 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non-linearised"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 msgid "second"
 msgstr "secondes"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondes"
 
@@ -808,12 +822,6 @@ msgstr "still"
 msgid "unknown"
 msgstr "onbekend"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "kan geen audio decoder vinden"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "kan geen videodecoder vinden"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "non-bitmap ondertitels worden nog niet ondersteund"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 29127294f..75a664191 100644
--- a/src/lib/po/sv_SE.po
+++ b/src/lib/po/sv_SE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-15 09:37+0100\n"
+"POT-Creation-Date: 2014-10-23 22:03+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -101,7 +101,7 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:775
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Center"
 
@@ -215,7 +215,13 @@ msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/job.cc:91
+#: src/lib/server_finder.cc:114
+msgid ""
+"Could not listen for remote encode servers.  Perhaps another instance of DCP-"
+"o-matic is running."
+msgstr ""
+
+#: src/lib/job.cc:90
 msgid "Could not open %1"
 msgstr "Kunde inte öppna %1"
 
@@ -353,7 +359,7 @@ msgstr "Gaussisk"
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/util.cc:779
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr ""
 
@@ -382,24 +388,24 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:773
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:781
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:783
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:777
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:776
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -485,20 +491,20 @@ msgstr "Rating"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:774
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:782
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:800
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:778
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -599,7 +605,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:56
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -620,7 +626,7 @@ msgstr "Oskärpemask och Gaussisk suddighet"
 msgid "Untitled"
 msgstr "Utan titel"
 
-#: src/lib/util.cc:780
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr ""
 
@@ -658,7 +664,7 @@ msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:554
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
@@ -682,11 +688,19 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:102
+#: src/lib/ffmpeg.cc:179
+msgid "could not find audio decoder"
+msgstr "kunde inte hitta audio-avkodare"
+
+#: src/lib/ffmpeg.cc:105
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/writer.cc:430
+#: src/lib/ffmpeg.cc:158
+msgid "could not find video decoder"
+msgstr "kunde inte hitta video-avkodare"
+
+#: src/lib/writer.cc:439
 msgid "could not move audio MXF into the DCP (%1)"
 msgstr "kunde inte flytta audio-MXF in i DCP:n (%1)"
 
@@ -731,19 +745,19 @@ msgstr "kunde inte starta SSH-session"
 msgid "could not write to file %1 (%2)"
 msgstr "kunde inte skriva till fil %1 (%2)"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "fel vid async_accept (%1)"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/util.cc:595
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
@@ -751,23 +765,23 @@ msgstr "fel vid async_write (%1)"
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:158
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:154 src/lib/util.cc:160
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:176
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:172 src/lib/util.cc:178
+#: src/lib/util.cc:175 src/lib/util.cc:181
 msgid "minutes"
 msgstr "minuter"
 
-#: src/lib/util.cc:706
+#: src/lib/util.cc:711
 msgid "missing key %1 in key-value set"
 msgstr "saknad nyckel %1 i nyckel-värde grupp"
 
@@ -802,12 +816,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB icke-linjär"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "sekunder"
 
-#: src/lib/util.cc:193
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "sekunder"
 
@@ -819,12 +833,6 @@ msgstr "stillbild"
 msgid "unknown"
 msgstr "okänd"
 
-#~ msgid "could not find audio decoder"
-#~ msgstr "kunde inte hitta audio-avkodare"
-
-#~ msgid "could not find video decoder"
-#~ msgstr "kunde inte hitta video-avkodare"
-
 #~ msgid "non-bitmap subtitles not yet supported"
 #~ msgstr "icke-rastergrafiska undertexter stöds inte ännu"