Merge branch 'master' of git.carlh.net:git/dcpomatic

7 files changed, 211 insertions, 169 deletions

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index c3e430082..264d9ab4a 100644
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -62,6 +62,12 @@ Playlist::~Playlist ()
 void
 Playlist::content_changed (weak_ptr<Content> content, int property, bool frequent)
 {
+	/* Don't respond to position changes here, as:
+	   - sequencing after earlier/later changes is handled by move_earlier/move_later
+	   - any other position changes will be timeline drags which should not result in content
+	   being sequenced.
+	*/
+	
 	if (property == ContentProperty::LENGTH || property == VideoContentProperty::VIDEO_FRAME_TYPE) {
 		maybe_sequence_video ();
 	}
@@ -389,7 +395,7 @@ Playlist::move_later (shared_ptr<Content> c)
 	}
 
 	(*next)->set_position (c->position ());
-	c->set_position (c->position() + c->length_after_trim ());
+	c->set_position (c->position() + (*next)->length_after_trim ());
 	sort (_content.begin(), _content.end(), ContentSorter ());
 }
 
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 071f582ce..0dc9cd5df 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-16 16:38+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"
@@ -98,7 +98,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:786
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Center"
 
@@ -203,6 +203,12 @@ msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
 msgid "Could not decode image file (%1)"
 msgstr "Bilddatei konnte nicht dekodiert werden"
 
+#: 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."
@@ -335,7 +341,7 @@ msgstr "Gauss Filter"
 msgid "Gradient debander"
 msgstr "Gradient Glätter"
 
-#: src/lib/util.cc:790
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -363,23 +369,23 @@ msgstr "Kernel De-Interlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:792
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:794
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround links"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
@@ -447,19 +453,19 @@ msgstr "Freigabehinweis"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:793
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:795
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:789
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround rechts"
 
@@ -542,7 +548,7 @@ msgstr "Überleitung"
 msgid "Unexpected ZIP file contents"
 msgstr "Ungültiger ZIP Inhalt"
 
-#: src/lib/image_proxy.cc:193
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Ungültiges Bildformat vom Server erhalten"
 
@@ -562,7 +568,7 @@ msgstr "Unscharf Maskieren mit Gaußschem Unschärfefilter"
 msgid "Untitled"
 msgstr "Unbenannt"
 
-#: src/lib/util.cc:791
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "VI"
 
@@ -594,7 +600,7 @@ msgstr "[Standbild]"
 msgid "cannot contain slashes"
 msgstr "Darf keine Schrägstriche enthalten"
 
-#: src/lib/util.cc:565
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "Zeit für Verbindung abgelaufen"
 
@@ -618,7 +624,7 @@ msgstr "kopiere %1"
 msgid "could not create file %1"
 msgstr "Datei %1 konnte nicht erstellt werden."
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:179
 msgid "could not find audio decoder"
 msgstr "Ton Dekoder nicht gefunden."
 
@@ -626,7 +632,7 @@ msgstr "Ton Dekoder nicht gefunden."
 msgid "could not find stream information"
 msgstr "Keine Spur-Information gefunden"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:158
 msgid "could not find video decoder"
 msgstr "Bild-Dekoder nicht gefunden"
 
@@ -674,19 +680,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:585
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "error during async_accept (%1)"
 
-#: src/lib/util.cc:561
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "error during async_connect (%1)"
 
-#: src/lib/util.cc:634
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "error during async_read (%1)"
 
-#: src/lib/util.cc:606
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "error during async_write (%1)"
 
@@ -694,23 +700,23 @@ msgstr "error during async_write (%1)"
 msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
-#: src/lib/util.cc:156
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "Stunde"
 
-#: src/lib/util.cc:152 src/lib/util.cc:158
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "Stunden"
 
-#: src/lib/util.cc:174
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "Minute"
 
-#: src/lib/util.cc:170 src/lib/util.cc:176
+#: 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"
 
@@ -748,12 +754,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB nicht linearisiert"
 
-#: src/lib/util.cc:189
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "Sekunden"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "Sekunden"
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 3aa8c19fa..4fcfac93a 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-16 16:38+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"
@@ -97,7 +97,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:786
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centro"
 
@@ -198,6 +198,12 @@ 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/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"
@@ -327,7 +333,7 @@ msgstr "Gaussiano"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:790
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -356,23 +362,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:792
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:794
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
@@ -437,19 +443,19 @@ msgstr "Clasificación"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:793
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:795
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:789
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround derecha"
 
@@ -532,7 +538,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenidos inesperados del fichero ZIP"
 
