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

28 files changed, 673 insertions, 349 deletions

diff --git a/ChangeLog b/ChangeLog
index ed089ba54..026d30275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2014-10-24  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.76.6 released.
+
+2014-10-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.76.5 released.
+
+2014-10-23  Carl Hetherington  <cth@carlh.net>
+
+	* Version 1.76.4 released.
+
+2014-10-23  Carl Hetherington  <cth@carlh.net>
+
+	* Rename 'Add folder' to 'Add image sequence'
+	and add some tooltips.
+
+	* Move the "keep video in sequence" button into
+	the timeline dialogue.
+
+	* Fix mix-placement of content when using the "Down"
+	button to move it.
+
 2014-10-22  Carl Hetherington  <cth@carlh.net>
 
 	* Version 1.76.3 released.
diff --git a/debian/changelog b/debian/changelog
index 750be88ce..6f3d19700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-dcpomatic (1.76.3-1) UNRELEASED; urgency=low
+dcpomatic (1.76.6-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * New upstream release.
@@ -194,8 +194,11 @@ dcpomatic (1.76.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * New upstream release.
   * New upstream release.
+  * New upstream release.
+  * New upstream release.
+  * New upstream release.
 
- -- Carl Hetherington <carl@d1stkfactory>  Wed, 22 Oct 2014 09:32:14 +0100
+ -- Carl Hetherington <carl@d1stkfactory>  Fri, 24 Oct 2014 01:19:26 +0100
 
 dcpomatic (0.87-1) UNRELEASED; urgency=low
 
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"
 
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index fa89a4871..fe3a43f71 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -415,7 +415,7 @@ private:
 		} catch (exception& e) {
 			error_dialog (this, e.what ());
 		} catch (...) {
-			error_dialog (this, _("An unknown exeception occurred."));
+			error_dialog (this, _("An unknown exception occurred."));
 		}
 	
 		d->Destroy ();
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index ba09e24da..7f7fba632 100644
--- a/src/tools/po/de_DE.po
+++ b/src/tools/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 03:04+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -108,6 +108,10 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
 "den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Ein unbekannter Fehler ist aufgetreten."
+
 #: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
@@ -116,10 +120,6 @@ msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Bitte melden Sie dieses Problem an "
 "den Autor von DCP-o-matic (carl@dcpomatic.com)!"
 
-#: src/tools/dcpomatic.cc:418
-msgid "An unknown exeception occurred."
-msgstr "Ein unbekannter Fehler ist aufgetreten."
-
 #: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Medien der CPL sind nicht verschlüsselt worden."
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index e37d375e0..dd4d83c55 100644
--- a/src/tools/po/es_ES.po
+++ b/src/tools/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\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:21-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -103,16 +103,16 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Ha ocurrido un error desconocido."
+
 #: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:418
-msgid "An unknown exeception occurred."
-msgstr "Ha ocurrido un error desconocido."
-
 #: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 75eed5623..edc671081 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/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 10:43+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -106,6 +106,10 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Exception inconnue"
+
 #: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
@@ -114,10 +118,6 @@ msgstr ""
 "Erreur indéterminée. Merci de rapporter le problème à l'auteur de DCP-o-"
 "matic (carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:418
-msgid "An unknown exeception occurred."
-msgstr "Exception inconnue"
-
 #: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "Le contenu du CPL n'est pas crypté."
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 07b348c13..38b96da14 100644
--- a/src/tools/po/it_IT.po
+++ b/src/tools/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 09:36+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -100,16 +100,16 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:418
-msgid "An unknown exeception occurred."
-msgstr ""
-
 #: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index c77c54b95..ab300c7a5 100644
--- a/src/tools/po/nl_NL.po
+++ b/src/tools/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:29+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -105,6 +105,10 @@ msgstr ""
 "Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
 "(carl@dcpomatic.com)."
 
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr "Er is een onbekende fout opgetreden."
+
 #: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
@@ -113,10 +117,6 @@ msgstr ""
 "Een ongekende fout is opgetreden. AUB meld deze aan de maker van DCP-o-matic "
 "(carl@dcpomatic.com)."
 
-#: src/tools/dcpomatic.cc:418
-msgid "An unknown exeception occurred."
-msgstr "Er is een onbekende fout opgetreden."
-
 #: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr "De inhoud van de CPL is niet geëncrypteerd."
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index fbe64370f..f987b6f14 100644
--- a/src/tools/po/sv_SE.po
+++ b/src/tools/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"
@@ -103,16 +103,16 @@ msgid ""
 "author (carl@dcpomatic.com)."
 msgstr ""
 
+#: src/tools/dcpomatic.cc:418
+msgid "An unknown exception occurred."
+msgstr ""
+
 #: src/tools/dcpomatic.cc:823 src/tools/dcpomatic.cc:832
 msgid ""
 "An unknown exception occurred.  Please report this problem to the DCP-o-"
 "matic author (carl@dcpomatic.com)."
 msgstr ""
 
-#: src/tools/dcpomatic.cc:418
-msgid "An unknown exeception occurred."
-msgstr ""
-
 #: src/tools/dcpomatic.cc:414
 msgid "CPL's content is not encrypted."
 msgstr ""
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc
index e73b27267..4b3898859 100644
--- a/src/wx/film_editor.cc
+++ b/src/wx/film_editor.cc
@@ -255,7 +255,6 @@ FilmEditor::connect_to_widgets ()
 	_audio_channels->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::audio_channels_changed, this));
 	_j2k_bandwidth->Bind	(wxEVT_COMMAND_SPINCTRL_UPDATED,      boost::bind (&FilmEditor::j2k_bandwidth_changed, this));
 	_resolution->Bind       (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::resolution_changed, this));
