pot/merge.

author: Carl Hetherington <cth@carlh.net> 2015-07-21 23:06:37 +0100
committer: Carl Hetherington <cth@carlh.net> 2015-07-21 23:06:37 +0100
commit: 40749e968c74845de25826c4a6cadc98801ac546 (patch)
tree: 4d12803e59ff994ba6c3284b7e2f36dc4b5bf393
parent: de5037c6ec1a33d17bd0a6029676f8fd39f55b41 (diff)
24 files changed, 990 insertions, 780 deletions
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index 075602c16..d65b097f6 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 15:29+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -147,7 +147,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:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Center"
 
@@ -270,15 +270,15 @@ msgstr "Zu verbindende Inhalte müssen die gleiche Untertitelspur verwenden."
 msgid "Content video is %1x%2"
 msgstr "Inhalt Video ist %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "DCP zu TMS übertragen"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "Keine Verbindung zu Server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Konnte entfernten Ordner %1 (%2) nicht erstellen."
 
@@ -302,7 +302,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "%1 konnte nicht geöffnet werden."
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "%1 konnte nicht zum Senden geöffnet werden"
 
@@ -314,11 +314,16 @@ msgstr "Heruntergeladene ZIP Datei kann nicht geöffnet werden."
 msgid "Could not read subtitles"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "SCP Session (%1) konnte nicht gestartet werden"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "SSH Session konnte nicht gestartet werden"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "Entfernte Datei (%1) konnte nicht gespeichert werden"
 
