pot/merge.

8 files changed, 366 insertions, 280 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 ""