-	_sequence_video->Bind   (wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::sequence_video_changed, this));
 	_three_d->Bind	 	(wxEVT_COMMAND_CHECKBOX_CLICKED,      boost::bind (&FilmEditor::three_d_changed, this));
 	_standard->Bind         (wxEVT_COMMAND_CHOICE_SELECTED,       boost::bind (&FilmEditor::standard_changed, this));
 }
@@ -277,27 +276,36 @@ FilmEditor::make_content_panel ()
 		_content->SetColumnWidth (0, 512);
 
 		wxBoxSizer* b = new wxBoxSizer (wxVERTICAL);
+
 		_content_add_file = new wxButton (_content_panel, wxID_ANY, _("Add file(s)..."));
-		b->Add (_content_add_file, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
-		_content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add folder..."));
+		_content_add_file->SetToolTip (_("Add video, image or sound files to the film."));
+		b->Add (_content_add_file,   0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		
+		_content_add_folder = new wxButton (_content_panel, wxID_ANY, _("Add image\nsequence..."));
+		_content_add_folder->SetToolTip (_("Add a directory of image files which will be used as a moving image sequence."));
 		b->Add (_content_add_folder, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		
 		_content_remove = new wxButton (_content_panel, wxID_ANY, _("Remove"));
-		b->Add (_content_remove, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		_content_remove->SetToolTip (_("Remove the selected piece of content from the film."));
+		b->Add (_content_remove, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		
 		_content_earlier = new wxButton (_content_panel, wxID_ANY, _("Up"));
-		b->Add (_content_earlier, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		_content_earlier->SetToolTip (_("Move the selected piece of content earlier in the film."));
+		b->Add (_content_earlier, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		
 		_content_later = new wxButton (_content_panel, wxID_ANY, _("Down"));
-		b->Add (_content_later, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		_content_later->SetToolTip (_("Move the selected piece of content later in the film."));
+		b->Add (_content_later, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+
 		_content_timeline = new wxButton (_content_panel, wxID_ANY, _("Timeline..."));
-		b->Add (_content_timeline, 1, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
+		_content_timeline->SetToolTip (_("Open the timeline for the film."));
+		b->Add (_content_timeline, 0, wxEXPAND | wxALL, DCPOMATIC_BUTTON_STACK_GAP);
 
 		s->Add (b, 0, wxALL, 4);
 
 		_content_sizer->Add (s, 0, wxEXPAND | wxALL, 6);
 	}
 
-	_sequence_video = new wxCheckBox (_content_panel, wxID_ANY, _("Keep video in sequence"));
-	_content_sizer->Add (_sequence_video);
-
 	_content_notebook = new wxNotebook (_content_panel, wxID_ANY);
 	_content_sizer->Add (_content_notebook, 1, wxEXPAND | wxTOP, 6);
 
@@ -503,9 +511,6 @@ FilmEditor::film_changed (Film::Property p)
 		checked_set (_audio_channels, _film->audio_channels ());
 		setup_dcp_name ();
 		break;
-	case Film::SEQUENCE_VIDEO:
-		checked_set (_sequence_video, _film->sequence_video ());
-		break;
 	case Film::THREE_D:
 		checked_set (_three_d, _film->three_d ());
 		setup_dcp_name ();
@@ -513,6 +518,8 @@ FilmEditor::film_changed (Film::Property p)
 	case Film::INTEROP:
 		checked_set (_standard, _film->interop() ? 1 : 0);
 		break;
+	default:
+		break;
 	}
 }
 
@@ -630,7 +637,6 @@ FilmEditor::set_film (shared_ptr<Film> f)
 	film_changed (Film::ISDCF_METADATA);
 	film_changed (Film::VIDEO_FRAME_RATE);
 	film_changed (Film::AUDIO_CHANNELS);
-	film_changed (Film::SEQUENCE_VIDEO);
 	film_changed (Film::THREE_D);
 	film_changed (Film::INTEROP);
 
@@ -672,7 +678,6 @@ FilmEditor::set_general_sensitivity (bool s)
 	_j2k_bandwidth->Enable (s);
 	_container->Enable (s);
 	_best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
-	_sequence_video->Enable (s);
 	_resolution->Enable (s);
 	_scaler->Enable (s);
 	_three_d->Enable (s);
@@ -1013,16 +1018,6 @@ FilmEditor::set_selection (weak_ptr<Content> wc)
 }
 
 void
-FilmEditor::sequence_video_changed ()
-{
-	if (!_film) {
-		return;
-	}
-	
-	_film->set_sequence_video (_sequence_video->GetValue ());
-}
-
-void
 FilmEditor::content_right_click (wxListEvent& ev)
 {
 	_menu.popup (_film, selected_content (), ev.GetPoint ());
diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h
index ba9ff6fa0..d66668a61 100644
--- a/src/wx/film_editor.h
+++ b/src/wx/film_editor.h
@@ -96,7 +96,6 @@ private:
 	void content_timeline_clicked ();
 	void audio_channels_changed ();
 	void resolution_changed ();
-	void sequence_video_changed ();
 	void content_right_click (wxListEvent &);
 	void three_d_changed ();
 	void standard_changed ();
@@ -144,7 +143,6 @@ private:
 	wxButton* _content_earlier;
 	wxButton* _content_later;
 	wxButton* _content_timeline;
-	wxCheckBox* _sequence_video;
 	wxButton* _edit_isdcf_button;
 	wxChoice* _scaler;
  	wxSpinCtrl* _j2k_bandwidth;
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index c488cab4b..4b8b1fdf1 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/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 03:08+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,7 +45,7 @@ msgstr "-6dB"
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:273
 msgid "1 channel"
 msgstr "1 Kanal"
 
@@ -105,13 +105,24 @@ msgstr "Kino hinzufügen..."
 msgid "Add Screen..."
 msgstr "Saal hinzufügen..."
 
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
 #: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Datei(en) hinzufügen..."
 
-#: src/wx/film_editor.cc:282
-msgid "Add folder..."
-msgstr "Ordner hinzufügen..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/editable_list.h:62
 msgid "Add..."
@@ -169,6 +180,15 @@ msgstr ""
 "Der Ton von Kanal %d wird wird an den DCP Kanal %d mit %.1fdB Pegel "
 "weitergegeben."
 
+#: src/wx/audio_panel.cc:248
+#, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr ""
+
+#: src/wx/audio_panel.cc:253
+msgid "Audio will not be resampled."
+msgstr ""
+
 #: src/wx/config_dialog.cc:683
 msgid "BCC address"
 msgstr "BCC: Adresse"
@@ -259,11 +279,11 @@ msgstr "Beim Start auf Updates überprüfen."
 msgid "Choose a file"
 msgstr "Datei auswählen"
 
-#: src/wx/film_editor.cc:810
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Eine oder mehrere Dateien auswählen"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Ordner wählen"
 
@@ -437,7 +457,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi Seriennummern müssen aus 6 Zahlen bestehen!"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Nach unten"
 
@@ -581,7 +601,7 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Host Name oder IP-Adresse"
 
-#: src/wx/audio_panel.cc:242
+#: src/wx/audio_panel.cc:277
 msgid "Hz"
 msgstr "Hz"
 
@@ -629,7 +649,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr "Zeitfenster"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Lücken in Zeitleiste automatisch schließen"
 
@@ -669,7 +689,7 @@ msgstr ""
 msgid "Ls"
 msgstr "SL"
 
-#: src/wx/film_editor.cc:784
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "FEHLT:"
 
@@ -702,6 +722,14 @@ msgstr "Maximale JPEG2000 Datenrate (Vorsicht!)"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
 #: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Mehrere Inhalte ausgewählt"
@@ -737,6 +765,10 @@ msgstr "Kein"
 msgid "Off"
 msgstr "Aus"
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Andere"
@@ -814,7 +846,7 @@ msgstr "Rc"
 msgid "Red band"
 msgstr "Red band (USA, für explizite Inhalte)"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
 #: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Entfernen"
@@ -827,6 +859,10 @@ msgstr "Kino entfernen"
 msgid "Remove Screen"
 msgstr "Saal entfernen"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Wiederholen"
@@ -936,7 +972,7 @@ msgstr "Signiert"
 msgid "Smoothing"
 msgstr "Glätten"
 
-#: src/wx/timeline_dialog.cc:38
+#: src/wx/timeline_dialog.cc:39
 msgid "Snap"
 msgstr "Auf Objekte einrasten"
 
@@ -968,7 +1004,7 @@ msgstr "Untertitel Sprache (z.B. EN)"
 msgid "Subtitles"
 msgstr "Untertitel"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
@@ -992,7 +1028,7 @@ msgstr "Gebiet (z.B. UK)"
 msgid "Test version "
 msgstr "Test Version"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Getestet von"
 
@@ -1034,7 +1070,7 @@ msgstr "Zeit"
 msgid "Timeline"
 msgstr "Zeitleiste"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Zeitleiste..."
 
@@ -1074,7 +1110,7 @@ msgstr "Unbekannt"
 msgid "Until"
 msgstr "Bis"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Nach oben"
 
@@ -1187,7 +1223,7 @@ msgstr ""
 msgid "audio"
 msgstr "Ton"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:275
 msgid "channels"
 msgstr "Kanäle"
 
@@ -1220,6 +1256,9 @@ msgstr "mal"
 msgid "video"
 msgstr "Bild"
 
+#~ msgid "Add folder..."
+#~ msgstr "Ordner hinzufügen..."
+
 #~ msgid "Default creator"
 #~ msgstr "Standard 'creator' (DCI)"
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 88754e0a6..6aea49f52 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libdcpomatic-wx\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 12:06-0500\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -44,7 +44,7 @@ msgstr ""
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:273
 msgid "1 channel"
 msgstr "1 canal"
 
@@ -106,13 +106,24 @@ msgstr "Añadir cine..."
 msgid "Add Screen..."
 msgstr "Añadir pantalla..."
 
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
 #: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Añadir fichero(s)..."
 
-#: src/wx/film_editor.cc:282
-msgid "Add folder..."
-msgstr "Añadir carpeta..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/editable_list.h:62
 msgid "Add..."
@@ -168,6 +179,15 @@ msgid ""
 "%.1fdB."
 msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB."
 
+#: src/wx/audio_panel.cc:248
+#, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr ""
+
+#: src/wx/audio_panel.cc:253
+msgid "Audio will not be resampled."
+msgstr ""
+
 #: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
@@ -261,11 +281,11 @@ msgstr "Buscar actualizaciones al iniciar"
 msgid "Choose a file"
 msgstr "Elige un fichero"
 
-#: src/wx/film_editor.cc:810
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Elegir un fichero o ficheros"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Elige una carpeta"
 
@@ -442,7 +462,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Los números de serie de Doremi deben tener 6 cifras"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Bajar"
 
@@ -586,7 +606,7 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Nombre o dirección IP"
 
-#: src/wx/audio_panel.cc:242
+#: src/wx/audio_panel.cc:277
 msgid "Hz"
 msgstr "Hz"
 
@@ -636,7 +656,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr "Tiempo"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Mantener el video secuencia"
 
@@ -676,7 +696,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:784
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "FALTA:"
 
@@ -709,6 +729,14 @@ msgstr "Ancho de banda JPEG2000 máximo"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
 #: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Varios contenidos seleccionados"
@@ -744,6 +772,10 @@ msgstr "Ninguno"
 msgid "Off"
 msgstr "Off"
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Otros"
@@ -822,7 +854,7 @@ msgstr "Rc"
 msgid "Red band"
 msgstr ""
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
 #: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Quitar"
@@ -835,6 +867,10 @@ msgstr "Quitar cine"
 msgid "Remove Screen"
 msgstr "Quitar pantalla"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Repetir"
@@ -947,7 +983,7 @@ msgstr "Firmado"
 msgid "Smoothing"
 msgstr "Suavizado"
 
-#: src/wx/timeline_dialog.cc:38
+#: src/wx/timeline_dialog.cc:39
 msgid "Snap"
 msgstr "Acoplar"
 
@@ -980,7 +1016,7 @@ msgstr "Idioma del subtítulo (ej. EN)"
 msgid "Subtitles"
 msgstr "Subtítulos"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Soportado por"
 
@@ -1005,7 +1041,7 @@ msgstr "Territorio (ej. ES)"
 msgid "Test version "
 msgstr "Versión en prueba"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Comprobado por"
 
@@ -1046,7 +1082,7 @@ msgstr "Tiempo"
 msgid "Timeline"
 msgstr "Línea de tiempo"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Linea de tiempo..."
 
@@ -1087,7 +1123,7 @@ msgstr "Desconocido"
 msgid "Until"
 msgstr "Hasta"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Subir"
 
@@ -1203,7 +1239,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:275
 msgid "channels"
 msgstr "canales"
 
@@ -1236,6 +1272,9 @@ msgstr "veces"
 msgid "video"
 msgstr "vídeo"
 
+#~ msgid "Add folder..."
+#~ msgstr "Añadir carpeta..."
+
 #~ msgid "Default creator"
 #~ msgstr "Creador por defecto"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 75fc5754a..a4d26fd01 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/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 11:27+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -45,7 +45,7 @@ msgstr "-6dB"
 msgid "1 / "
 msgstr "1/"
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:273
 msgid "1 channel"
 msgstr "1 canal"
 
@@ -105,13 +105,24 @@ msgstr "Ajout cinéma"
 msgid "Add Screen..."
 msgstr "Ajout une salle"
 
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
 #: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Ajout fichier(s)..."
 
-#: src/wx/film_editor.cc:282
-msgid "Add folder..."
-msgstr "Ajout dossier..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/editable_list.h:62
 msgid "Add..."
@@ -169,6 +180,16 @@ msgstr ""
 "Le son du canal audio %d sera transféré au canal %d du DCP avec un gain de "
 "%.1fdB."
 
+#: src/wx/audio_panel.cc:248
+#, fuzzy, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr "L'audio sera rééchantillonné de %dHz à %dHz."
+
+#: src/wx/audio_panel.cc:253
+#, fuzzy
+msgid "Audio will not be resampled."
+msgstr "L'audio sera rééchantillonné de %dHz à %dHz."
+
 #: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
@@ -260,11 +281,11 @@ msgstr "Recherche de mises à jour au démarrage."
 msgid "Choose a file"
 msgstr "Choisissez un fichier"
 
-#: src/wx/film_editor.cc:810
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Choisissez un ou plusieurs fichiers"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Choisissez un dossier"
 
@@ -438,7 +459,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Les numéros de série Doremi doivent être composés de 6 chiffres"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Descendre"
 
@@ -580,7 +601,7 @@ msgstr "Hôtes"
 msgid "Host name or IP address"
 msgstr "Nom de l'hôte ou adresse IP"
 
-#: src/wx/audio_panel.cc:242
+#: src/wx/audio_panel.cc:277
 msgid "Hz"
 msgstr "Hz"
 
@@ -628,7 +649,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr "Temps"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Conserver la vidéo dans la séquence"
 
@@ -668,7 +689,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Sr.G"
 
-#: src/wx/film_editor.cc:784
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
@@ -701,6 +722,14 @@ msgstr "Qualité JPEG2000 Maxi"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
 #: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Contenus multiples sélectionnés"
@@ -736,6 +765,10 @@ msgstr "Aucun"
 msgid "Off"
 msgstr "Eteint"
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Autre"
@@ -813,7 +846,7 @@ msgstr "CD"
 msgid "Red band"
 msgstr "Red Band"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
 #: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Supprimer"
@@ -826,6 +859,10 @@ msgstr "Supprimer le cinéma"
 msgid "Remove Screen"
 msgstr "Supprimer la salle"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Répéter"
@@ -935,7 +972,7 @@ msgstr "Signé"
 msgid "Smoothing"
 msgstr "Lissage"
 
-#: src/wx/timeline_dialog.cc:38
+#: src/wx/timeline_dialog.cc:39
 msgid "Snap"
 msgstr "Magnetisme"
 
@@ -967,7 +1004,7 @@ msgstr "Langue de sous-titres (ex. FR)"
 msgid "Subtitles"
 msgstr "Sous-titres"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Soutenu par"
 
@@ -991,7 +1028,7 @@ msgstr "Territoire (ex. FR)"
 msgid "Test version "
 msgstr "Version test"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Testé par"
 
@@ -1033,7 +1070,7 @@ msgstr "Durée"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Timeline..."
 
@@ -1073,7 +1110,7 @@ msgstr "inconnu."
 msgid "Until"
 msgstr "Jusqu'au"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Monter"
 
@@ -1186,7 +1223,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:275
 msgid "channels"
 msgstr "canaux"
 
@@ -1219,6 +1256,9 @@ msgstr "fois"
 msgid "video"
 msgstr "vidéo"
 
+#~ msgid "Add folder..."
+#~ msgstr "Ajout dossier..."
+
 #~ msgid "Default creator"
 #~ msgstr "Créateur par défaut"
 
@@ -1300,9 +1340,6 @@ msgstr "vidéo"
 #~ msgid "A/B mode"
 #~ msgstr "A/B mode"
 
-#~ msgid "Audio will be resampled from %dHz to %dHz\n"
-#~ msgstr "L'audio sera rééchantillonné de %dHz à %dHz\n"
-
 #~ msgid "Colour look-up table"
 #~ msgstr "Espace colorimétrique"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 320d15e0c..9dcce02d1 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/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:46+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -43,7 +43,7 @@ msgstr ""
 msgid "1 / "
 msgstr ""
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:273
 msgid "1 channel"
 msgstr "1 canale"
 
@@ -104,13 +104,24 @@ msgstr "Aggiungi Cinema"
 msgid "Add Screen..."
 msgstr "Aggiungi Schermo"
 
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
 #: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Aggiungi File"
 
-#: src/wx/film_editor.cc:282
-msgid "Add folder..."
-msgstr "Aggiungi cartella"
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/editable_list.h:62
 msgid "Add..."
@@ -169,6 +180,16 @@ msgstr ""
 "L' audio sarà trasferito dal canale %d sorgente al canale %d DCP con "
 "guadagno di %.1fdB."
 
+#: src/wx/audio_panel.cc:248
+#, fuzzy, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr "L'Audio sarà ricampionato da %dHz a %dHz"
+
+#: src/wx/audio_panel.cc:253
+#, fuzzy
+msgid "Audio will not be resampled."
+msgstr "L'Audio sarà ricampionato da %dHz a %dHz."
+
 #: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
@@ -263,11 +284,11 @@ msgstr "Controlla gli aggiornamentio alla partenza"
 msgid "Choose a file"
 msgstr "Scegli un file"
 
-#: src/wx/film_editor.cc:810
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Scegli uno o più file"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Scegli una cartella"
 
@@ -447,7 +468,7 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr ""
 
@@ -592,7 +613,7 @@ msgstr ""
 msgid "Host name or IP address"
 msgstr "Nome dell'Host o indirizzo IP"
 
-#: src/wx/audio_panel.cc:242
+#: src/wx/audio_panel.cc:277
 msgid "Hz"
 msgstr "Hz"
 
@@ -642,7 +663,7 @@ msgstr ""
 msgid "KDM|Timing"
 msgstr ""
 
-#: src/wx/film_editor.cc:298
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Tieni i video in sequenza"
 
@@ -682,7 +703,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:784
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
@@ -718,6 +739,14 @@ msgstr "Banda passante JPEG2000"
 msgid "Mbit/s"
 msgstr ""
 
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
 #: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Molteplici sorgenti selezionate"
@@ -753,6 +782,10 @@ msgstr "Nessuno"
 msgid "Off"
 msgstr ""
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr ""
@@ -832,7 +865,7 @@ msgstr "Rc"
 msgid "Red band"
 msgstr ""
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
 #: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Rimuovi"
@@ -845,6 +878,10 @@ msgstr "Rimuovi Cinema"
 msgid "Remove Screen"
 msgstr "Rimuovi Schermo"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr ""
@@ -957,7 +994,7 @@ msgstr ""
 msgid "Smoothing"
 msgstr "Levigatura"
 
-#: src/wx/timeline_dialog.cc:38
+#: src/wx/timeline_dialog.cc:39
 msgid "Snap"
 msgstr ""
 
@@ -990,7 +1027,7 @@ msgstr "Lingua dei Sottotitoli (es. FR)"
 msgid "Subtitles"
 msgstr "Sottotitoli"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr ""
 
@@ -1016,7 +1053,7 @@ msgstr "Nazione (es. UK)"
 msgid "Test version "
 msgstr "Versione di test"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr ""
 
@@ -1057,7 +1094,7 @@ msgstr "Tempo"
 msgid "Timeline"
 msgstr "Timeline"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr ""
 
@@ -1099,7 +1136,7 @@ msgstr "sconosciuto"
 msgid "Until"
 msgstr "Fino a"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Su"
 
@@ -1214,7 +1251,7 @@ msgstr ""
 msgid "audio"
 msgstr "Audio"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:275
 msgid "channels"
 msgstr "canali"
 
@@ -1248,6 +1285,9 @@ msgstr ""
 msgid "video"
 msgstr "Video"
 
+#~ msgid "Add folder..."
+#~ msgstr "Aggiungi cartella"
+
 #, fuzzy
 #~ msgid "Default creator"
 #~ msgstr "Contenitore predefinito"
@@ -1306,9 +1346,6 @@ msgstr "Video"
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
-#~ msgid "Audio will be resampled from %dHz to %dHz\n"
-#~ msgstr "L'Audio sarà ricampionato da %dHz a %dHz\n"
-
 #~ msgid "Colour look-up table"
 #~ msgstr "Tabella per ricerca del colore"
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index a59f204af..509179bfb 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/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:17+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -45,7 +45,7 @@ msgstr "-6dB"
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:273
 msgid "1 channel"
 msgstr "1 channel"
 
@@ -105,13 +105,24 @@ msgstr "Voeg Bioscoop toe..."
 msgid "Add Screen..."
 msgstr "Voeg Scherm toe..."
 
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
 #: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Voeg bestande(n) toe..."
 
-#: src/wx/film_editor.cc:282
-msgid "Add folder..."
-msgstr "Voeg map toe..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/editable_list.h:62
 msgid "Add..."
@@ -178,6 +189,15 @@ msgstr ""
 "Audio wordt doorgestuurd van content kanaal %d naar DCP kanaal %d met gain "
 "%1fdB."
 
+#: src/wx/audio_panel.cc:248
+#, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr ""
+
+#: src/wx/audio_panel.cc:253
+msgid "Audio will not be resampled."
+msgstr ""
+
 #: src/wx/config_dialog.cc:683
 msgid "BCC address"
 msgstr "BCC adres"
@@ -268,11 +288,11 @@ msgstr "Selecteer voor updates controle bij startup"
 msgid "Choose a file"
 msgstr "Kies een bestand"
 
-#: src/wx/film_editor.cc:810
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Kies bestand(en)"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Kies map"
 
@@ -446,7 +466,7 @@ msgstr "Doremi"
 msgid "Doremi serial numbers must have 6 digits"
 msgstr "Doremi serial numbers moeten bestaan uit 6 digits"
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Naar beneden"
 
@@ -588,7 +608,7 @@ msgstr "Host"
 msgid "Host name or IP address"
 msgstr "Host naam of IP address"
 
-#: src/wx/audio_panel.cc:242
+#: src/wx/audio_panel.cc:277
 msgid "Hz"
 msgstr "Hz"
 
@@ -636,7 +656,7 @@ msgstr "soort KDM"
 msgid "KDM|Timing"
 msgstr "KDM|Timing"
 
-#: src/wx/film_editor.cc:298
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Behoud video in tijdlijn"
 
@@ -676,7 +696,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Ls"
 
-#: src/wx/film_editor.cc:784
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "ONTBREEKT:"
 
@@ -709,6 +729,14 @@ msgstr "Maximum JPEG2000 bandbreedte"
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
 #: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
 msgstr "Meedere content geselecteerd"
@@ -746,6 +774,10 @@ msgstr "Geen"
 msgid "Off"
 msgstr "Uit"
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr "Andere"
@@ -823,7 +855,7 @@ msgstr "Rc"
 msgid "Red band"
 msgstr "Rode tape"
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
 #: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Verwijder"
@@ -836,6 +868,10 @@ msgstr "Verwijder Bioscoop"
 msgid "Remove Screen"
 msgstr "Verwijder Scherm"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Herhaal"
@@ -945,7 +981,7 @@ msgstr "Signed"
 msgid "Smoothing"
 msgstr "Smoothing"
 
-#: src/wx/timeline_dialog.cc:38
+#: src/wx/timeline_dialog.cc:39
 msgid "Snap"
 msgstr "Snap"
 
@@ -977,7 +1013,7 @@ msgstr "Ondertitel Taal (vb  NL)"
 msgid "Subtitles"
 msgstr "Ondertitels"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Ondersteund door"
 
@@ -1001,7 +1037,7 @@ msgstr "Grondgebied (vb NL)"
 msgid "Test version "
 msgstr "Test Versie"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 msgid "Tested by"
 msgstr "Getest door"
 
@@ -1043,7 +1079,7 @@ msgstr "Tijd"
 msgid "Timeline"
 msgstr "Tijdlijn"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Tijdlijn..."
 
@@ -1083,7 +1119,7 @@ msgstr "Onbekend"
 msgid "Until"
 msgstr "Totdat"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Omhoog"
 
@@ -1195,7 +1231,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:275
 msgid "channels"
 msgstr "kanalen"
 
@@ -1228,6 +1264,9 @@ msgstr "tijden"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Add folder..."
+#~ msgstr "Voeg map toe..."
+
 #~ msgid "Default creator"
 #~ msgstr "Standaard maker"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 81fa8c4b3..5670fc4cb 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/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 09:14+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -44,7 +44,7 @@ msgstr ""
 msgid "1 / "
 msgstr "1 / "
 
-#: src/wx/audio_panel.cc:238
+#: src/wx/audio_panel.cc:273
 msgid "1 channel"
 msgstr "1 kanal"
 
@@ -106,13 +106,24 @@ msgstr "Lägg till Cinema..."
 msgid "Add Screen..."
 msgstr "Lägg till Skärm..."
 
+#: src/wx/film_editor.cc:285
+msgid ""
+"Add a directory of image files which will be used as a moving image sequence."
+msgstr ""
+
 #: src/wx/film_editor.cc:280
 msgid "Add file(s)..."
 msgstr "Lägg till fil(er)..."
 
-#: src/wx/film_editor.cc:282
-msgid "Add folder..."
-msgstr "Lägg till folder..."
+#: src/wx/film_editor.cc:284
+msgid ""
+"Add image\n"
+"sequence..."
+msgstr ""
+
+#: src/wx/film_editor.cc:281
+msgid "Add video, image or sound files to the film."
+msgstr ""
 
 #: src/wx/editable_list.h:62
 msgid "Add..."
@@ -172,6 +183,16 @@ msgstr ""
 "Audio kommer att överföras från innehållskanal %d till DCP-kanal %d med "
 "förstärkning %.1fdB."
 
+#: src/wx/audio_panel.cc:248
+#, fuzzy, c-format
+msgid "Audio will be resampled from %.3fkHz to %.3fkHz."
+msgstr "Audio kommer att samplas om från %dHz till %dHz."
+
+#: src/wx/audio_panel.cc:253
+#, fuzzy
+msgid "Audio will not be resampled."
+msgstr "Audio kommer att samplas om från %dHz till %dHz."
+
 #: src/wx/config_dialog.cc:683
 #, fuzzy
 msgid "BCC address"
@@ -267,11 +288,11 @@ msgstr "Sök efter uppdateringar vid start"
 msgid "Choose a file"
 msgstr "Välj en fil"
 
-#: src/wx/film_editor.cc:810
+#: src/wx/film_editor.cc:815
 msgid "Choose a file or files"
 msgstr "Välj en fil eller filer"
 
-#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:833
+#: src/wx/content_menu.cc:175 src/wx/film_editor.cc:838
 msgid "Choose a folder"
 msgstr "Välj en folder"
 
@@ -453,7 +474,7 @@ msgstr ""
 msgid "Doremi serial numbers must have 6 digits"
 msgstr ""
 
-#: src/wx/film_editor.cc:288
+#: src/wx/film_editor.cc:296
 msgid "Down"
 msgstr "Ner"
 
@@ -599,7 +620,7 @@ msgstr "Dator"
 msgid "Host name or IP address"
 msgstr "Datornamn eller IP-adress"
 
-#: src/wx/audio_panel.cc:242
+#: src/wx/audio_panel.cc:277
 msgid "Hz"
 msgstr "Hz"
 
@@ -652,7 +673,7 @@ msgid "KDM|Timing"
 msgstr "Tajming"
 
 # "sekvens" eller "ordning"?
-#: src/wx/film_editor.cc:298
+#: src/wx/timeline_dialog.cc:41
 msgid "Keep video in sequence"
 msgstr "Behåll video i sekvens"
 
@@ -692,7 +713,7 @@ msgstr ""
 msgid "Ls"
 msgstr "Vs"
 
-#: src/wx/film_editor.cc:784
+#: src/wx/film_editor.cc:789
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
@@ -726,6 +747,14 @@ msgstr "JPEG2000-bandbredd"
 msgid "Mbit/s"
 msgstr ""
 
+#: src/wx/film_editor.cc:293
+msgid "Move the selected piece of content earlier in the film."
+msgstr ""
+
+#: src/wx/film_editor.cc:297
+msgid "Move the selected piece of content later in the film."
+msgstr ""
+
 # Låter mysko
 #: src/wx/video_panel.cc:280
 msgid "Multiple content selected"
@@ -764,6 +793,10 @@ msgstr "Inget"
 msgid "Off"
 msgstr "Av"
 
+#: src/wx/film_editor.cc:301
+msgid "Open the timeline for the film."
+msgstr ""
+
 #: src/wx/screen_dialog.cc:65
 msgid "Other"
 msgstr ""
@@ -842,7 +875,7 @@ msgstr "Hc"
 msgid "Red band"
 msgstr ""
 
-#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:284
+#: src/wx/content_menu.cc:54 src/wx/film_editor.cc:288
 #: src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Ta bort"
@@ -856,6 +889,10 @@ msgstr "Ta bort Cinema"
 msgid "Remove Screen"
 msgstr "Ta bort Skärm"
 
+#: src/wx/film_editor.cc:289
+msgid "Remove the selected piece of content from the film."
+msgstr ""
+
 #: src/wx/repeat_dialog.cc:26
 msgid "Repeat"
 msgstr "Upprepa"
@@ -969,7 +1006,7 @@ msgid "Smoothing"
 msgstr "Utjämning"
 
 # sammanhang?
-#: src/wx/timeline_dialog.cc:38
+#: src/wx/timeline_dialog.cc:39
 msgid "Snap"
 msgstr "Snap"
 
@@ -1002,7 +1039,7 @@ msgstr "Undertextspråk (ex. SV)"
 msgid "Subtitles"
 msgstr "Undertexter"
 
-#: src/wx/about_dialog.cc:165
+#: src/wx/about_dialog.cc:166
 msgid "Supported by"
 msgstr "Stöd från"
 
@@ -1027,7 +1064,7 @@ msgstr "Område (ex. SV)"
 msgid "Test version "
 msgstr "Testversion"
 
-#: src/wx/about_dialog.cc:210
+#: src/wx/about_dialog.cc:211
 #, fuzzy
 msgid "Tested by"
 msgstr "Översatt av"
@@ -1069,7 +1106,7 @@ msgstr "Tid"
 msgid "Timeline"
 msgstr "Tidslinje"
 
-#: src/wx/film_editor.cc:290
+#: src/wx/film_editor.cc:300
 msgid "Timeline..."
 msgstr "Tidslinje..."
 
@@ -1114,7 +1151,7 @@ msgstr "okänt"
 msgid "Until"
 msgstr "Tills"
 
-#: src/wx/film_editor.cc:286
+#: src/wx/film_editor.cc:292
 msgid "Up"
 msgstr "Upp"
 
@@ -1229,7 +1266,7 @@ msgstr ""
 msgid "audio"
 msgstr "audio"
 
-#: src/wx/audio_panel.cc:240
+#: src/wx/audio_panel.cc:275
 msgid "channels"
 msgstr "kanaler"
 
@@ -1263,6 +1300,9 @@ msgstr "tider"
 msgid "video"
 msgstr "video"
 
+#~ msgid "Add folder..."
+#~ msgstr "Lägg till folder..."
+
 #, fuzzy
 #~ msgid "Default creator"
 #~ msgstr "Förvald innehållstyp"
@@ -1338,9 +1378,6 @@ msgstr "video"
 #~ msgid "A/B"
 #~ msgstr "A/B"
 
-#~ msgid "Audio will be resampled from %dHz to %dHz\n"
-#~ msgstr "Audio kommer att samplas om från %dHz till %dHz\n"
-
 #~ msgid "Colour look-up table"
 #~ msgstr "Färguppslagningstabell"
 
diff --git a/src/wx/timeline.cc b/src/wx/timeline.cc
index eba12c47f..2e368e57d 100644
--- a/src/wx/timeline.cc
+++ b/src/wx/timeline.cc
@@ -647,7 +647,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 				Time const d = abs (cv->content()->end() - new_position);
 				if (first || d < nearest_distance) {
 					nearest_distance = d;
-					nearest_new_position = cv->content()->end();
+					nearest_new_position = cv->content()->end() + 1;
 				}
 			}
 			
@@ -656,7 +656,7 @@ Timeline::set_position_from_event (wxMouseEvent& ev)
 				Time const d = abs (cv->content()->position() - (new_position + _down_view->content()->length_after_trim()));
 				if (d < nearest_distance) {
 					nearest_distance = d;
-					nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim ();
+					nearest_new_position = cv->content()->position() - _down_view->content()->length_after_trim () - 1;
 				}
 			}
 			
diff --git a/src/wx/timeline_dialog.cc b/src/wx/timeline_dialog.cc
index dbf7ae232..bc3e8db99 100644
--- a/src/wx/timeline_dialog.cc
+++ b/src/wx/timeline_dialog.cc
@@ -30,6 +30,7 @@ using boost::shared_ptr;
 
 TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr<Film> film)
 	: wxDialog (ed, wxID_ANY, _("Timeline"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+	, _film (film)
 	, _timeline (this, ed, film)
 {
 	wxBoxSizer* sizer = new wxBoxSizer (wxVERTICAL);
@@ -37,6 +38,8 @@ TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr<Film> film)
 	wxBoxSizer* controls = new wxBoxSizer (wxHORIZONTAL);
 	_snap = new wxCheckBox (this, wxID_ANY, _("Snap"));
 	controls->Add (_snap);
+	_sequence_video = new wxCheckBox (this, wxID_ANY, _("Keep video in sequence"));
+	controls->Add (_sequence_video, 1, wxLEFT, 12);
 
 	sizer->Add (controls, 0, wxALL, 12);
 	sizer->Add (&_timeline, 1, wxEXPAND | wxALL, 12);
@@ -47,6 +50,10 @@ TimelineDialog::TimelineDialog (FilmEditor* ed, shared_ptr<Film> film)
 
 	_snap->SetValue (_timeline.snap ());
 	_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::snap_toggled, this));
+	film_changed (Film::SEQUENCE_VIDEO);
+	_snap->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&TimelineDialog::sequence_video_toggled, this));
+
+	film->Changed.connect (bind (&TimelineDialog::film_changed, this, _1));
 }
 
 void
@@ -54,3 +61,27 @@ TimelineDialog::snap_toggled ()
 {
 	_timeline.set_snap (_snap->GetValue ());
 }
+
+void
+TimelineDialog::sequence_video_toggled ()
+{
+	shared_ptr<Film> film = _film.lock ();
+	if (!film) {
+		return;
+	}
+		
+	film->set_sequence_video (_sequence_video->GetValue ());
+}
+
+void
+TimelineDialog::film_changed (Film::Property p)
+{
+	shared_ptr<Film> film = _film.lock ();
+	if (!film) {
+		return;
+	}
+
+	if (p == Film::SEQUENCE_VIDEO) {
+		_sequence_video->SetValue (film->sequence_video ());
+	}
+}
diff --git a/src/wx/timeline_dialog.h b/src/wx/timeline_dialog.h
index 1e5955003..19a7ffade 100644
--- a/src/wx/timeline_dialog.h
+++ b/src/wx/timeline_dialog.h
@@ -31,7 +31,11 @@ public:
 
 private:
 	void snap_toggled ();
+	void sequence_video_toggled ();
+	void film_changed (Film::Property);
 	
+	boost::weak_ptr<Film> _film;
 	Timeline _timeline;
 	wxCheckBox* _snap;
+	wxCheckBox* _sequence_video;
 };
diff --git a/wscript b/wscript
index 80948816e..1b72d7eba 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@ import distutils
 import distutils.spawn
 
 APPNAME = 'dcpomatic'
-VERSION = '1.76.3devel'
+VERSION = '1.76.6devel'
 
 def options(opt):
     opt.load('compiler_cxx')