@@ -356,7 +361,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -414,14 +419,15 @@ msgstr ""
 msgid "Encoding image data"
 msgstr "Kodiere Bilddaten"
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Fehler (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Fehler (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Inhalt wird überprüft"
@@ -430,7 +436,7 @@ msgstr "Inhalt wird überprüft"
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Authentifizierung mit Server (%1) fehlgeschlagen"
 
@@ -482,7 +488,7 @@ msgstr "Gradient Glätter"
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -502,7 +508,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+#, fuzzy
+msgid "KDM delivery"
+msgstr "KDM Zustellung: $CPL_NAME"
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM Zustellung: $CPL_NAME"
 
@@ -518,19 +529,19 @@ msgstr ""
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "Surround links"
 
@@ -538,7 +549,7 @@ msgstr "Surround links"
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
@@ -678,19 +689,19 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Surround rechts"
 
@@ -711,7 +722,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "SSH Fehler (%1)"
 
@@ -863,11 +874,11 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr "VI"
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Warte..."
 
@@ -903,7 +914,7 @@ msgstr "Darf keine Schrägstriche enthalten"
 msgid "connect timed out"
 msgstr "Zeit für Verbindung abgelaufen"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "verbinde..."
 
@@ -915,7 +926,7 @@ msgstr "Containerformat"
 msgid "content type"
 msgstr "Inhaltsbeschreibung"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "kopiere %1"
 
@@ -959,11 +970,11 @@ msgstr "Sample-Rate konnte nicht gewandelt werden"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "Sample-Rate für %1 samples konnte nicht gewandelt werden (%2)(%3)"
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "SCP Session konnte nicht gestartet werden (%1)"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "SSH Session konnte nicht gestartet werden"
 
@@ -993,12 +1004,12 @@ msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr ""
 
@@ -1029,7 +1040,7 @@ msgid "remaining"
 msgstr "verbleibend"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 7e8440ae4..911dd66f0 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 15:44+0100\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -146,7 +146,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:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Centro"
 
@@ -267,15 +267,15 @@ msgstr "Para unir contenido debe tener el mismo tipo de subtítulos."
 msgid "Content video is %1x%2"
 msgstr "El video es %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "Copiar DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "No se pudo conectar al servidor %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "No se pudo crear la carpeta remota %1 (%2)"
 
@@ -299,7 +299,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "No se pudo abrir %1"
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "No se pudo abrir %1 para enviar"
 
@@ -311,11 +311,16 @@ msgstr "No se puedo abrir el fichero ZIP descargado"
 msgid "Could not read subtitles"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "No se pudo iniciar la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "no se pudo abrir la sesión SSH"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "No se pudo escribir el fichero remoto (%1)"
 
@@ -352,7 +357,7 @@ msgstr "DCP-o-matic ya no ofrece el filtro `%1', así que ha sido desactivado."
 msgid "De-interlacing"
 msgstr "Desentrelazado"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -410,14 +415,15 @@ msgstr ""
 msgid "Encoding image data"
 msgstr "Codificando imagen"
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Error (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr "Error en el fichero SubRip: encontrado %1 cuando se esperaba %2"
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Error (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Examinar contenido"
@@ -426,7 +432,7 @@ msgstr "Examinar contenido"
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Fallo al identificarse con el servidor (%1)"
 
@@ -478,7 +484,7 @@ msgstr "Gradient debander"
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -498,7 +504,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+#, fuzzy
+msgid "KDM delivery"
+msgstr "Envío de KDM: $CPL_NAME"
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envío de KDM: $CPL_NAME"
 
@@ -514,19 +525,19 @@ msgstr ""
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "Surround izquierda"
 
@@ -534,7 +545,7 @@ msgstr "Surround izquierda"
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
@@ -671,19 +682,19 @@ msgstr ""
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Surround derecha"
 
@@ -704,7 +715,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "error SSH (%1)"
 
@@ -859,11 +870,11 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr "Ciegos"
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Esperando"
 
@@ -899,7 +910,7 @@ msgstr "no puede contener barras"
 msgid "connect timed out"
 msgstr "tiempo de conexión agotado"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "conectando"
 
@@ -911,7 +922,7 @@ msgstr "continente"
 msgid "content type"
 msgstr "tipo de contenido"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "copiando %1"
 
@@ -955,11 +966,11 @@ msgstr "no se pudo ejecutar el conversor de velocidad"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "no se pudo ejecutar el conversor de velocidad"
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "no se pudo abrir la sesión SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "no se pudo abrir la sesión SSH"
 
@@ -989,12 +1000,12 @@ msgid "frames per second"
 msgstr "imágenes por segundo"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr ""
 
@@ -1025,7 +1036,7 @@ msgid "remaining"
 msgstr "pendiente"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index a2be73c19..3de424b08 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-14 14:45+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -146,7 +146,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:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Centre"
 
@@ -274,15 +274,15 @@ msgstr "Le contenu à ajouter doit avoir le même flux sous titre"
 msgid "Content video is %1x%2"
 msgstr "Le contenu vidéo est %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "Copier le DCP dans le TMS"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "Connexion au serveur %1 (%2) impossible"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Création du dossier distant %1 (%2) impossible"
 
@@ -306,7 +306,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "lecture du fichier %1 impossible"
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "Ouverture de %1 pour envoi impossible"
 
@@ -318,11 +318,16 @@ msgstr "Ouverture du fichier Zip téléchargé impossible"
 msgid "Could not read subtitles"
 msgstr "Ne peut lire les sous-titres"
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "Démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "démarrage de session SSH impossible"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "Écriture vers fichier distant (%1) impossible"
 
@@ -359,7 +364,7 @@ msgstr "DCP-o-matic ne gère plus le filtre `%1'. Celui-ci a été désactivé."
 msgid "De-interlacing"
 msgstr "Désentrelacement"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -417,15 +422,16 @@ msgstr "Envoi par mail du rapport de bug pour %1"
 msgid "Encoding image data"
 msgstr "encodage des données image"
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Erreur (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 "Erreur dans le fichier SubRip: lecture de %1 alors que %2 était attendu"
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Erreur (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Examen du contenu"
@@ -434,7 +440,7 @@ msgstr "Examen du contenu"
 msgid "FCC"
 msgstr "FCC"
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "L'authentification du serveur (%1) a échouée"
 
@@ -486,7 +492,7 @@ msgstr "Corrections des bandes par dégradé"
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -506,7 +512,12 @@ msgstr "IEC61966-2-4"
 msgid "It is not known what caused this error."
 msgstr "Erreur indéterminée."
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+#, fuzzy
+msgid "KDM delivery"
+msgstr "Envoi KDM: $CPL_NAME"
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envoi KDM: $CPL_NAME"
 
@@ -522,19 +533,19 @@ msgstr "L"
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "Arrière gauche"
 
@@ -542,7 +553,7 @@ msgstr "Arrière gauche"
 msgid "Lfe"
 msgstr "Lfe"
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -678,19 +689,19 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Arrière droite"
 
@@ -711,7 +722,7 @@ msgstr "SMPTE 170M (BT601-6)"
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "Erreur SSH (%1)"
 
@@ -862,11 +873,11 @@ msgstr "Longueur vidéo"
 msgid "Video size"
 msgstr "Taille vidéo"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "En cours"
 
@@ -902,7 +913,7 @@ msgstr "slash interdit"
 msgid "connect timed out"
 msgstr "temps de connexion expiré"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "connexion"
 
@@ -914,7 +925,7 @@ msgstr "conteneur"
 msgid "content type"
 msgstr "type de contenu"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "copie de %1"
 
@@ -960,11 +971,11 @@ msgstr ""
 "n'a pas pu convertir la fréquence d'échantillonnage pour %1 échantillons "
 "(%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "démarrage de session SCP (%1) impossible"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "démarrage de session SSH impossible"
 
@@ -994,12 +1005,12 @@ msgid "frames per second"
 msgstr "images par seconde"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr "h"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr "m"
 
@@ -1030,7 +1041,7 @@ msgid "remaining"
 msgstr "restant"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr "s"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 7bad7e28c..107227999 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 16:03+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -146,7 +146,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:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Centro"
 
@@ -266,15 +266,15 @@ msgstr ""
 msgid "Content video is %1x%2"
 msgstr "Il video originale è %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "Copia del DCP al TMS"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "Non posso connetermi al server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Non posso creare la directory remota %1 (%2)"
 
@@ -296,7 +296,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Non riesco ad aprire %1"
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "Non posso aprire %1 da inviare"
 
@@ -308,11 +308,16 @@ msgstr ""
 msgid "Could not read subtitles"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "Non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "non posso avviare la sessione SSH"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "Non posso scrivere il file remoto (%1)"
 
@@ -349,7 +354,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -405,14 +410,15 @@ msgstr ""
 msgid "Encoding image data"
 msgstr ""
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Errore (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Errore (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Esamino il contenuto"
@@ -421,7 +427,7 @@ msgstr "Esamino il contenuto"
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Autenticazione col server fallita (%1) "
 
@@ -473,7 +479,7 @@ msgstr "Gradiente debander"
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr ""
 
@@ -493,7 +499,11 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+msgid "KDM delivery"
+msgstr ""
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -509,19 +519,19 @@ msgstr ""
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 msgid "Left rear surround"
 msgstr ""
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "Surround sinistro"
 
@@ -529,7 +539,7 @@ msgstr "Surround sinistro"
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -665,19 +675,19 @@ msgstr ""
 msgid "Rec. 709"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 msgid "Right rear surround"
 msgstr ""
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Surround destro"
 
@@ -698,7 +708,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "Errore SSH (%1)"
 
@@ -854,11 +864,11 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Aspetta"
 
@@ -894,7 +904,7 @@ msgstr "non può contenere barre"
 msgid "connect timed out"
 msgstr "connessione scaduta"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "mi sto connettendo"
 
@@ -906,7 +916,7 @@ msgstr "contenitore"
 msgid "content type"
 msgstr "tipo di contenuto"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "copia %1"
 
@@ -950,11 +960,11 @@ msgstr "non riesco a eseguire il convertitore della frequenza di campionamento"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "non posso avviare la sessione SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "non posso avviare la sessione SSH"
 
@@ -984,12 +994,12 @@ msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr ""
 
@@ -1020,7 +1030,7 @@ msgid "remaining"
 msgstr "restano"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index 89b898139..b8822ef05 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 16:07+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
@@ -147,7 +147,7 @@ msgstr "Afgebroken"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Fout met pixel formaat %1 tijdens %2"
 
-#: src/lib/util.cc:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Midden"
 
@@ -265,15 +265,15 @@ msgstr "Toegevoegde bestanden moeten dezelfde ondertitel stream gebruiken."
 msgid "Content video is %1x%2"
 msgstr "Content video is %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "Kopieer DCP to TMS"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kan niet verbinden met server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kan geen remote map maken %1 (%2)"
 
@@ -295,7 +295,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Kan niet openen %1"
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "Kan niet openen %1 om te verzenden"
 
@@ -307,11 +307,16 @@ msgstr "Kan gedownloade ZIP bestand niet openen"
 msgid "Could not read subtitles"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "Kan SCP sessie niet starten (%1)"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "kan SSH sessie niet starten"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "Kan niet schrijven naar bestand op FTP server"
 
@@ -350,7 +355,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -407,14 +412,15 @@ msgstr ""
 msgid "Encoding image data"
 msgstr "Encoding bestandsdata"
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Fout (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Fout (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Controleer content"
@@ -423,7 +429,7 @@ msgstr "Controleer content"
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Inlog fout met server (%1)"
 
@@ -475,7 +481,7 @@ msgstr "Gradient debander"
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -495,7 +501,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+#, fuzzy
+msgid "KDM delivery"
+msgstr "KDM levering: $CPL_NAME"
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM levering: $CPL_NAME"
 
@@ -511,19 +522,19 @@ msgstr ""
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "links surround"
 
@@ -531,7 +542,7 @@ msgstr "links surround"
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -671,19 +682,19 @@ msgstr ""
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Rechts surround"
 
@@ -704,7 +715,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "SSH fout (%1)"
 
@@ -855,11 +866,11 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Wachten"
 
@@ -895,7 +906,7 @@ msgstr "er mag geen '\" gebruikt worden"
 msgid "connect timed out"
 msgstr "verbinding timeout"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "verbinden"
 
@@ -907,7 +918,7 @@ msgstr "container"
 msgid "content type"
 msgstr "content type"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "kopieeren %1"
 
@@ -951,11 +962,11 @@ msgstr "kan sample-rate converter niet starten"
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr "kan sample-rate converter niet starten gedurende %1 samples (%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "kan SCP sessie niet starten (%1)"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "kan SSH sessie niet starten"
 
@@ -985,12 +996,12 @@ msgid "frames per second"
 msgstr "frames per seconde"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr ""
 
@@ -1021,7 +1032,7 @@ msgid "remaining"
 msgstr "resterend"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 714793177..712e2f3cf 100644
--- a/src/lib/po/pl_PL.po
+++ b/src/lib/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-06-11 19:19+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -148,7 +148,7 @@ msgstr "Anulowane"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Nie można było obsłużyć formatu %1 kiedy %2"
 
-#: src/lib/util.cc:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Środek"
 
@@ -266,15 +266,15 @@ msgstr "Łączone pliki muszą używać tego samego strumienia napisów."
 msgid "Content video is %1x%2"
 msgstr "Rozdzielczość materiału to %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "Kopiuj DCP do TMS"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "Nie można połączyć z serwerem %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Nie można utworzyć folderu zdalnego %1 (%2)"
 
@@ -298,7 +298,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Nie udało się otworzyć %1"
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "Nie udało się otworzyć %1 do wysłania"
 
@@ -310,11 +310,16 @@ msgstr "Nie udało się otworzyć pobranego archiwum ZIP"
 msgid "Could not read subtitles"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "Nie udało się rozpocząć sesji SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "nie udało się uruchomić sesji SSH"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "Nie udało się zapisać do pliku zdalnego (%1)"
 
@@ -351,7 +356,7 @@ msgstr "DCP-o-matic nie używa już filtru `%1', więc został on wyłączony."
 msgid "De-interlacing"
 msgstr "Usuwanie przeplotu"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -409,14 +414,15 @@ msgstr ""
 msgid "Encoding image data"
 msgstr "Kodowanie obrazu"
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Błąd (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Błąd (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Sprawdzanie materiału"
@@ -425,7 +431,7 @@ msgstr "Sprawdzanie materiału"
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Błąd uwierzytelniania na serwerze (%1)"
 
@@ -477,7 +483,7 @@ msgstr "Zachowaj przejścia tonalne"
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr "Dla niesłyszących"
 
@@ -497,7 +503,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+#, fuzzy
+msgid "KDM delivery"
+msgstr "Wysyłka klucza: $CPL_NAME"
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Wysyłka klucza: $CPL_NAME"
 
@@ -513,19 +524,19 @@ msgstr ""
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Lewy"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr "Lewy centralny"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 msgid "Left rear surround"
 msgstr "Lewy tylny surround"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "Lewy surround"
 
@@ -533,7 +544,7 @@ msgstr "Lewy surround"
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "Lfe (subwoofer)"
 
@@ -669,19 +680,19 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Prawy"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr "Prawy centralny"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 msgid "Right rear surround"
 msgstr "Prawy centralny surround"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Prawy surround"
 
@@ -702,7 +713,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "Błąd SSH (%1)"
 
@@ -853,11 +864,11 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr "Dla niedowidzących"
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Czekam"
 
@@ -893,7 +904,7 @@ msgstr "nie może zawierać ukośników"
 msgid "connect timed out"
 msgstr "minął czas połączenia"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "łączenie"
 
@@ -905,7 +916,7 @@ msgstr "kontener"
 msgid "content type"
 msgstr "typ kontentu"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "kopiowanie %1"
 
@@ -951,11 +962,11 @@ msgstr ""
 "nie udało się uruchomić konwertera częstotliwości próbkowania dla %1 próbek "
 "(%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "nie udało się uruchomić sesji SCP (%1)"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "nie udało się uruchomić sesji SSH"
 
@@ -985,12 +996,12 @@ msgid "frames per second"
 msgstr "klatek na sekundę"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr ""
 
@@ -1021,7 +1032,7 @@ msgid "remaining"
 msgstr "pozostało"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 4ccd7f377..5b709a082 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-16 10:37-0400\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Russian\n"
@@ -144,7 +144,7 @@ msgstr "Отменено"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Невозможно обработать формат пикселя %1 во время %2"
 
-#: src/lib/util.cc:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Центральный"
 
@@ -278,15 +278,15 @@ msgstr "Для присоединения контента необходимо
 msgid "Content video is %1x%2"
 msgstr "Разрешение контента: %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "Копировать DCP на TMS (Theater Management System)"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "Не удалось подключиться к серверу %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Не удалось создать удалённый каталог %1 (%2)"
 
@@ -310,7 +310,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Не удалось открыть %1"
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "Не удалось открыть %1 для отправки"
 
@@ -322,11 +322,16 @@ msgstr "Не удалось открыть загруженный ZIP-архив
 msgid "Could not read subtitles"
 msgstr "Не удалось прочитать субтитры"
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "Не удалось запустить SCP-сессию (%1)"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "не удалось запустить SSH-сессию"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "Не удалось записать в удаленный файл (%1)"
 
@@ -364,7 +369,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "Деинтерлейсинг"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -422,14 +427,15 @@ msgstr "Ошибка отправки ключей %1 по Email"
 msgid "Encoding image data"
 msgstr "Кодирование данных изображения"
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Ошибка (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr "Ошибка в SubRip-файле: найдено %1, в то время как ожидается %2"
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Ошибка (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Проверка контента"
@@ -438,7 +444,7 @@ msgstr "Проверка контента"
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Ошибка аутентификации сервером (%1)"
 
@@ -491,7 +497,7 @@ msgstr "Разбиение градиента"
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr "Для слабослышащих"
 
@@ -511,7 +517,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr "Неизвестно, что вызвало эту ошибку."
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+#, fuzzy
+msgid "KDM delivery"
+msgstr "Назначение KDM: $CPL_NAME"
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Назначение KDM: $CPL_NAME"
 
@@ -527,19 +538,19 @@ msgstr "L"
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Левый"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr "Левый центральный"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 msgid "Left rear surround"
 msgstr "Левый тыловой surround"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "Левый surround"
 
@@ -547,7 +558,7 @@ msgstr "Левый surround"
 msgid "Lfe"
 msgstr "НЧ"
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "НЧ (sub)"
 
@@ -683,19 +694,19 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Правый"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr "Правый центральный"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 msgid "Right rear surround"
 msgstr "Правый тыловой surround"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Правый surround"
 
@@ -716,7 +727,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "Ошибка SSH (%1)"
 
@@ -871,11 +882,11 @@ msgstr "Расчет длительности"
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr "Для слабовидящих"
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Ожидание"
 
@@ -911,7 +922,7 @@ msgstr "не может содержать разрезы"
 msgid "connect timed out"
 msgstr "таймаут соединения"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "соединение"
 
@@ -923,7 +934,7 @@ msgstr "контейнер"
 msgid "content type"
 msgstr "тип контента"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "копирование %1"
 
@@ -968,11 +979,11 @@ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr ""
 "не удалось запустить конвертер частоты дискретизации для %1 сэмплов (%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "не удалось запустить SCP-сессию (%1)"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "не удалось запустить SSH-сессию"
 
@@ -1002,12 +1013,12 @@ msgid "frames per second"
 msgstr ""
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr "ч"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr "м"
 
@@ -1038,7 +1049,7 @@ msgid "remaining"
 msgstr "осталось"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr "с"
 
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index 83b6c6afc..e90c26e6a 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -149,7 +149,7 @@ msgstr "Avbruten"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "Kan inte hantera pixelformat %1 under %2"
 
-#: src/lib/util.cc:474
+#: src/lib/util.cc:477
 msgid "Centre"
 msgstr "Center"
 
@@ -279,15 +279,15 @@ msgstr "Innehåll som ska sammanfogas måste använda samma undertextström."
 msgid "Content video is %1x%2"
 msgstr "Original-videon är %1x%2"
 
-#: src/lib/scp_dcp_job.cc:111
+#: src/lib/upload_job.cc:52
 msgid "Copy DCP to TMS"
 msgstr "Kopiera DCP till TMS"
 
-#: src/lib/scp_dcp_job.cc:136
+#: src/lib/scp_uploader.cc:50
 msgid "Could not connect to server %1 (%2)"
 msgstr "Kunde inte ansluta till server %1 (%2)"
 
-#: src/lib/scp_dcp_job.cc:158
+#: src/lib/scp_uploader.cc:86
 msgid "Could not create remote directory %1 (%2)"
 msgstr "Kunde inte skapa fjärrkatalog %1 (%2)"
 
@@ -311,7 +311,7 @@ msgstr ""
 msgid "Could not open %1"
 msgstr "Kunde inte öppna %1"
 
-#: src/lib/scp_dcp_job.cc:183
+#: src/lib/curl_uploader.cc:83 src/lib/scp_uploader.cc:98
 msgid "Could not open %1 to send"
 msgstr "Kunde inte öppna %1 för att skicka"
 
@@ -325,11 +325,16 @@ msgstr "kunde inte öppna fil %1"
 msgid "Could not read subtitles"
 msgstr "kunde inte hitta undertext-avkodare"
 
-#: src/lib/scp_dcp_job.cc:153
+#: src/lib/scp_uploader.cc:70
 msgid "Could not start SCP session (%1)"
 msgstr "Kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:197
+#: src/lib/curl_uploader.cc:47
+#, fuzzy
+msgid "Could not start transfer"
+msgstr "kunde inte starta SSH-session"
+
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:115
 msgid "Could not write to remote file (%1)"
 msgstr "Kunde inte skriva till fjärrfil (%1)"
 
@@ -367,7 +372,7 @@ msgid "De-interlacing"
 msgstr "Avflätning"
 
 # svåröversatt
-#: src/lib/config.cc:422
+#: src/lib/config.cc:438
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -422,14 +427,15 @@ msgstr ""
 msgid "Encoding image data"
 msgstr "Kodar bild-data"
 
-#: src/lib/job.cc:333
-msgid "Error (%1)"
-msgstr "Fel (%1)"
-
 #: src/lib/exceptions.cc:66
 msgid "Error in SubRip file: saw %1 while expecting %2"
 msgstr ""
 
+#: src/lib/job.cc:333
+#, fuzzy
+msgid "Error: %1"
+msgstr "Fel (%1)"
+
 #: src/lib/examine_content_job.cc:46
 msgid "Examine content"
 msgstr "Undersök innehållet"
@@ -438,7 +444,7 @@ msgstr "Undersök innehållet"
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:146
+#: src/lib/scp_uploader.cc:60
 msgid "Failed to authenticate with server (%1)"
 msgstr "Misslyckades att autentisera med server (%1)"
 
@@ -490,7 +496,7 @@ msgstr "Gradientutjämnare"
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:481
 msgid "Hearing impaired"
 msgstr ""
 
@@ -510,7 +516,11 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:89
+msgid "KDM delivery"
+msgstr ""
+
+#: src/lib/config.cc:214
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -526,20 +536,20 @@ msgstr ""
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:472
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:483
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:485
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:479
 msgid "Left surround"
 msgstr "Vänster surround"
 
@@ -547,7 +557,7 @@ msgstr "Vänster surround"
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:478
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -688,20 +698,20 @@ msgstr "Rec. 709"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:473
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:484
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:486
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:480
 msgid "Right surround"
 msgstr "Höger surround"
 
@@ -722,7 +732,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:141
+#: src/lib/scp_uploader.cc:55
 msgid "SSH error (%1)"
 msgstr "SSH fel (%1)"
 
@@ -878,11 +888,11 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:482
 msgid "Visually impaired"
 msgstr ""
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Väntar"
 
@@ -920,7 +930,7 @@ msgstr "får inte innehålla snedstreck"
 msgid "connect timed out"
 msgstr "uppkopplingen tajmade ur"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "kopplar upp"
 
@@ -932,7 +942,7 @@ msgstr "behållare"
 msgid "content type"
 msgstr "innehållstyp"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "kopierar %1"
 
@@ -979,11 +989,11 @@ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr ""
 "kunde inte köra sampelhastighetskonverteraren under %1 sampel (%2) (%3)"
 
-#: src/lib/scp_dcp_job.cc:88
+#: src/lib/scp_uploader.cc:65
 msgid "could not start SCP session (%1)"
 msgstr "kunde inte starta SCP-session (%1)"
 
-#: src/lib/scp_dcp_job.cc:54
+#: src/lib/scp_uploader.cc:40
 msgid "could not start SSH session"
 msgstr "kunde inte starta SSH-session"
 
@@ -1013,12 +1023,12 @@ msgid "frames per second"
 msgstr "bilder per sekund"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:139 src/lib/util.cc:142
+#: src/lib/util.cc:140 src/lib/util.cc:143
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:154 src/lib/util.cc:157
+#: src/lib/util.cc:155 src/lib/util.cc:158
 msgid "m"
 msgstr ""
 
@@ -1050,7 +1060,7 @@ msgid "remaining"
 msgstr "återstående tid"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:168
+#: src/lib/util.cc:169
 msgid "s"
 msgstr ""
 
diff --git a/src/tools/po/de_DE.po b/src/tools/po/de_DE.po
index 743b5d4be..eb33c852a 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 15:31+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/tools/po/es_ES.po b/src/tools/po/es_ES.po
index bec34c871..70e5eb7c6 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 15:44+0100\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 388a553b7..2387347ec 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-14 14:46+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/it_IT.po b/src/tools/po/it_IT.po
index 43e45e31d..70b4eda8b 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 16:05+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
diff --git a/src/tools/po/nl_NL.po b/src/tools/po/nl_NL.po
index 86451992a..664a7f22d 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 16:08+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <Tkooijmans@universaldv.nl>\n"
diff --git a/src/tools/po/pl_PL.po b/src/tools/po/pl_PL.po
index d0103c9be..52b313c89 100644
--- a/src/tools/po/pl_PL.po
+++ b/src/tools/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-05-19 14:51+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
diff --git a/src/tools/po/ru_RU.po b/src/tools/po/ru_RU.po
index 403c2badd..ed658c935 100644
--- a/src/tools/po/ru_RU.po
+++ b/src/tools/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-16 05:12-0400\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Russian\n"
diff --git a/src/tools/po/sv_SE.po b/src/tools/po/sv_SE.po
index 4de318e62..9f335f19c 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index f3772e2f5..058994694 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 15:36+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,7 +146,7 @@ msgid "Add video, image or sound files to the film."
 msgstr ""
 "Einzelne oder mehrere Video-, Bild-, Ton- oder Untertiteldateien hinzufügen."
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Hinzufügen..."
 
@@ -182,7 +182,7 @@ msgstr ""
 "bitte, das Container-Format in den DCP-Einstellungen auf 'Scope' (2.39:1) zu "
 "ändern."
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 msgid "Allow any DCP frame rate"
 msgstr "Auch Nicht-Standard-Bildraten erlauben (Vorsicht!)"
 
@@ -214,7 +214,7 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 msgid "BCC address"
 msgstr "BCC: Adresse"
 
@@ -238,7 +238,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Aber ich nutze gegenwärtig Faderstellung"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 msgid "CC address"
 msgstr "CC: Adresse"
 
@@ -262,23 +262,15 @@ msgstr "Berechne..."
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 msgid "Certificate"
 msgstr "Zertifikat"
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr ""
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Zertifikat heruntergeladen"
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr "Kinokette"
@@ -324,7 +316,7 @@ msgstr "Kino"
 msgid "Colour conversion"
 msgstr "Farbumwandlung"
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr "Timing"
 
@@ -377,13 +369,13 @@ msgstr ""
 msgid "Could not get video for view (%s)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Konnte die Zertifikatsdatei (%s) nicht lesen."
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr ""
@@ -420,14 +412,18 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr ""
 
+#: src/wx/config_dialog.cc:640
+msgid "Decrypting DCPs"
+msgstr ""
+
 #: src/wx/config_dialog.cc:343
 msgid "Default ISDCF name details"
 msgstr "Standard ISDCF Name Details"
@@ -538,14 +534,18 @@ msgstr "Verschlüsselt (->für KDM Erstellung)"
 msgid "End"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr "Fehler"
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Hersteller (z.B. DXL)"
@@ -610,7 +610,7 @@ msgstr ""
 msgid "From"
 msgstr "Von"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 msgid "From address"
 msgstr "Absenderadresse"
 
@@ -635,7 +635,7 @@ msgstr "Fader Rechner"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Abschwächung des Kanals %d im DCP Kanal %d"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr "Allgemein"
 
@@ -663,7 +663,7 @@ msgstr "Ich möchte bei dieser Faderstellung spielen"
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "IP Adresse"
 
@@ -687,7 +687,7 @@ msgstr "Eingangs-Gamma Korrektur"
 msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr ""
 
@@ -707,7 +707,7 @@ msgstr "JPEG2000 Datenrate"
 msgid "Join"
 msgstr "Verbinden"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -735,7 +735,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr ""
 
@@ -743,6 +743,10 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 msgid "Left"
 msgstr ""
@@ -755,16 +759,16 @@ msgstr "Linearisiere Eingangs Gamma für niedrige Helligkeitswerte"
 msgid "Load from file..."
 msgstr "Lade aus Datei..."
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 msgid "Load..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr "Log"
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr ""
 
@@ -772,11 +776,11 @@ msgstr ""
 msgid "MISSING: "
 msgstr "FEHLT:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 msgid "Mail password"
 msgstr "Mail Passwort"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 msgid "Mail user name"
 msgstr "Mail/SMTP Server Benutzername/Login"
 
@@ -797,11 +801,11 @@ msgstr "Zielhelligkeit (z.B. '4fL' für 3D)"
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximale JPEG2000 Datenrate (Vorsicht!)"
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -857,7 +861,7 @@ msgstr "Kein"
 msgid "Off"
 msgstr "Aus"
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr ""
 
@@ -877,7 +881,7 @@ msgstr ""
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Ausgehender/SMTP Mail Server"
 
@@ -893,7 +897,7 @@ msgstr "Ausgabe"
 msgid "Package Type (e.g. OV)"
 msgstr "DCP Paket Typ (z.B. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 msgid "Password"
 msgstr "Passwort"
 
@@ -936,12 +940,8 @@ msgstr "Startposition"
 msgid "Pre-release"
 msgstr "Vorabversion"
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr ""
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:684
@@ -952,6 +952,10 @@ msgstr ""
 msgid "Properties..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 msgid "RGB to XYZ conversion"
 msgstr ""
@@ -972,8 +976,8 @@ msgstr "Freigabe (z.B. FSK12)"
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
+#: src/wx/config_dialog.cc:635
+msgid "Re-make certificates and key..."
 msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:98
@@ -992,7 +996,7 @@ msgstr "Red band (USA, für explizite Inhalte)"
 msgid "Red chromaticity"
 msgstr ""
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Entfernen"
@@ -1025,7 +1029,7 @@ msgstr "Wiederhole..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr "Auf Standardtext zurücksetzen"
 
@@ -1045,7 +1049,7 @@ msgstr ""
 msgid "Right click to change gain."
 msgstr "Rechtsklick für Pegeländerung"
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr ""
 
@@ -1053,6 +1057,10 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr "SMPTE"
@@ -1069,8 +1077,8 @@ msgstr "Saal"
 msgid "Select CPL XML file"
 msgstr "CPL XML Datei auswählen"
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Zertifikat Datei auswählen"
 
@@ -1078,7 +1086,7 @@ msgstr "Zertifikat Datei auswählen"
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 msgid "Select Key File"
 msgstr ""
 
@@ -1135,6 +1143,10 @@ msgstr "Ton anzeigen..."
 msgid "Signed"
 msgstr "Signiert"
 
+#: src/wx/config_dialog.cc:578
+msgid "Signing DCPs and KDMs"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Glätten"
@@ -1163,7 +1175,7 @@ msgstr "Spur"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (z.B. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr ""
 
@@ -1183,11 +1195,11 @@ msgstr "Untertitel"
 msgid "Supported by"
 msgstr "Unterstützt durch"
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 msgid "Target path"
 msgstr "Zielpfad"
 
@@ -1237,7 +1249,7 @@ msgstr "Threads"
 msgid "Threads to use for encoding on this host"
 msgstr "Auf diesem Rechner zu benutzende CPU-Threads"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr ""
 
@@ -1281,7 +1293,7 @@ msgstr "Schnitt vom Anfang"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Typ"
@@ -1326,7 +1338,7 @@ msgstr "Preset benutzen"
 msgid "Use subtitles"
 msgstr ""
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Benutzer Name"
 
@@ -1342,7 +1354,7 @@ msgstr "Bildwiederholrate"
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr "Warnungen"
 
@@ -1471,7 +1483,7 @@ msgstr ""
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr ""
 
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 76f3b7fc0..094cf9f58 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 15:47+0100\n"
 "Last-Translator: Manuel AC <manuel.acevedo@civantos.>\n"
 "Language-Team: Manuel AC <manuel.acevedo@civantos.com>\n"
@@ -137,7 +137,7 @@ msgstr ""
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Añadir..."
 
@@ -169,7 +169,7 @@ msgstr ""
 "Scope (2.39:1). Puede que prefieras seleccionar el contenedor DCP en Scope "
 "(2.39:1) en la pestaña \"DCP\"."
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 msgid "Allow any DCP frame rate"
 msgstr "Permitir cualquier velocidad de DCP"
 
@@ -198,7 +198,7 @@ msgstr "El audio del canal %d pasará al canal %d del DCP con ganancia %.1fdB."
 msgid "B"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 msgid "BCC address"
 msgstr "Dirección CCO"
 
@@ -222,7 +222,7 @@ msgstr "Grabar subtítulos en la imagen"
 msgid "But I have to use fader"
 msgstr "pero tengo que usar el fader a"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 msgid "CC address"
 msgstr "Dirección CC"
 
@@ -246,23 +246,15 @@ msgstr "Calcular..."
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 msgid "Certificate"
 msgstr "Certificado"
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr "Cadena de certificados para firmar DCPs y KDMs:"
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Certificado descargado"
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr "Certificado para desencriptar DCPs"
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr "Cadena"
@@ -308,7 +300,7 @@ msgstr "Cine"
 msgid "Colour conversion"
 msgstr "Conversión de color"
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr "Configuración|Tiempo"
 
@@ -361,13 +353,13 @@ msgstr ""
 msgid "Could not get video for view (%s)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "No se pudo leer el fichero de certificado (%s)"
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr "No se pudo leer el fichero de llave (%s)"
@@ -404,14 +396,19 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr ""
 
+#: src/wx/config_dialog.cc:640
+#, fuzzy
+msgid "Decrypting DCPs"
+msgstr "Certificado para desencriptar DCPs"
+
 #: src/wx/config_dialog.cc:343
 msgid "Default ISDCF name details"
 msgstr "Detalles por defecto del nombre ISDCF"
@@ -522,14 +519,18 @@ msgstr "Encriptado"
 msgid "End"
 msgstr "Fin"
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr "Errores"
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr "Exportar el certificado de desencriptación de DCP..."
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Compañía (ej. DLA)"
@@ -592,7 +593,7 @@ msgstr ""
 msgid "From"
 msgstr "De"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 msgid "From address"
 msgstr "De la dirección"
 
@@ -617,7 +618,7 @@ msgstr "Calculadora de ganancia"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Ganancia del canal %d en el canal %d del DCP"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr "General"
 
@@ -645,7 +646,7 @@ msgstr "Quiero reproducir con el fader a"
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "Dirección IP"
 
@@ -669,7 +670,7 @@ msgstr ""
 msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr "Intermedio"
 
@@ -689,7 +690,7 @@ msgstr "Ancho de banda JPEG2000"
 msgid "Join"
 msgstr "Unir"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr "Email KDM"
 
@@ -717,7 +718,7 @@ msgstr "Llaves"
 msgid "Language"
 msgstr ""
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr "Hoja"
 
@@ -725,6 +726,10 @@ msgstr "Hoja"
 msgid "Leaf common name"
 msgstr "Nombre común de hoja"
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 msgid "Left"
 msgstr ""
@@ -737,16 +742,16 @@ msgstr "Hacer lineal la curva de gamma de entrada para valores bajos"
 msgid "Load from file..."
 msgstr "Cargar de fichero..."
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 msgid "Load..."
 msgstr "Cargar..."
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr "Registro"
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr "Registro:"
 
@@ -754,11 +759,11 @@ msgstr "Registro:"
 msgid "MISSING: "
 msgstr "FALTA:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 msgid "Mail password"
 msgstr "Clave del correo"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 msgid "Mail user name"
 msgstr "Usuario del correo"
 
@@ -778,11 +783,11 @@ msgstr "Luminosidad de referencia (p.e. 14fl)"
 msgid "Matrix"
 msgstr "Matriz"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Ancho de banda JPEG2000 máximo"
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -838,7 +843,7 @@ msgstr "Ninguno"
 msgid "Off"
 msgstr "Off"
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr "Abrir la ventana de la consola"
 
@@ -858,7 +863,7 @@ msgstr "Unidad organizativa"
 msgid "Other"
 msgstr "Otros"
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Servidor de salida de correo"
 
@@ -874,7 +879,7 @@ msgstr "Salida"
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo de paquete (ej. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 msgid "Password"
 msgstr "Clave"
 
@@ -917,13 +922,9 @@ msgstr "Posición"
 msgid "Pre-release"
 msgstr "Prelanzamiento"
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr "Llave privada para desencriptar DCPs"
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
-msgstr "Llave privada para certificado hoja"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
+msgstr ""
 
 #: src/wx/dcp_panel.cc:684
 msgid "Processor"
@@ -933,6 +934,10 @@ msgstr ""
 msgid "Properties..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 msgid "RGB to XYZ conversion"
 msgstr ""
@@ -953,8 +958,9 @@ msgstr "Clasificación (ej. 16)"
 msgid "Re-examine..."
 msgstr "Reexaminar..."
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
+#: src/wx/config_dialog.cc:635
+#, fuzzy
+msgid "Re-make certificates and key..."
 msgstr "Recrear certificados..."
 
 #: src/wx/colour_conversion_editor.cc:98
@@ -973,7 +979,7 @@ msgstr "Banda roja"
 msgid "Red chromaticity"
 msgstr ""
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Quitar"
@@ -1006,7 +1012,7 @@ msgstr "Repetir..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr "Restablecer el texto par defecto"
 
@@ -1026,7 +1032,7 @@ msgstr ""
 msgid "Right click to change gain."
 msgstr "Click derecho para cambiar la ganancia."
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr "Raiz"
 
@@ -1034,6 +1040,10 @@ msgstr "Raiz"
 msgid "Root common name"
 msgstr "Nombre común raiz"
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr "SMPTE"
@@ -1050,8 +1060,8 @@ msgstr "Pantallas"
 msgid "Select CPL XML file"
 msgstr "Seleccionar XML del CPL"
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Seleccionar fichero de certificado"
 
@@ -1059,7 +1069,7 @@ msgstr "Seleccionar fichero de certificado"
 msgid "Select KDM"
 msgstr "Seleccionar KDM"
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 msgid "Select Key File"
 msgstr "Seleccionar fichero de llave"
 
@@ -1115,6 +1125,11 @@ msgstr ""
 msgid "Signed"
 msgstr "Firmado"
 
+#: src/wx/config_dialog.cc:578
+#, fuzzy
+msgid "Signing DCPs and KDMs"
+msgstr "Cadena de certificados para firmar DCPs y KDMs:"
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Suavizado"
@@ -1143,7 +1158,7 @@ msgstr "Flujo"
 msgid "Studio (e.g. TCF)"
 msgstr "Estudio (ej. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr "Asunto"
 
@@ -1163,11 +1178,11 @@ msgstr "Subtítulos"
 msgid "Supported by"
 msgstr "Soportado por"
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 msgid "Target path"
 msgstr "Ruta"
 
@@ -1216,7 +1231,7 @@ msgstr "Hilos"
 msgid "Threads to use for encoding on this host"
 msgstr "Hilos a utilizar para la codificación en esta máquina"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr "Huella dactilar"
 
@@ -1260,7 +1275,7 @@ msgstr "Recortar del inicio"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Tipo"
@@ -1305,7 +1320,7 @@ msgstr "Usar por defecto"
 msgid "Use subtitles"
 msgstr "Usar subtítulos"
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Nombre de usuario"
 
@@ -1321,7 +1336,7 @@ msgstr "Velocidad de imagen"
 msgid "View..."
 msgstr "Ver..."
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr "Alertas"
 
@@ -1450,7 +1465,7 @@ msgstr ""
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr ""
 
@@ -1487,6 +1502,12 @@ msgstr ""
 msgid "y"
 msgstr ""
 
+#~ msgid "Private key for decrypting DCPs"
+#~ msgstr "Llave privada para desencriptar DCPs"
+
+#~ msgid "Private key for leaf certificate"
+#~ msgstr "Llave privada para certificado hoja"
+
 #~ msgid "(password will be stored on disk in plaintext)"
 #~ msgstr "(claves guardadas como texto plano en el disco)"
 
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 9b3db0a8e..f9222bc13 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-14 15:10+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -146,7 +146,7 @@ msgstr "Ajout séquence images"
 msgid "Add video, image or sound files to the film."
 msgstr "Ajout fichiers vidéo, image ou son au projet."
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Ajouter..."
 
@@ -178,7 +178,7 @@ msgstr ""
 "dessus et en dessous de votre contenu pour remplir le container. Mieux "
 "vaudrait régler le format du DCP sur Scope (2:39:1) dans l'onglet \"DCP\" ."
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 msgid "Allow any DCP frame rate"
 msgstr "Autoriser toutes cadences"
 
@@ -210,7 +210,7 @@ msgstr ""
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 msgid "BCC address"
 msgstr "Adresse BCC"
 
@@ -234,7 +234,7 @@ msgstr "Graver les sous-titres dans l'image"
 msgid "But I have to use fader"
 msgstr "Mais je dois mixer"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 msgid "CC address"
 msgstr "Adresse CC"
 
@@ -258,23 +258,15 @@ msgstr "Calcul..."
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 msgid "Certificate"
 msgstr "Certificat"
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr "Certificats pour signature des DCPs et KDMs:"
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Certificat téléchargé"
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr "Certificats pour décrypter les DCPs"
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr "Chaîne"
@@ -320,7 +312,7 @@ msgstr "Cinéma"
 msgid "Colour conversion"
 msgstr "Espace Couleurs"
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr "Temps"
 
@@ -373,13 +365,13 @@ msgstr "Aucune image dans ce dossier"
 msgid "Could not get video for view (%s)"
 msgstr "aucune vidéo à afficher (%s)"
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Lecture du ficher de certificat (%s) impossible"
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr "Aucun fichier clé à lire (%s)"
@@ -416,14 +408,19 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr "Son DCP-o-matic"
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr "Debug: decode"
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr "Debug: encode"
 
+#: src/wx/config_dialog.cc:640
+#, fuzzy
+msgid "Decrypting DCPs"
+msgstr "Certificats pour décrypter les DCPs"
+
 #: src/wx/config_dialog.cc:343
 msgid "Default ISDCF name details"
 msgstr "Nom ISDCF par défaut"
@@ -534,14 +531,18 @@ msgstr "Crypté"
 msgid "End"
 msgstr "Fin"
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr "Erreurs"
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr "Export du certificat de décryptage du DCP..."
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Laboratoire (ex. DLA)"
@@ -604,7 +605,7 @@ msgstr "Création de DCP, libre et open-source, depuis presque tout."
 msgid "From"
 msgstr "À partir du"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 msgid "From address"
 msgstr "Adresse source"
 
@@ -629,7 +630,7 @@ msgstr "Calculateur de gain"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Gain pour le canal audio %d dans le canal du DCP %d"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr "Général"
 
@@ -657,7 +658,7 @@ msgstr "Je veux lire avec une table de mixage"
 msgid "ID"
 msgstr "ID"
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "Adresse IP"
 
@@ -681,7 +682,7 @@ msgstr "Correction gamma d'entrée"
 msgid "Input power"
 msgstr "puissance d'entrée"
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr "Intermédiaire"
 
@@ -701,7 +702,7 @@ msgstr "Qualité JPEG2000"
 msgid "Join"
 msgstr "Ajouter"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr "e-mail KDM"
 
@@ -729,7 +730,7 @@ msgstr "Clés"
 msgid "Language"
 msgstr "Langue"
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr "Page"
 
@@ -737,6 +738,10 @@ msgstr "Page"
 msgid "Leaf common name"
 msgstr "Nom commun de page"
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 msgid "Left"
 msgstr "Gauche"
@@ -749,16 +754,16 @@ msgstr "Linéariser la courbe d'entrée gamma pour les bas niveaux"
 msgid "Load from file..."
 msgstr "Chargement depuis fichier..."
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 msgid "Load..."
 msgstr "Charger..."
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr "Rapport"
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr "Rapport:"
 
@@ -766,11 +771,11 @@ msgstr "Rapport:"
 msgid "MISSING: "
 msgstr "MANQUANT:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 msgid "Mail password"
 msgstr "Mot de passe Mail"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 msgid "Mail user name"
 msgstr "Nom Utilisateur Mail"
 
@@ -790,11 +795,11 @@ msgstr "Luminance masterisée (e.g. 14fl)"
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Qualité JPEG2000 Maxi"
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -850,7 +855,7 @@ msgstr "Aucun"
 msgid "Off"
 msgstr "Eteint"
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr "Ouvrir fenêtre de console"
 
@@ -870,7 +875,7 @@ msgstr "Unité d'organisation"
 msgid "Other"
 msgstr "Autre"
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Serveurs de messagerie sortant"
 
@@ -886,7 +891,7 @@ msgstr "Sortie"
 msgid "Package Type (e.g. OV)"
 msgstr "Type de paquet (ex. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -931,13 +936,9 @@ msgstr "Position"
 msgid "Pre-release"
 msgstr "Avant sortie"
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr "Clé privée pour décrypter les DCPs"
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
-msgstr "Clé privée pour les certificats"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
+msgstr ""
 
 #: src/wx/dcp_panel.cc:684
 msgid "Processor"
@@ -947,6 +948,10 @@ msgstr "Processeur"
 msgid "Properties..."
 msgstr "Propriétés..."
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 msgid "RGB to XYZ conversion"
 msgstr "Conversion RGB vers XYZ"
@@ -967,8 +972,9 @@ msgstr "Rating (ex. 15)"
 msgid "Re-examine..."
 msgstr "Examine à nouveau..."
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
+#: src/wx/config_dialog.cc:635
+#, fuzzy
+msgid "Re-make certificates and key..."
 msgstr "Fabrique à nouveau les certificats"
 
 #: src/wx/colour_conversion_editor.cc:98
@@ -987,7 +993,7 @@ msgstr "Red Band"
 msgid "Red chromaticity"
 msgstr "Chromaticité du Rouge"
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Supprimer"
@@ -1020,7 +1026,7 @@ msgstr "Répéter..."
 msgid "Report A Problem"
 msgstr "Signaler un problème"
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr "texte par défaut"
 
@@ -1040,7 +1046,7 @@ msgstr "Droit"
 msgid "Right click to change gain."
 msgstr "Cliquez droit pour modifier le gain."
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr "Racine"
 
@@ -1048,6 +1054,10 @@ msgstr "Racine"
 msgid "Root common name"
 msgstr "Nom commun racine"
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr "SMPTE"
@@ -1064,8 +1074,8 @@ msgstr "Ecrans"
 msgid "Select CPL XML file"
 msgstr "Sélectionner le fichier CPL.xml"
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Sélectionner le certificat"
 
@@ -1073,7 +1083,7 @@ msgstr "Sélectionner le certificat"
 msgid "Select KDM"
 msgstr "Selectionner KDM"
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 msgid "Select Key File"
 msgstr "Sélectionner fichier clé"
 
@@ -1129,6 +1139,11 @@ msgstr "Montrer le son..."
 msgid "Signed"
 msgstr "Signé"
 
+#: src/wx/config_dialog.cc:578
+#, fuzzy
+msgid "Signing DCPs and KDMs"
+msgstr "Certificats pour signature des DCPs et KDMs:"
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Lissage"
@@ -1157,7 +1172,7 @@ msgstr "Flux"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr "Sujet"
 
@@ -1177,11 +1192,11 @@ msgstr "Sous-titres"
 msgid "Supported by"
 msgstr "Soutenu par"
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 msgid "Target path"
 msgstr "Chemin cible"
 
@@ -1231,7 +1246,7 @@ msgstr "Processus"
 msgid "Threads to use for encoding on this host"
 msgstr "Nombre de processus à utiliser sur cet hôte"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr "Empreinte"
 
@@ -1275,7 +1290,7 @@ msgstr "Rogner au début"
 msgid "Trim up to current position"
 msgstr "Couper jusqu'à position actuelle"
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Type"
@@ -1320,7 +1335,7 @@ msgstr "Utiliser le préréglage"
 msgid "Use subtitles"
 msgstr "Utiliser les sous-titres"
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Nom d'utilisateur"
 
@@ -1336,7 +1351,7 @@ msgstr "Cadence vidéo"
 msgid "View..."
 msgstr "voir..."
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr "Avertissements"
 
@@ -1472,7 +1487,7 @@ msgstr "m"
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr "port"
 
@@ -1509,6 +1524,12 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Private key for decrypting DCPs"
+#~ msgstr "Clé privée pour décrypter les DCPs"
+
+#~ msgid "Private key for leaf certificate"
+#~ msgstr "Clé privée pour les certificats"
+
 #~ msgid "(password will be stored on disk in plaintext)"
 #~ msgstr "(le mot de passe sera enregistré sur le disque dur au format texte)"
 
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 998787182..15a4d2963 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 16:06+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -141,7 +141,7 @@ msgstr "Tieni i video in sequenza"
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Aggiungi..."
 
@@ -165,7 +165,7 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 #, fuzzy
 msgid "Allow any DCP frame rate"
 msgstr "Frequenza fotogrammi video"
@@ -199,7 +199,7 @@ msgstr ""
 msgid "B"
 msgstr "dB"
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 #, fuzzy
 msgid "BCC address"
 msgstr "Indirizzo IP"
@@ -225,7 +225,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Ma dovrò riprodurre con il fader a"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 #, fuzzy
 msgid "CC address"
 msgstr "Indirizzo IP"
@@ -250,25 +250,17 @@ msgstr "Calcola..."
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 #, fuzzy
 msgid "Certificate"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr ""
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 #, fuzzy
 msgid "Certificate downloaded"
 msgstr "Seleziona il file del Certificato"
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr ""
@@ -316,7 +308,7 @@ msgstr "Aggiungi Cinema"
 msgid "Colour conversion"
 msgstr "Conversione colore"
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr ""
 
@@ -370,13 +362,13 @@ msgstr ""
 msgid "Could not get video for view (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, fuzzy, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, fuzzy, c-format
 msgid "Could not read key file (%s)"
 msgstr "Non posso aprire il file del contenuto (%s)"
@@ -414,14 +406,18 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr "Audio DCP-o-matic - %s"
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr ""
 
+#: src/wx/config_dialog.cc:640
+msgid "Decrypting DCPs"
+msgstr ""
+
 #: src/wx/config_dialog.cc:343
 #, fuzzy
 msgid "Default ISDCF name details"
@@ -537,14 +533,18 @@ msgstr "Criptato"
 msgid "End"
 msgstr "Fine"
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr ""
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Facility (es. DLA)"
@@ -610,7 +610,7 @@ msgstr ""
 msgid "From"
 msgstr "Da"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 #, fuzzy
 msgid "From address"
 msgstr "Indirizzo IP"
@@ -636,7 +636,7 @@ msgstr "Calcolatore del guadagno audio"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Guadagno per il canale sorgente %d nel canale DCP %d"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr ""
 
@@ -664,7 +664,7 @@ msgstr "Sto usando il fader a"
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "Indirizzo IP"
 
@@ -690,7 +690,7 @@ msgstr ""
 msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr ""
 
@@ -710,7 +710,7 @@ msgstr "Banda passante JPEG2000"
 msgid "Join"
 msgstr ""
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr ""
 
@@ -739,7 +739,7 @@ msgstr ""
 msgid "Language"
 msgstr "Seleziona la lingua"
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr ""
 
@@ -747,6 +747,10 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 #, fuzzy
 msgid "Left"
@@ -761,17 +765,17 @@ msgstr "Linearizza la curva del gamma in ingresso per piccoli valori"
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 #, fuzzy
 msgid "Load..."
 msgstr "Aggiungi..."
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr ""
 
@@ -779,12 +783,12 @@ msgstr ""
 msgid "MISSING: "
 msgstr "MANCANTE:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 #, fuzzy
 msgid "Mail password"
 msgstr "Password del TMS"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 #, fuzzy
 msgid "Mail user name"
 msgstr "Nome utente del TMS"
@@ -806,12 +810,12 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matrice"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 #, fuzzy
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Banda passante JPEG2000"
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr ""
@@ -867,7 +871,7 @@ msgstr "Nessuno"
 msgid "Off"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr ""
 
@@ -888,7 +892,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Mail server posta in uscita"
 
@@ -906,7 +910,7 @@ msgstr "Gamma in uscita"
 msgid "Package Type (e.g. OV)"
 msgstr "Tipo di Package (es. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 #, fuzzy
 msgid "Password"
 msgstr "Password del TMS"
@@ -950,12 +954,8 @@ msgstr "Posizione"
 msgid "Pre-release"
 msgstr ""
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr ""
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:684
@@ -967,6 +967,10 @@ msgstr ""
 msgid "Properties..."
 msgstr "Proprietà del film"
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 #, fuzzy
 msgid "RGB to XYZ conversion"
@@ -988,9 +992,10 @@ msgstr "Classificazione (es. 15)"
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
-msgstr ""
+#: src/wx/config_dialog.cc:635
+#, fuzzy
+msgid "Re-make certificates and key..."
+msgstr "Seleziona il file del Certificato"
 
 #: src/wx/colour_conversion_editor.cc:98
 msgid "Rec. 601"
@@ -1008,7 +1013,7 @@ msgstr ""
 msgid "Red chromaticity"
 msgstr ""
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Rimuovi"
@@ -1041,7 +1046,7 @@ msgstr ""
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr ""
 
@@ -1062,7 +1067,7 @@ msgstr "Taglio a destra"
 msgid "Right click to change gain."
 msgstr "Clicca il tasto destro per cambiare guadagno."
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr ""
 
@@ -1070,6 +1075,10 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr ""
@@ -1088,8 +1097,8 @@ msgstr "Aggiungi Schermo"
 msgid "Select CPL XML file"
 msgstr "Seleziona file audio"
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Seleziona il file del Certificato"
 
@@ -1097,7 +1106,7 @@ msgstr "Seleziona il file del Certificato"
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 #, fuzzy
 msgid "Select Key File"
 msgstr "Seleziona il file del Certificato"
@@ -1158,6 +1167,10 @@ msgstr "Mostra Audio..."
 msgid "Signed"
 msgstr ""
 
+#: src/wx/config_dialog.cc:578
+msgid "Signing DCPs and KDMs"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Levigatura"
@@ -1188,7 +1201,7 @@ msgstr "Traccia"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (es. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr ""
 
@@ -1209,11 +1222,11 @@ msgstr "Sottotitoli"
 msgid "Supported by"
 msgstr ""
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 #, fuzzy
 msgid "Target path"
 msgstr "Percorso di destinazione del TMS"
@@ -1263,7 +1276,7 @@ msgstr "Threads"
 msgid "Threads to use for encoding on this host"
 msgstr "Threads da usare per codificare su questo host"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr ""
 
@@ -1307,7 +1320,7 @@ msgstr "Taglia dall'inizio"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Tipo"
@@ -1352,7 +1365,7 @@ msgstr "Usa predefinito"
 msgid "Use subtitles"
 msgstr ""
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Nome utente"
 
@@ -1368,7 +1381,7 @@ msgstr "Frequenza fotogrammi video"
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr ""
 
@@ -1498,7 +1511,7 @@ msgstr ""
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr ""
 
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 083c57a4c..68fa9e039 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 16:09+0100\n"
 "Last-Translator: Cherif Ben Brahim <firehc@mac.com>\n"
 "Language-Team: UniversalDV <TKooijmans@universaldv.nl>\n"
@@ -138,7 +138,7 @@ msgstr ""
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Toevoegen.."
 
@@ -170,7 +170,7 @@ msgstr ""
 "beeld zullen komen. U kan best de DCP's container instellen in Scope "
 "(2.39:1) in de \"DCP\"tab."
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 msgid "Allow any DCP frame rate"
 msgstr "Sta om het welke frame rate toe in DCP"
 
@@ -203,7 +203,7 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 msgid "BCC address"
 msgstr "BCC adres"
 
@@ -227,7 +227,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Maak ik gebruik een fader"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 msgid "CC address"
 msgstr "CC adres"
 
@@ -251,23 +251,15 @@ msgstr "Bereken..."
 msgid "Cancel"
 msgstr "Afbreken"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 msgid "Certificate"
 msgstr "certificaat"
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr ""
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Certificaat gedownload"
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr "Ketting"
@@ -313,7 +305,7 @@ msgstr "Bioscoop"
 msgid "Colour conversion"
 msgstr "Colour conversion"
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr "Configureer|Timing"
 
@@ -366,13 +358,13 @@ msgstr ""
 msgid "Could not get video for view (%s)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Onleesbaar certificaat (%s)"
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr ""
@@ -409,14 +401,18 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr ""
 
+#: src/wx/config_dialog.cc:640
+msgid "Decrypting DCPs"
+msgstr ""
+
 #: src/wx/config_dialog.cc:343
 msgid "Default ISDCF name details"
 msgstr "Standaard ISDCF naam details"
@@ -527,14 +523,18 @@ msgstr "Encrypted"
 msgid "End"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr "Fouten"
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "faciliteit (e.g. DLA)"
@@ -597,7 +597,7 @@ msgstr ""
 msgid "From"
 msgstr "Van"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 msgid "From address"
 msgstr "Van adres"
 
@@ -622,7 +622,7 @@ msgstr "Gain Calculator"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Gain voor content kanaal %d in DCP kanaal %d"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr "Algemeen"
 
@@ -650,7 +650,7 @@ msgstr "Ik wil dit afspelen met fader"
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "IP adres"
 
@@ -674,7 +674,7 @@ msgstr ""
 msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr ""
 
@@ -694,7 +694,7 @@ msgstr "JPEG2000 bandbreedte"
 msgid "Join"
 msgstr "Samenvoegen"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr "KDM Email"
 
@@ -722,7 +722,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr ""
 
@@ -730,6 +730,10 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 msgid "Left"
 msgstr ""
@@ -742,16 +746,16 @@ msgstr ""
 msgid "Load from file..."
 msgstr "Laad van bestand..."
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 msgid "Load..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr "Log"
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr ""
 
@@ -759,11 +763,11 @@ msgstr ""
 msgid "MISSING: "
 msgstr "ONTBREEKT:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 msgid "Mail password"
 msgstr "Mail wachtwoord"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 msgid "Mail user name"
 msgstr "Mail gebruikersnaam"
 
@@ -783,11 +787,11 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matrix"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maximum JPEG2000 bandbreedte"
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -845,7 +849,7 @@ msgstr "Geen"
 msgid "Off"
 msgstr "Uit"
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr ""
 
@@ -865,7 +869,7 @@ msgstr ""
 msgid "Other"
 msgstr "Andere"
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Uitgaande mail server"
 
@@ -881,7 +885,7 @@ msgstr "Output"
 msgid "Package Type (e.g. OV)"
 msgstr "Package Type (e.g. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -924,12 +928,8 @@ msgstr "Positie"
 msgid "Pre-release"
 msgstr "Voor-uitgave"
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr ""
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:684
@@ -940,6 +940,10 @@ msgstr ""
 msgid "Properties..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 msgid "RGB to XYZ conversion"
 msgstr ""
@@ -960,8 +964,8 @@ msgstr "Beoordeling (e.g. 15)"
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
+#: src/wx/config_dialog.cc:635
+msgid "Re-make certificates and key..."
 msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:98
@@ -980,7 +984,7 @@ msgstr "Rode tape"
 msgid "Red chromaticity"
 msgstr ""
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Verwijder"
@@ -1013,7 +1017,7 @@ msgstr "Herhaal..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr "Herinstellen oorspronkelijke tekst"
 
@@ -1033,7 +1037,7 @@ msgstr ""
 msgid "Right click to change gain."
 msgstr "Klik Rechtermuis om gain te veranderen"
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr ""
 
@@ -1041,6 +1045,10 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr "SMPTE"
@@ -1057,8 +1065,8 @@ msgstr "Schermen"
 msgid "Select CPL XML file"
 msgstr "Selekteer CPL XML bestand"
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Selecteer Certificaat bestand"
 
@@ -1066,7 +1074,7 @@ msgstr "Selecteer Certificaat bestand"
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 msgid "Select Key File"
 msgstr ""
 
@@ -1122,6 +1130,10 @@ msgstr ""
 msgid "Signed"
 msgstr "Signed"
 
+#: src/wx/config_dialog.cc:578
+msgid "Signing DCPs and KDMs"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Smoothing"
@@ -1150,7 +1162,7 @@ msgstr "Stroom"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (e.g. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr "Onderwerp"
 
@@ -1170,11 +1182,11 @@ msgstr "Ondertitels"
 msgid "Supported by"
 msgstr "Ondersteund door"
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 msgid "Target path"
 msgstr "Doel pad"
 
@@ -1224,7 +1236,7 @@ msgstr "CPU belasting"
 msgid "Threads to use for encoding on this host"
 msgstr "CPU cores beschikbaar voor encoding op deze host"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr ""
 
@@ -1268,7 +1280,7 @@ msgstr "Trim vanaf begin"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Type"
@@ -1313,7 +1325,7 @@ msgstr "Gebruik preset"
 msgid "Use subtitles"
 msgstr ""
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Gebruikersnaam"
 
@@ -1329,7 +1341,7 @@ msgstr "Video frame rate"
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr "Waarschuwingen"
 
@@ -1457,7 +1469,7 @@ msgstr ""
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr ""
 
diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index 79e6ec20d..c5a044b90 100644
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-06-12 22:39+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -142,7 +142,7 @@ msgstr "Dodaj sekwencję obrazów"
 msgid "Add video, image or sound files to the film."
 msgstr "Dodaj plik wideo, audio lub obraz do filmu."
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Dodaj..."
 
@@ -172,7 +172,7 @@ msgstr ""
 "1.85:1. Spowoduje to dodanie kaszety w proporcjach 1.85:1. Polecamy ustawić "
 "kontener DCP do 2.39:1 w zakładce \"DCP\"."
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 msgid "Allow any DCP frame rate"
 msgstr "Zezwalaj na dowolną częstotliwość kl/s DCP"
 
@@ -205,7 +205,7 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 msgid "BCC address"
 msgstr "Adres BCC"
 
@@ -229,7 +229,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Ale muszę wyciszyć"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 msgid "CC address"
 msgstr "Adres CC"
 
@@ -253,23 +253,15 @@ msgstr "Przelicz..."
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 msgid "Certificate"
 msgstr "Certyfikat"
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr ""
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Certyfikat ściągnięty"
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr "Łańcuch"
@@ -315,7 +307,7 @@ msgstr "Kino"
 msgid "Colour conversion"
 msgstr "Konwersja kolorów"
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr "Synchronizacja"
 
@@ -368,13 +360,13 @@ msgstr ""
 msgid "Could not get video for view (%s)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Nie udało się odczytać certyfikatu (%s)"
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr ""
@@ -411,14 +403,18 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr ""
 
+#: src/wx/config_dialog.cc:640
+msgid "Decrypting DCPs"
+msgstr ""
+
 #: src/wx/config_dialog.cc:343
 msgid "Default ISDCF name details"
 msgstr "Domyślne właściwości ISDCF"
@@ -529,14 +525,18 @@ msgstr "Szyfrowane"
 msgid "End"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr "Błędy"
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Placówka (e.g. DLA)"
@@ -599,7 +599,7 @@ msgstr "Stwórz DCP z prawie każdego rodzaju pliku. Za darmo. Open-source."
 msgid "From"
 msgstr "Od"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 msgid "From address"
 msgstr "Od"
 
@@ -624,7 +624,7 @@ msgstr "Kalkulator wzmocnienia"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Wzocnienie dla kanału %d w %d kanale DCP"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr "Ogólne"
 
@@ -652,7 +652,7 @@ msgstr "Chcę odtwarzać ten plik z wyciszeniem"
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "Adres IP"
 
@@ -676,7 +676,7 @@ msgstr "Korekcja gammy wejściowej"
 msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr ""
 
@@ -696,7 +696,7 @@ msgstr "Przepustowość JPEG2000"
 msgid "Join"
 msgstr "Przyłącz się"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr "Email KDM"
 
@@ -724,7 +724,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr ""
 
@@ -732,6 +732,10 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 msgid "Left"
 msgstr ""
@@ -744,16 +748,16 @@ msgstr ""
 msgid "Load from file..."
 msgstr "Otwórz z pliku"
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 msgid "Load..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr "Dziennik"
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr "Dziennik:"
 
@@ -761,11 +765,11 @@ msgstr "Dziennik:"
 msgid "MISSING: "
 msgstr "BRAKUJĄCE:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 msgid "Mail password"
 msgstr "Hasło Email:"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 msgid "Mail user name"
 msgstr "Nazwa Email:"
 
@@ -785,11 +789,11 @@ msgstr "Luminancja końcowa (e.g. 14fl)"
 msgid "Matrix"
 msgstr "Matryca"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Maksymalna przepustowość JPEG2000"
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -846,7 +850,7 @@ msgstr "Brak"
 msgid "Off"
 msgstr "Wyłącz"
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr ""
 
@@ -866,7 +870,7 @@ msgstr ""
 msgid "Other"
 msgstr "Inne"
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Serwer poczty wychodzącej"
 
@@ -882,7 +886,7 @@ msgstr "Wyjście"
 msgid "Package Type (e.g. OV)"
 msgstr "Rodzaj kontenera (e.g. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 msgid "Password"
 msgstr "Hasło"
 
@@ -925,12 +929,8 @@ msgstr "Pozycja"
 msgid "Pre-release"
 msgstr "Wydanie przedpremierowe"
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr ""
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:684
@@ -941,6 +941,10 @@ msgstr ""
 msgid "Properties..."
 msgstr "Właściwości..."
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 msgid "RGB to XYZ conversion"
 msgstr "Konwersja RGB na XYZ"
@@ -961,8 +965,8 @@ msgstr "Kategoria (e.g. 15)"
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
+#: src/wx/config_dialog.cc:635
+msgid "Re-make certificates and key..."
 msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:98
@@ -981,7 +985,7 @@ msgstr "Pasmo czerwony"
 msgid "Red chromaticity"
 msgstr "Chromatyczność czerwony"
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Usuń"
@@ -1014,7 +1018,7 @@ msgstr "Powtórz..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr "Przywróć domyślny tekst"
 
@@ -1034,7 +1038,7 @@ msgstr ""
 msgid "Right click to change gain."
 msgstr "Kliknij prawy przycisk myszy, żeby zmienić wzmocenienie."
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr ""
 
@@ -1042,6 +1046,10 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr "SMPTE"
@@ -1058,8 +1066,8 @@ msgstr "Sale"
 msgid "Select CPL XML file"
 msgstr "Wybierz plik CPL XML"
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Wybierz plik certyfikatu"
 
@@ -1067,7 +1075,7 @@ msgstr "Wybierz plik certyfikatu"
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 msgid "Select Key File"
 msgstr ""
 
@@ -1123,6 +1131,10 @@ msgstr ""
 msgid "Signed"
 msgstr "Podpisany cyfrowo"
 
+#: src/wx/config_dialog.cc:578
+msgid "Signing DCPs and KDMs"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Wygładzanie"
@@ -1151,7 +1163,7 @@ msgstr "Strumień"
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (e.g. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr "Podmiot"
 
@@ -1171,11 +1183,11 @@ msgstr "Napisy"
 msgid "Supported by"
 msgstr "Supported by"
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 msgid "Target path"
 msgstr "Ścieżka docelowa"
 
@@ -1224,7 +1236,7 @@ msgstr "Wątki"
 msgid "Threads to use for encoding on this host"
 msgstr "Ilość wątków użytych dla kodowania na tym serwerze"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr ""
 
@@ -1268,7 +1280,7 @@ msgstr "Przytnij od początku"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Rodzaj"
@@ -1313,7 +1325,7 @@ msgstr "Użyj ustawienia"
 msgid "Use subtitles"
 msgstr ""
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Nazwa użytkownika"
 
@@ -1329,7 +1341,7 @@ msgstr "Czestotliwość kl/s pliku wideo"
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr "Ostrzeżenia"
 
@@ -1456,7 +1468,7 @@ msgstr "m"
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr ""
 
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index 94477faa3..e0270fd45 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-16 09:14-0400\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Russian\n"
@@ -142,7 +142,7 @@ msgstr "Добавить последовательность изображен
 msgid "Add video, image or sound files to the film."
 msgstr "Добавить видео, изображение или звук в проект."
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Добавить..."
 
@@ -174,7 +174,7 @@ msgstr ""
 "можете изменить настройки вашего DCP контейнера на SCOPE (2.39:1) на вкладке "
 "\"DCP\"."
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 msgid "Allow any DCP frame rate"
 msgstr "Разрешить любую частоту кадров DCP"
 
@@ -206,7 +206,7 @@ msgstr ""
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 msgid "BCC address"
 msgstr "Скрытая копия"
 
@@ -230,7 +230,7 @@ msgstr "Вшить субтитры в изображение"
 msgid "But I have to use fader"
 msgstr "Но я должен использовать микшер"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 msgid "CC address"
 msgstr "Кому копия"
 
@@ -254,23 +254,15 @@ msgstr "Просчитать..."
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 msgid "Certificate"
 msgstr "Сертификат"
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr "Цепочка сертификатов для подписи DCP и KDM:"
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr "Сертификат загружен"
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr "Сертификат для расшифровки DCP"
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr "Цепочка"
@@ -316,7 +308,7 @@ msgstr "Кинотеатр"
 msgid "Colour conversion"
 msgstr "Преобразование цвета"
 
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr "Конфигурация | Тайминг"
 
@@ -369,13 +361,13 @@ msgstr "Не удалось найти изображения в этой пап
 msgid "Could not get video for view (%s)"
 msgstr "Не удалось вывести предпросмотр видео (%s)"
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "Не удалось прочитать файл сертификата (%s)"
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr "Не удалось прочитать файл ключа (%s)"
@@ -412,14 +404,19 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr "Аудио DCP-o-matic"
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr ""
 
+#: src/wx/config_dialog.cc:640
+#, fuzzy
+msgid "Decrypting DCPs"
+msgstr "Сертификат для расшифровки DCP"
+
 #: src/wx/config_dialog.cc:343
 msgid "Default ISDCF name details"
 msgstr "Стандартные поля ISDCF (Inter-Society Digital Cinema Forum)"
@@ -530,14 +527,18 @@ msgstr "Зашифрованный"
 msgid "End"
 msgstr "Конец"
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr "Ошибки"
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr "Экспортировать сертификат расшифровки DCP..."
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Предприятие (напр. DLA)"
@@ -602,7 +603,7 @@ msgstr ""
 msgid "From"
 msgstr "От"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 msgid "From address"
 msgstr "Отправитель"
 
@@ -627,7 +628,7 @@ msgstr "Калькулятор усиления"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Усиление для канала %d контента в канале %d DCP"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr "Основные"
 
@@ -655,7 +656,7 @@ msgstr "Я хочу воспроизвести это в микшере"
 msgid "ID"
 msgstr "ID"
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "IP адрес"
 
@@ -679,7 +680,7 @@ msgstr "Коррекция входной гаммы"
 msgid "Input power"
 msgstr "Входная мощность"
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr "Intermediate"
 
@@ -699,7 +700,7 @@ msgstr "Пропускная способность JPEG2000"
 msgid "Join"
 msgstr "Подсоединить"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr "Почта KDM"
 
@@ -727,7 +728,7 @@ msgstr "Ключи"
 msgid "Language"
 msgstr "Язык"
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr "Leaf"
 
@@ -735,6 +736,10 @@ msgstr "Leaf"
 msgid "Leaf common name"
 msgstr "Leaf common name"
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 msgid "Left"
 msgstr "Левый"
@@ -747,16 +752,16 @@ msgstr "Выровнять входную гамму для малых знач�
 msgid "Load from file..."
 msgstr "Загрузить из файла..."
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 msgid "Load..."
 msgstr "Загрузить..."
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr "Лог"
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr "Лог:"
 
@@ -764,11 +769,11 @@ msgstr "Лог:"
 msgid "MISSING: "
 msgstr "ОТСУТСТВУЕТ:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 msgid "Mail password"
 msgstr "Пароль почты"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 msgid "Mail user name"
 msgstr "Пользователь почты"
 
@@ -788,11 +793,11 @@ msgstr "Яркость (напр. 14 фут-ламберт)"
 msgid "Matrix"
 msgstr "Матрица"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "Максимальная пропускная способность JPEG2000"
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr "МБит/с"
@@ -848,7 +853,7 @@ msgstr "Ничего"
 msgid "Off"
 msgstr "Выключен"
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr "Открыть консольное окно"
 
@@ -868,7 +873,7 @@ msgstr "Organisational unit"
 msgid "Other"
 msgstr "Другое"
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Исходящий почтовый сервер"
 
@@ -884,7 +889,7 @@ msgstr "Вывод"
 msgid "Package Type (e.g. OV)"
 msgstr "Тип пакета (напр. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 msgid "Password"
 msgstr "Пароль"
 
@@ -929,13 +934,9 @@ msgstr "Позиция"
 msgid "Pre-release"
 msgstr "Пре-релиз"
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr "Приватный ключ для расшифровки DCP"
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
-msgstr "Приватный ключ для leaf-сертификата"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
+msgstr ""
 
 #: src/wx/dcp_panel.cc:684
 msgid "Processor"
@@ -945,6 +946,10 @@ msgstr "Обработка"
 msgid "Properties..."
 msgstr "Свойства..."
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 msgid "RGB to XYZ conversion"
 msgstr "Преобразование RGB в XYZ"
@@ -965,8 +970,9 @@ msgstr "Рейтинг (напр. NR)"
 msgid "Re-examine..."
 msgstr "Перепроверить..."
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
+#: src/wx/config_dialog.cc:635
+#, fuzzy
+msgid "Re-make certificates and key..."
 msgstr "Пересоздать сертификаты..."
 
 #: src/wx/colour_conversion_editor.cc:98
@@ -985,7 +991,7 @@ msgstr "Red band"
 msgid "Red chromaticity"
 msgstr "Красная цветность"
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Убрать"
@@ -1018,7 +1024,7 @@ msgstr "Повторить..."
 msgid "Report A Problem"
 msgstr "Сообщить Об Ошибке"
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr "Сбросить текст по умолчанию"
 
@@ -1038,7 +1044,7 @@ msgstr "Правый"
 msgid "Right click to change gain."
 msgstr "ПКМ для изменения усиления"
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr "Root"
 
@@ -1046,6 +1052,10 @@ msgstr "Root"
 msgid "Root common name"
 msgstr "Root common name"
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr "SMPTE"
@@ -1062,8 +1072,8 @@ msgstr "Экраны"
 msgid "Select CPL XML file"
 msgstr "Выберите XML-файл CPL"
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Выберите файл сертификата"
 
@@ -1071,7 +1081,7 @@ msgstr "Выберите файл сертификата"
 msgid "Select KDM"
 msgstr "Выберите KDM"
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 msgid "Select Key File"
 msgstr "Выберите файл ключа"
 
@@ -1128,6 +1138,11 @@ msgstr "Показать аудио..."
 msgid "Signed"
 msgstr "Подписанный"
 
+#: src/wx/config_dialog.cc:578
+#, fuzzy
+msgid "Signing DCPs and KDMs"
+msgstr "Цепочка сертификатов для подписи DCP и KDM:"
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Сглаживание"
@@ -1157,7 +1172,7 @@ msgstr "Поток"
 msgid "Studio (e.g. TCF)"
 msgstr "Студия (напр. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr "Тема"
 
@@ -1177,11 +1192,11 @@ msgstr "Субтитры"
 msgid "Supported by"
 msgstr "Финансовая поддержка"
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 msgid "Target path"
 msgstr "Целевой путь"
 
@@ -1230,7 +1245,7 @@ msgstr "Потоки"
 msgid "Threads to use for encoding on this host"
 msgstr "Кол-во потоков кодирования на хосте"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr "Отпечаток"
 
@@ -1274,7 +1289,7 @@ msgstr "Обрезать с начала"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Тип"
@@ -1319,7 +1334,7 @@ msgstr "Использовать заготовку"
 msgid "Use subtitles"
 msgstr "Использовать субтитры"
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Имя пользователя"
 
@@ -1335,7 +1350,7 @@ msgstr "Частота кадров видео"
 msgid "View..."
 msgstr "Вид..."
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr "Предупреждения"
 
@@ -1471,7 +1486,7 @@ msgstr "м"
 msgid "ms"
 msgstr "мс"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr ""
 
@@ -1508,6 +1523,12 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ msgid "Private key for decrypting DCPs"
+#~ msgstr "Приватный ключ для расшифровки DCP"
+
+#~ msgid "Private key for leaf certificate"
+#~ msgstr "Приватный ключ для leaf-сертификата"
+
 #~ msgid "(password will be stored on disk in plaintext)"
 #~ msgstr "(пароль будет сохранен на диске в виде текста)"
 
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index a06964244..7710b65e7 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: 2015-07-16 23:48+0100\n"
+"POT-Creation-Date: 2015-07-21 23:06+0100\n"
 "PO-Revision-Date: 2015-07-06 16:12+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -138,7 +138,7 @@ msgstr ""
 msgid "Add video, image or sound files to the film."
 msgstr ""
 
-#: src/wx/config_dialog.cc:607 src/wx/editable_list.h:62
+#: src/wx/config_dialog.cc:613 src/wx/editable_list.h:62
 msgid "Add..."
 msgstr "Lägg till..."
 
@@ -162,7 +162,7 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1175
+#: src/wx/config_dialog.cc:1203
 msgid "Allow any DCP frame rate"
 msgstr ""
 
@@ -195,7 +195,7 @@ msgstr ""
 msgid "B"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1035
+#: src/wx/config_dialog.cc:1063
 msgid "BCC address"
 msgstr ""
 
@@ -219,7 +219,7 @@ msgstr ""
 msgid "But I have to use fader"
 msgstr "Men jag måste använda mixervolym"
 
-#: src/wx/config_dialog.cc:1031
+#: src/wx/config_dialog.cc:1059
 msgid "CC address"
 msgstr ""
 
@@ -243,23 +243,15 @@ msgstr "Beräkna..."
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: src/wx/screen_dialog.cc:44
+#: src/wx/config_dialog.cc:646 src/wx/screen_dialog.cc:44
 msgid "Certificate"
 msgstr ""
 
-#: src/wx/config_dialog.cc:574
-msgid "Certificate chain for signing DCPs and KDMs:"
-msgstr ""
-
 #: src/wx/dolby_certificate_dialog.cc:192
 #: src/wx/doremi_certificate_dialog.cc:104
 msgid "Certificate downloaded"
 msgstr ""
 
-#: src/wx/config_dialog.cc:633
-msgid "Certificate for decrypting DCPs"
-msgstr ""
-
 #: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Chain"
 msgstr ""
@@ -306,7 +298,7 @@ msgid "Colour conversion"
 msgstr "Färgkonvertering"
 
 # Svengelska
-#: src/wx/config_dialog.cc:1195
+#: src/wx/config_dialog.cc:1223
 msgid "Config|Timing"
 msgstr ""
 
@@ -359,13 +351,13 @@ msgstr ""
 msgid "Could not get video for view (%s)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:686 src/wx/config_dialog.cc:799
-#: src/wx/config_dialog.cc:819 src/wx/screen_dialog.cc:95
+#: src/wx/config_dialog.cc:699 src/wx/config_dialog.cc:812
+#: src/wx/config_dialog.cc:832 src/wx/screen_dialog.cc:95
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr ""
 
-#: src/wx/config_dialog.cc:791 src/wx/config_dialog.cc:841
+#: src/wx/config_dialog.cc:804 src/wx/config_dialog.cc:854
 #, c-format
 msgid "Could not read key file (%s)"
 msgstr ""
@@ -403,14 +395,18 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1197
+#: src/wx/config_dialog.cc:1225
 msgid "Debug: decode"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1199
+#: src/wx/config_dialog.cc:1227
 msgid "Debug: encode"
 msgstr ""
 
+#: src/wx/config_dialog.cc:640
+msgid "Decrypting DCPs"
+msgstr ""
+
 #: src/wx/config_dialog.cc:343
 msgid "Default ISDCF name details"
 msgstr ""
@@ -520,14 +516,18 @@ msgstr "Krypterad"
 msgid "End"
 msgstr "Slut"
 
-#: src/wx/config_dialog.cc:1193
+#: src/wx/config_dialog.cc:1221
 msgid "Errors"
 msgstr ""
 
-#: src/wx/config_dialog.cc:649
+#: src/wx/config_dialog.cc:662
 msgid "Export DCP decryption certificate..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:947
+msgid "FTP (for Dolby)"
+msgstr ""
+
 #: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Facility (e.g. DLA)"
 msgstr "Företag (ex. DLA)"
@@ -592,7 +592,7 @@ msgstr "Fri, öppen-källkods DCP-generering från nästan vad som helst."
 msgid "From"
 msgstr "Avsändare"
 
-#: src/wx/config_dialog.cc:1027
+#: src/wx/config_dialog.cc:1055
 msgid "From address"
 msgstr ""
 
@@ -617,7 +617,7 @@ msgstr "Volym Kalkylator"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "Förstärkning för innehållskanal %d i DCP-kanal %d"
 
-#: src/wx/config_dialog.cc:1189
+#: src/wx/config_dialog.cc:1217
 msgid "General"
 msgstr ""
 
@@ -645,7 +645,7 @@ msgstr "Jag vill spela upp detta med mixervolym"
 msgid "ID"
 msgstr ""
 
-#: src/wx/config_dialog.cc:913
+#: src/wx/config_dialog.cc:930
 msgid "IP address"
 msgstr "IP-adress"
 
@@ -669,7 +669,7 @@ msgstr ""
 msgid "Input power"
 msgstr ""
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:738
 msgid "Intermediate"
 msgstr ""
 
@@ -689,7 +689,7 @@ msgstr "JPEG2000-bandbredd"
 msgid "Join"
 msgstr "Anslut"
 
-#: src/wx/config_dialog.cc:986
+#: src/wx/config_dialog.cc:1014
 msgid "KDM Email"
 msgstr ""
 
@@ -719,7 +719,7 @@ msgstr ""
 msgid "Language"
 msgstr ""
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:736
 msgid "Leaf"
 msgstr ""
 
@@ -727,6 +727,10 @@ msgstr ""
 msgid "Leaf common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:625
+msgid "Leaf private key"
+msgstr ""
+
 #: src/wx/video_panel.cc:96
 msgid "Left"
 msgstr ""
@@ -739,16 +743,16 @@ msgstr ""
 msgid "Load from file..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:629 src/wx/config_dialog.cc:637
-#: src/wx/config_dialog.cc:645
+#: src/wx/config_dialog.cc:631 src/wx/config_dialog.cc:650
+#: src/wx/config_dialog.cc:658
 msgid "Load..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1183
+#: src/wx/config_dialog.cc:1211
 msgid "Log"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1180
+#: src/wx/config_dialog.cc:1208
 msgid "Log:"
 msgstr ""
 
@@ -756,11 +760,11 @@ msgstr ""
 msgid "MISSING: "
 msgstr "SAKNAS:"
 
-#: src/wx/config_dialog.cc:1019
+#: src/wx/config_dialog.cc:1047
 msgid "Mail password"
 msgstr "Mejl-lösenord"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1043
 msgid "Mail user name"
 msgstr "Mejl-användarnamn"
 
@@ -780,11 +784,11 @@ msgstr ""
 msgid "Matrix"
 msgstr "Matris"
 
-#: src/wx/config_dialog.cc:1167
+#: src/wx/config_dialog.cc:1195
 msgid "Maximum JPEG2000 bandwidth"
 msgstr ""
 
-#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1171
+#: src/wx/config_dialog.cc:360 src/wx/config_dialog.cc:1199
 #: src/wx/dcp_panel.cc:607
 msgid "Mbit/s"
 msgstr ""
@@ -843,7 +847,7 @@ msgstr "Inget"
 msgid "Off"
 msgstr "Av"
 
-#: src/wx/config_dialog.cc:1205
+#: src/wx/config_dialog.cc:1233
 msgid "Open console window"
 msgstr ""
 
@@ -863,7 +867,7 @@ msgstr ""
 msgid "Other"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1003
+#: src/wx/config_dialog.cc:1031
 msgid "Outgoing mail server"
 msgstr "Utgående mejlserver"
 
@@ -880,7 +884,7 @@ msgstr ""
 msgid "Package Type (e.g. OV)"
 msgstr "Förpackningstyp (ex. OV)"
 
-#: src/wx/config_dialog.cc:925
+#: src/wx/config_dialog.cc:942
 msgid "Password"
 msgstr "Lösenord"
 
@@ -923,12 +927,8 @@ msgstr "Position"
 msgid "Pre-release"
 msgstr ""
 
-#: src/wx/config_dialog.cc:641
-msgid "Private key for decrypting DCPs"
-msgstr ""
-
-#: src/wx/config_dialog.cc:623
-msgid "Private key for leaf certificate"
+#: src/wx/config_dialog.cc:654
+msgid "Private key"
 msgstr ""
 
 #: src/wx/dcp_panel.cc:684
@@ -939,6 +939,10 @@ msgstr ""
 msgid "Properties..."
 msgstr ""
 
+#: src/wx/config_dialog.cc:926
+msgid "Protocol"
+msgstr ""
+
 #: src/wx/colour_conversion_editor.cc:105
 msgid "RGB to XYZ conversion"
 msgstr ""
@@ -959,8 +963,8 @@ msgstr "Klassificering (ex. 15)"
 msgid "Re-examine..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:619
-msgid "Re-make certificates..."
+#: src/wx/config_dialog.cc:635
+msgid "Re-make certificates and key..."
 msgstr ""
 
 #: src/wx/colour_conversion_editor.cc:98
@@ -979,7 +983,7 @@ msgstr ""
 msgid "Red chromaticity"
 msgstr ""
 
-#: src/wx/config_dialog.cc:609 src/wx/content_menu.cc:64
+#: src/wx/config_dialog.cc:615 src/wx/content_menu.cc:64
 #: src/wx/content_panel.cc:83 src/wx/editable_list.h:68
 msgid "Remove"
 msgstr "Ta bort"
@@ -1013,7 +1017,7 @@ msgstr "Upprepa..."
 msgid "Report A Problem"
 msgstr ""
 
-#: src/wx/config_dialog.cc:1042
+#: src/wx/config_dialog.cc:1070
 msgid "Reset to default text"
 msgstr ""
 
@@ -1033,7 +1037,7 @@ msgstr ""
 msgid "Right click to change gain."
 msgstr "Högerklicka för att ändra förstärkning."
 
-#: src/wx/config_dialog.cc:721
+#: src/wx/config_dialog.cc:734
 msgid "Root"
 msgstr ""
 
@@ -1041,6 +1045,10 @@ msgstr ""
 msgid "Root common name"
 msgstr ""
 
+#: src/wx/config_dialog.cc:946
+msgid "SCP (for AAM)"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:153
 msgid "SMPTE"
 msgstr "SMPTE"
@@ -1057,8 +1065,8 @@ msgstr ""
 msgid "Select CPL XML file"
 msgstr ""
 
-#: src/wx/config_dialog.cc:677 src/wx/config_dialog.cc:811
-#: src/wx/config_dialog.cc:856 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:824
+#: src/wx/config_dialog.cc:869 src/wx/screen_dialog.cc:102
 msgid "Select Certificate File"
 msgstr "Välj certifikatfil"
 
@@ -1066,7 +1074,7 @@ msgstr "Välj certifikatfil"
 msgid "Select KDM"
 msgstr ""
 
-#: src/wx/config_dialog.cc:785 src/wx/config_dialog.cc:833
+#: src/wx/config_dialog.cc:798 src/wx/config_dialog.cc:846
 msgid "Select Key File"
 msgstr ""
 
@@ -1122,6 +1130,10 @@ msgstr ""
 msgid "Signed"
 msgstr "Signerad"
 
+#: src/wx/config_dialog.cc:578
+msgid "Signing DCPs and KDMs"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:90
 msgid "Smoothing"
 msgstr "Utjämning"
@@ -1151,7 +1163,7 @@ msgstr ""
 msgid "Studio (e.g. TCF)"
 msgstr "Studio (ex. TCF)"
 
-#: src/wx/config_dialog.cc:1023
+#: src/wx/config_dialog.cc:1051
 msgid "Subject"
 msgstr ""
 
@@ -1171,11 +1183,11 @@ msgstr "Undertexter"
 msgid "Supported by"
 msgstr "Stöd från"
 
-#: src/wx/config_dialog.cc:896
+#: src/wx/config_dialog.cc:909
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:917
+#: src/wx/config_dialog.cc:934
 msgid "Target path"
 msgstr "Målsökväg"
 
@@ -1224,7 +1236,7 @@ msgstr "Trådar"
 msgid "Threads to use for encoding on this host"
 msgstr "Antal trådar att använda vid kodning på denna maskin"
 
-#: src/wx/config_dialog.cc:593
+#: src/wx/config_dialog.cc:599
 msgid "Thumbprint"
 msgstr ""
 
@@ -1269,7 +1281,7 @@ msgstr "Trimma från start"
 msgid "Trim up to current position"
 msgstr ""
 
-#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:585
+#: src/wx/audio_dialog.cc:73 src/wx/config_dialog.cc:591
 #: src/wx/video_panel.cc:78
 msgid "Type"
 msgstr "Typ"
@@ -1315,7 +1327,7 @@ msgstr "Använd förhandsinställning"
 msgid "Use subtitles"
 msgstr ""
 
-#: src/wx/config_dialog.cc:921
+#: src/wx/config_dialog.cc:938
 msgid "User name"
 msgstr "Användarnamn"
 
@@ -1331,7 +1343,7 @@ msgstr "bildhastighet"
 msgid "View..."
 msgstr ""
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1219
 msgid "Warnings"
 msgstr ""
 
@@ -1459,7 +1471,7 @@ msgstr ""
 msgid "ms"
 msgstr "ms"
 
-#: src/wx/config_dialog.cc:1008
+#: src/wx/config_dialog.cc:1036
 msgid "port"
 msgstr ""
author	Carl Hetherington <cth@carlh.net>	2015-07-21 23:06:37 +0100
committer	Carl Hetherington <cth@carlh.net>	2015-07-21 23:06:37 +0100
commit	40749e968c74845de25826c4a6cadc98801ac546 (patch)
tree	4d12803e59ff994ba6c3284b7e2f36dc4b5bf393
parent	de5037c6ec1a33d17bd0a6029676f8fd39f55b41 (diff)