-#: src/lib/image_proxy.cc:193
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -552,7 +558,7 @@ msgstr "Máscara de desenfoque Gaussiano"
 msgid "Untitled"
 msgstr "Sin título"
 
-#: src/lib/util.cc:791
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -584,7 +590,7 @@ msgstr "[imagen fija]"
 msgid "cannot contain slashes"
 msgstr "no puede contener barras"
 
-#: src/lib/util.cc:565
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
@@ -608,7 +614,7 @@ msgstr "copiando %1"
 msgid "could not create file %1"
 msgstr "No se pudo crear el fichero (%1)"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:179
 msgid "could not find audio decoder"
 msgstr "no se encontró el decodificador de audio"
 
@@ -616,7 +622,7 @@ msgstr "no se encontró el decodificador de audio"
 msgid "could not find stream information"
 msgstr "no se pudo encontrar información del flujo"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:158
 msgid "could not find video decoder"
 msgstr "no se pudo encontrar decodificador de vídeo"
 
@@ -664,19 +670,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:585
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "error durante async_accept (%1)"
 
-#: src/lib/util.cc:561
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "error durante async_connect (%1)"
 
-#: src/lib/util.cc:634
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "error durante async_read (%1)"
 
-#: src/lib/util.cc:606
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "error durante async_write (%1)"
 
@@ -684,23 +690,23 @@ msgstr "error durante async_write (%1)"
 msgid "frames per second"
 msgstr "imágenes por segundo"
 
-#: src/lib/util.cc:156
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "hora"
 
-#: src/lib/util.cc:152 src/lib/util.cc:158
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "horas"
 
-#: src/lib/util.cc:174
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:170 src/lib/util.cc:176
+#: 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"
 
@@ -738,12 +744,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB no-lineal"
 
-#: src/lib/util.cc:189
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "segundos"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "segundos"
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 0242c63e7..ff1152f39 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-16 16:38+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"
@@ -97,7 +97,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:786
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centre"
 
@@ -201,6 +201,12 @@ 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/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"
@@ -332,7 +338,7 @@ msgstr "Gaussien"
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/util.cc:790
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -360,23 +366,23 @@ msgstr "Désentrelaceur noyau"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:792
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:794
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -440,19 +446,19 @@ msgstr "Classification"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:793
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:795
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:789
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -534,7 +540,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr "Contenu de fichier ZIP non géré."
 
-#: src/lib/image_proxy.cc:193
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Type d'image non conforme reçu par le serveur"
 
@@ -554,7 +560,7 @@ msgstr "Adoucissement et flou Gaussien"
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: src/lib/util.cc:791
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -586,7 +592,7 @@ msgstr "[restant]"
 msgid "cannot contain slashes"
 msgstr "slash interdit"
 
-#: src/lib/util.cc:565
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
@@ -610,7 +616,7 @@ msgstr "copie de %1"
 msgid "could not create file %1"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:179
 msgid "could not find audio decoder"
 msgstr "décodeur audio introuvable"
 
@@ -618,7 +624,7 @@ msgstr "décodeur audio introuvable"
 msgid "could not find stream information"
 msgstr "information du flux introuvable"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:158
 msgid "could not find video decoder"
 msgstr "décodeur vidéo introuvable"
 
@@ -668,19 +674,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:585
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "erreur pendant async_accept (%1)"
 
-#: src/lib/util.cc:561
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "erreur pendant async_connect (%1)"
 
-#: src/lib/util.cc:634
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "erreur pendant async_read (%1)"
 
-#: src/lib/util.cc:606
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "erreur pendant async_write (%1)"
 
@@ -688,23 +694,23 @@ msgstr "erreur pendant async_write (%1)"
 msgid "frames per second"
 msgstr "images par seconde"
 
-#: src/lib/util.cc:156
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "heure"
 
-#: src/lib/util.cc:152 src/lib/util.cc:158
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "heures"
 
-#: src/lib/util.cc:174
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minute"
 
-#: src/lib/util.cc:170 src/lib/util.cc:176
+#: 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"
 
@@ -742,12 +748,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non linéarisé"
 
-#: src/lib/util.cc:189
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "secondes"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondes"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 0ddbc4a9a..5863e5ad7 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-16 16:38+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"
@@ -98,7 +98,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:786
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Centro"
 
@@ -204,6 +204,12 @@ 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/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"
@@ -337,7 +343,7 @@ msgstr "Gaussiana"
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/util.cc:790
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr ""
 
@@ -366,24 +372,24 @@ msgstr "Deinterlacciatore Kernel"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:792
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:794
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -449,20 +455,20 @@ msgstr "Punteggio"
 msgid "Rec. 709"
 msgstr "Rec 709"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:793
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:795
+#: src/lib/util.cc:800
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Surround destro"
 
-#: src/lib/util.cc:789
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -548,7 +554,7 @@ msgstr "Di transizione"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:193
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -568,7 +574,7 @@ msgstr "Maschera unsharp e sfocatura Gaussiana"
 msgid "Untitled"
 msgstr "Senza titolo"
 
-#: src/lib/util.cc:791
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr ""
 
@@ -601,7 +607,7 @@ msgstr "ancora"
 msgid "cannot contain slashes"
 msgstr "non può contenere barre"
 
-#: src/lib/util.cc:565
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
@@ -625,7 +631,7 @@ msgstr "copia %1"
 msgid "could not create file %1"
 msgstr "Non posso scrivere il file remoto (%1)"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:179
 msgid "could not find audio decoder"
 msgstr "non riesco a trovare il decoder audio"
 
@@ -633,7 +639,7 @@ msgstr "non riesco a trovare il decoder audio"
 msgid "could not find stream information"
 msgstr "non riesco a trovare informazioni sullo streaming"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:158
 msgid "could not find video decoder"
 msgstr "non riesco a trovare il decoder video"
 
@@ -683,19 +689,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:585
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr ""
 
-#: src/lib/util.cc:561
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr ""
 
-#: src/lib/util.cc:634
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr ""
 
-#: src/lib/util.cc:606
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr ""
 
@@ -703,23 +709,23 @@ msgstr ""
 msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
-#: src/lib/util.cc:156
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "ora"
 
-#: src/lib/util.cc:152 src/lib/util.cc:158
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "ore"
 
-#: src/lib/util.cc:174
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuto"
 
-#: src/lib/util.cc:170 src/lib/util.cc:176
+#: 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"
 
@@ -757,12 +763,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non linearizzato"
 
-#: src/lib/util.cc:189
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "secondi"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondi"
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 857aa12d4..bc953fbbe 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-16 16:38+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"
@@ -98,7 +98,7 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Midden"
 
@@ -197,6 +197,12 @@ msgstr "Kan geen remote map maken %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "Kan beeldbestand niet decoderen"
 
+#: 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"
@@ -329,7 +335,7 @@ msgstr "Gaussian"
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/util.cc:790
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -357,23 +363,23 @@ msgstr "Kernel deinterlacer"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:792
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:794
+#: src/lib/util.cc:799
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -441,19 +447,19 @@ msgstr "Beoordeling"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:793
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:795
+#: src/lib/util.cc:800
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:789
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Rechts surround"
 
@@ -535,7 +541,7 @@ msgstr "Bumper"
 msgid "Unexpected ZIP file contents"
 msgstr "Onverwachte ZIP file inhoud"
 
-#: src/lib/image_proxy.cc:193
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr "Onverwacht beeldtype ontvangen door server"
 
@@ -555,7 +561,7 @@ msgstr "Unsharp mask and Gaussian blur"
 msgid "Untitled"
 msgstr "Niet benoemd"
 
-#: src/lib/util.cc:791
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -587,7 +593,7 @@ msgstr "[still]"
 msgid "cannot contain slashes"
 msgstr "er mag geen '\" gebruikt worden"
 
-#: src/lib/util.cc:565
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
@@ -611,7 +617,7 @@ msgstr "kopieeren %1"
 msgid "could not create file %1"
 msgstr "kan geen bestand maken %1"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:179
 msgid "could not find audio decoder"
 msgstr "kan geen audio decoder vinden"
 
@@ -619,7 +625,7 @@ msgstr "kan geen audio decoder vinden"
 msgid "could not find stream information"
 msgstr "kan geen stream informatie vinden"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:158
 msgid "could not find video decoder"
 msgstr "kan geen videodecoder vinden"
 
@@ -667,19 +673,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:585
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "fout met async_accepteren (FTP) (%1)"
 
-#: src/lib/util.cc:561
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "fout met async_verbinden (FTP) (%1)"
 
-#: src/lib/util.cc:634
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "fout met async_lezen (FTP) (%1)"
 
-#: src/lib/util.cc:606
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "fout met async_schrijven (FTP) (%1)"
 
@@ -687,23 +693,23 @@ msgstr "fout met async_schrijven (FTP) (%1)"
 msgid "frames per second"
 msgstr "frames per seconde"
 
-#: src/lib/util.cc:156
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "uur"
 
-#: src/lib/util.cc:152 src/lib/util.cc:158
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "uren"
 
-#: src/lib/util.cc:174
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minuut"
 
-#: src/lib/util.cc:170 src/lib/util.cc:176
+#: 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"
 
@@ -741,11 +747,11 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB non-linearised"
 
-#: src/lib/util.cc:189
+#: src/lib/util.cc:194
 msgid "second"
 msgstr "secondes"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "secondes"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index d4b773c2e..0c11c69e0 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-16 16:38+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"
@@ -97,7 +97,7 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:786
+#: src/lib/util.cc:791
 msgid "Centre"
 msgstr "Center"
 
@@ -201,6 +201,12 @@ msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "kunde inte skapa fil %1"
 
+#: 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"
@@ -331,7 +337,7 @@ msgstr "Gaussisk"
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/util.cc:790
+#: src/lib/util.cc:795
 msgid "Hearing impaired"
 msgstr ""
 
@@ -360,24 +366,24 @@ msgstr "Kernel-avflätare"
 msgid "Lanczos"
 msgstr "Lanczos"
 
-#: src/lib/util.cc:784
+#: src/lib/util.cc:789
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:792
+#: src/lib/util.cc:797
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:794
+#: src/lib/util.cc:799
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:788
+#: src/lib/util.cc:793
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:787
+#: src/lib/util.cc:792
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -443,20 +449,20 @@ msgstr "Rating"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/util.cc:785
+#: src/lib/util.cc:790
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:793
+#: src/lib/util.cc:798
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:795
+#: src/lib/util.cc:800
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:789
+#: src/lib/util.cc:794
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -540,7 +546,7 @@ msgstr "Transitional"
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
-#: src/lib/image_proxy.cc:193
+#: src/lib/image_proxy.cc:197
 msgid "Unexpected image type received by server"
 msgstr ""
 
@@ -561,7 +567,7 @@ msgstr "Oskärpemask och Gaussisk suddighet"
 msgid "Untitled"
 msgstr "Utan titel"
 
-#: src/lib/util.cc:791
+#: src/lib/util.cc:796
 msgid "Visually impaired"
 msgstr ""
 
@@ -595,7 +601,7 @@ msgid "cannot contain slashes"
 msgstr "får inte innehålla snedstreck"
 
 # Svengelska
-#: src/lib/util.cc:565
+#: src/lib/util.cc:570
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
@@ -619,7 +625,7 @@ msgstr "kopierar %1"
 msgid "could not create file %1"
 msgstr "kunde inte skapa fil %1"
 
-#: src/lib/ffmpeg.cc:176
+#: src/lib/ffmpeg.cc:179
 msgid "could not find audio decoder"
 msgstr "kunde inte hitta audio-avkodare"
 
@@ -627,7 +633,7 @@ msgstr "kunde inte hitta audio-avkodare"
 msgid "could not find stream information"
 msgstr "kunde inte hitta information om strömmen"
 
-#: src/lib/ffmpeg.cc:155
+#: src/lib/ffmpeg.cc:158
 msgid "could not find video decoder"
 msgstr "kunde inte hitta video-avkodare"
 
@@ -676,19 +682,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:585
+#: src/lib/util.cc:590
 msgid "error during async_accept (%1)"
 msgstr "fel vid async_accept (%1)"
 
-#: src/lib/util.cc:561
+#: src/lib/util.cc:566
 msgid "error during async_connect (%1)"
 msgstr "fel vid async_connect (%1)"
 
-#: src/lib/util.cc:634
+#: src/lib/util.cc:639
 msgid "error during async_read (%1)"
 msgstr "fel vid async_read (%1)"
 
-#: src/lib/util.cc:606
+#: src/lib/util.cc:611
 msgid "error during async_write (%1)"
 msgstr "fel vid async_write (%1)"
 
@@ -696,23 +702,23 @@ msgstr "fel vid async_write (%1)"
 msgid "frames per second"
 msgstr "bilder per sekund"
 
-#: src/lib/util.cc:156
+#: src/lib/util.cc:161
 msgid "hour"
 msgstr "timme"
 
-#: src/lib/util.cc:152 src/lib/util.cc:158
+#: src/lib/util.cc:157 src/lib/util.cc:163
 msgid "hours"
 msgstr "timmar"
 
-#: src/lib/util.cc:174
+#: src/lib/util.cc:179
 msgid "minute"
 msgstr "minut"
 
-#: src/lib/util.cc:170 src/lib/util.cc:176
+#: 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"
 
@@ -751,12 +757,12 @@ msgstr "sRGB"
 msgid "sRGB non-linearised"
 msgstr "sRGB icke-linjär"
 
-#: src/lib/util.cc:189
+#: src/lib/util.cc:194
 #, fuzzy
 msgid "second"
 msgstr "sekunder"
 
-#: src/lib/util.cc:191
+#: src/lib/util.cc:196
 msgid "seconds"
 msgstr "sekunder"