pot/merge.

9 files changed, 279 insertions, 271 deletions

diff --git a/src/lib/po/da_DK.po b/src/lib/po/da_DK.po
index 6b186ff75..044b41091 100644
--- a/src/lib/po/da_DK.po
+++ b/src/lib/po/da_DK.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-30 09:55+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/lib/po/de_DE.po b/src/lib/po/de_DE.po
index d65b097f6..6be81d80a 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-21 23:06+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+0100\n"
 "PO-Revision-Date: 2015-07-06 15:29+0100\n"
 "Last-Translator: Carsten Kurz\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -127,15 +127,15 @@ msgstr ""
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr ""
 
@@ -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:477
+#: src/lib/util.cc:476
 msgid "Centre"
 msgstr "Center"
 
@@ -361,7 +361,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-Interlacer"
 
-#: src/lib/config.cc:438
+#: src/lib/config.cc:437
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -484,11 +484,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradient Glätter"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr "HI"
 
@@ -508,12 +508,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr "Ein unbekannter Fehler ist aufgetreten."
 
-#: src/lib/config.cc:89
+#: src/lib/config.cc:88
 #, fuzzy
 msgid "KDM delivery"
 msgstr "KDM Zustellung: $CPL_NAME"
 
-#: src/lib/config.cc:214
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM Zustellung: $CPL_NAME"
 
@@ -521,35 +521,35 @@ msgstr "KDM Zustellung: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel De-Interlacer"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr "Center links"
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:484
 msgid "Left rear surround"
 msgstr "Surround hinten links"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "Surround links"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "LFE (Subwoofer)"
 
@@ -573,7 +573,7 @@ msgstr ""
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr ""
 
@@ -665,7 +665,7 @@ msgstr "Programmfehler bei %1:%2"
 msgid "Public Service Announcement"
 msgstr "Hinweis"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr ""
 
@@ -677,7 +677,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Freigabehinweis"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr ""
 
@@ -689,23 +689,23 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr "Center rechts"
 
-#: src/lib/util.cc:486
+#: src/lib/util.cc:485
 msgid "Right rear surround"
 msgstr "Surround hinten rechts"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Surround rechts"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr ""
 
@@ -858,7 +858,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr ""
 
@@ -874,7 +874,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr "VI"
 
@@ -1004,12 +1004,12 @@ msgid "frames per second"
 msgstr "Bilder pro Sekunde"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:140 src/lib/util.cc:143
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -1040,7 +1040,7 @@ msgid "remaining"
 msgstr "verbleibend"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:169
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/es_ES.po b/src/lib/po/es_ES.po
index 911dd66f0..a56589eec 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-21 23:06+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+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"
@@ -126,15 +126,15 @@ msgstr ""
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr ""
 
@@ -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:477
+#: src/lib/util.cc:476
 msgid "Centre"
 msgstr "Centro"
 
@@ -357,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:438
+#: src/lib/config.cc:437
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -480,11 +480,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr "Sordos"
 
@@ -504,12 +504,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:89
+#: src/lib/config.cc:88
 #, fuzzy
 msgid "KDM delivery"
 msgstr "Envío de KDM: $CPL_NAME"
 
-#: src/lib/config.cc:214
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envío de KDM: $CPL_NAME"
 
@@ -517,35 +517,35 @@ msgstr "Envío de KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
 msgid "Left"
 msgstr "Izquierda"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr "Centro izquierda"
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:484
 msgid "Left rear surround"
 msgstr "Surround trasero izquierda"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "Surround izquierda"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "Lfe (bajos)"
 
@@ -569,7 +569,7 @@ msgstr ""
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr ""
 
@@ -658,7 +658,7 @@ msgstr "Error de programación en %1:%2"
 msgid "Public Service Announcement"
 msgstr "Anuncio de servicio público"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr ""
 
@@ -670,7 +670,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Clasificación"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr ""
 
@@ -682,23 +682,23 @@ msgstr ""
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
 msgid "Right"
 msgstr "Derecha"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr "Centro derecha"
 
-#: src/lib/util.cc:486
+#: src/lib/util.cc:485
 msgid "Right rear surround"
 msgstr "Surround trasero derecha"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Surround derecha"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr ""
 
@@ -854,7 +854,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr ""
 
@@ -870,7 +870,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr "Ciegos"
 
@@ -1000,12 +1000,12 @@ msgid "frames per second"
 msgstr "imágenes por segundo"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:140 src/lib/util.cc:143
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -1036,7 +1036,7 @@ msgid "remaining"
 msgstr "pendiente"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:169
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/fr_FR.po b/src/lib/po/fr_FR.po
index 3de424b08..66f5f2259 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-21 23:06+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+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"
@@ -126,15 +126,15 @@ msgstr "BT709"
 msgid "Bits per pixel"
 msgstr "bits par pixel"
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr "BsL"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr "BsR"
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr "C"
 
@@ -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:477
+#: src/lib/util.cc:476
 msgid "Centre"
 msgstr "Centre"
 
@@ -364,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:438
+#: src/lib/config.cc:437
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -488,11 +488,11 @@ msgstr "Gamma 28 (BT470BG)"
 msgid "Gradient debander"
 msgstr "Corrections des bandes par dégradé"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr "Déficients Auditifs"
 
@@ -512,12 +512,12 @@ msgstr "IEC61966-2-4"
 msgid "It is not known what caused this error."
 msgstr "Erreur indéterminée."
 
-#: src/lib/config.cc:89
+#: src/lib/config.cc:88
 #, fuzzy
 msgid "KDM delivery"
 msgstr "Envoi KDM: $CPL_NAME"
 
-#: src/lib/config.cc:214
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Envoi KDM: $CPL_NAME"
 
@@ -525,35 +525,35 @@ msgstr "Envoi KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Désentrelaceur noyau"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr "L"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 msgid "Lc"
 msgstr "Lc"
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
 msgid "Left"
 msgstr "Gauche"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr "Centre Gauche"
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:484
 msgid "Left rear surround"
 msgstr "Surround arrière gauche"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "Arrière gauche"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr "Lfe"
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "Basses fréquences"
 
@@ -577,7 +577,7 @@ msgstr "Logarithmique (plage 100:1)"
 msgid "Logarithmic (316:1 range)"
 msgstr "Logarithmique (plage 316:1)"
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr "Ls"
 
@@ -665,7 +665,7 @@ msgstr "Erreur de programme à %1:%2"
 msgid "Public Service Announcement"
 msgstr "Public Service Announcement"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr "R"
 
@@ -677,7 +677,7 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
 msgid "Rating"
 msgstr "Classification"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr "Rc"
 
@@ -689,23 +689,23 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
 msgid "Right"
 msgstr "Droite"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr "Centre Droit"
 
-#: src/lib/util.cc:486
+#: src/lib/util.cc:485
 msgid "Right rear surround"
 msgstr "Surround arrière droite"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Arrière droite"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr "Rs"
 
@@ -857,7 +857,7 @@ msgstr "Gauche sur-mixé"
 msgid "Upmix R"
 msgstr "Droit sur-mixé"
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr "VI"
 
@@ -873,7 +873,7 @@ msgstr "Longueur vidéo"
 msgid "Video size"
 msgstr "Taille vidéo"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr "Déficients Visuels"
 
@@ -1005,12 +1005,12 @@ msgid "frames per second"
 msgstr "images par seconde"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:140 src/lib/util.cc:143
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr "h"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr "m"
 
@@ -1041,7 +1041,7 @@ msgid "remaining"
 msgstr "restant"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:169
+#: src/lib/util.cc:168
 msgid "s"
 msgstr "s"
 
diff --git a/src/lib/po/it_IT.po b/src/lib/po/it_IT.po
index 107227999..1e0b02744 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-21 23:06+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+0100\n"
 "PO-Revision-Date: 2015-07-06 16:03+0100\n"
 "Last-Translator: William Fanelli <william.f@impronte.com>\n"
 "Language-Team: \n"
@@ -126,15 +126,15 @@ msgstr ""
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr ""
 
@@ -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:477
+#: src/lib/util.cc:476
 msgid "Centre"
 msgstr "Centro"
 
@@ -354,7 +354,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacciamento"
 
-#: src/lib/config.cc:438
+#: src/lib/config.cc:437
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -475,11 +475,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradiente debander"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr ""
 
@@ -499,11 +499,11 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:89
+#: src/lib/config.cc:88
 msgid "KDM delivery"
 msgstr ""
 
-#: src/lib/config.cc:214
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -511,35 +511,35 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Deinterlacciatore Kernel"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
 msgid "Left"
 msgstr "Sinistro"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:484
 msgid "Left rear surround"
 msgstr ""
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "Surround sinistro"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "Lfe(sub)"
 
@@ -563,7 +563,7 @@ msgstr ""
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr ""
 
@@ -651,7 +651,7 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Annuncio di pubblico servizio"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr ""
 
@@ -663,7 +663,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Punteggio"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr ""
 
@@ -675,23 +675,23 @@ msgstr ""
 msgid "Rec. 709"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
 msgid "Right"
 msgstr "Destro"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:486
+#: src/lib/util.cc:485
 msgid "Right rear surround"
 msgstr ""
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Surround destro"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr ""
 
@@ -847,7 +847,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr ""
 
@@ -864,7 +864,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr ""
 
@@ -994,12 +994,12 @@ msgid "frames per second"
 msgstr "fotogrammi al secondo"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:140 src/lib/util.cc:143
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -1030,7 +1030,7 @@ msgid "remaining"
 msgstr "restano"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:169
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/nl_NL.po b/src/lib/po/nl_NL.po
index b8822ef05..ecc993302 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-21 23:06+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+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"
@@ -127,15 +127,15 @@ msgstr ""
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr ""
 
@@ -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:477
+#: src/lib/util.cc:476
 msgid "Centre"
 msgstr "Midden"
 
@@ -355,7 +355,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "De-interlacing"
 
-#: src/lib/config.cc:438
+#: src/lib/config.cc:437
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -477,11 +477,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradient debander"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr "Slechthorenden"
 
@@ -501,12 +501,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:89
+#: src/lib/config.cc:88
 #, fuzzy
 msgid "KDM delivery"
 msgstr "KDM levering: $CPL_NAME"
 
-#: src/lib/config.cc:214
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr "KDM levering: $CPL_NAME"
 
@@ -514,35 +514,35 @@ msgstr "KDM levering: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Kernel deinterlacer"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
 msgid "Left"
 msgstr "Links"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr "Links midden"
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:484
 msgid "Left rear surround"
 msgstr "Links achter surround"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "links surround"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -566,7 +566,7 @@ msgstr ""
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr ""
 
@@ -658,7 +658,7 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Publieke Service aankondiging"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr ""
 
@@ -670,7 +670,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr ""
 
@@ -682,23 +682,23 @@ msgstr ""
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
 msgid "Right"
 msgstr "Rechts"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr "Rechts midden"
 
-#: src/lib/util.cc:486
+#: src/lib/util.cc:485
 msgid "Right rear surround"
 msgstr "Rechtsachter surround"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Rechts surround"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr ""
 
@@ -850,7 +850,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr ""
 
@@ -866,7 +866,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr "Slechtzienden"
 
@@ -996,12 +996,12 @@ msgid "frames per second"
 msgstr "frames per seconde"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:140 src/lib/util.cc:143
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -1032,7 +1032,7 @@ msgid "remaining"
 msgstr "resterend"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:169
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/pl_PL.po b/src/lib/po/pl_PL.po
index 712e2f3cf..1f2bcfe10 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-21 23:06+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+0100\n"
 "PO-Revision-Date: 2015-06-11 19:19+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -128,15 +128,15 @@ msgstr ""
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr ""
 
@@ -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:477
+#: src/lib/util.cc:476
 msgid "Centre"
 msgstr "Środek"
 
@@ -356,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:438
+#: src/lib/config.cc:437
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -479,11 +479,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Zachowaj przejścia tonalne"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr "Dla niesłyszących"
 
@@ -503,12 +503,12 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:89
+#: src/lib/config.cc:88
 #, fuzzy
 msgid "KDM delivery"
 msgstr "Wysyłka klucza: $CPL_NAME"
 
-#: src/lib/config.cc:214
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Wysyłka klucza: $CPL_NAME"
 
@@ -516,35 +516,35 @@ msgstr "Wysyłka klucza: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Usuwanie przeplotu metodą Kernel"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
 msgid "Left"
 msgstr "Lewy"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr "Lewy centralny"
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:484
 msgid "Left rear surround"
 msgstr "Lewy tylny surround"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "Lewy surround"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "Lfe (subwoofer)"
 
@@ -568,7 +568,7 @@ msgstr ""
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr ""
 
@@ -656,7 +656,7 @@ msgstr "Błąd programowania w lini %1:%2"
 msgid "Public Service Announcement"
 msgstr "Komunikat publiczny"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr ""
 
@@ -668,7 +668,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Klasyfikacja"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr ""
 
@@ -680,23 +680,23 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
 msgid "Right"
 msgstr "Prawy"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr "Prawy centralny"
 
-#: src/lib/util.cc:486
+#: src/lib/util.cc:485
 msgid "Right rear surround"
 msgstr "Prawy centralny surround"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Prawy surround"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr ""
 
@@ -848,7 +848,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr ""
 
@@ -864,7 +864,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr "Dla niedowidzących"
 
@@ -996,12 +996,12 @@ msgid "frames per second"
 msgstr "klatek na sekundę"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:140 src/lib/util.cc:143
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -1032,7 +1032,7 @@ msgid "remaining"
 msgstr "pozostało"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:169
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""
 
diff --git a/src/lib/po/ru_RU.po b/src/lib/po/ru_RU.po
index 6e14d25b3..b6790ef89 100644
--- a/src/lib/po/ru_RU.po
+++ b/src/lib/po/ru_RU.po
@@ -3,17 +3,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-16 23:48+0100\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: 2015-07-30 10:07+0100\n"
 "PO-Revision-Date: 2015-07-17 03:18-0400\n"
 "Last-Translator: Igor V <iva_co@ukr.net>\n"
 "Language-Team: Russian\n"
 "Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Zanata 3.6.2\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/lib/dcp_content.cc:112
 msgid "%1 [DCP]"
@@ -124,15 +124,15 @@ msgstr "BT709"
 msgid "Bits per pixel"
 msgstr "Бит на пиксель"
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr "BsL"
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr "BsR"
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr "C"
 
@@ -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:476
 msgid "Centre"
 msgstr "Центральный"
 
@@ -194,7 +194,6 @@ msgstr "Частота кадров контента:"
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr ""
 "Для присоединения контента должны быть такие же настройки \"вшить субтитры\"."
-""
 
 #: src/lib/subtitle_content.cc:120
 msgid "Content to be joined must have the same 'use subtitles' setting."
@@ -277,15 +276,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)"
 
@@ -309,7 +308,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 для отправки"
 
@@ -321,11 +320,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)"
 
@@ -363,7 +367,7 @@ msgstr ""
 msgid "De-interlacing"
 msgstr "Деинтерлейсинг"
 
-#: src/lib/config.cc:422
+#: src/lib/config.cc:437
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -421,14 +425,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 "Проверка контента"
@@ -437,7 +442,7 @@ msgstr "Проверка контента"
 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 "Ошибка аутентификации сервером (%1)"
 
@@ -485,11 +490,11 @@ msgstr "Гамма 28 (BT470BG)"
 msgid "Gradient debander"
 msgstr "Разбиение градиента"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr "HI"
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr "Для слабослышащих"
 
@@ -509,7 +514,12 @@ msgstr "IEC61966-2-4"
 msgid "It is not known what caused this error."
 msgstr "Неизвестно, что вызвало эту ошибку."
 
-#: src/lib/config.cc:199
+#: src/lib/config.cc:88
+#, fuzzy
+msgid "KDM delivery"
+msgstr "Назначение KDM: $CPL_NAME"
+
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr "Назначение KDM: $CPL_NAME"
 
@@ -517,35 +527,35 @@ msgstr "Назначение KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "Деинтерлейсинг ядром"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr "L"
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 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:474
 msgid "Left"
 msgstr "Левый"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr "Левый центральный"
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:484
 msgid "Left rear surround"
 msgstr "Левый тыловой surround"
 
-#: src/lib/util.cc:476
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "Левый surround"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr "НЧ"
 
-#: src/lib/util.cc:475
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "НЧ (sub)"
 
@@ -569,7 +579,7 @@ msgstr "Логарифмический (диапазон 100:1)"
 msgid "Logarithmic (316:1 range)"
 msgstr "Логарифмический (диапазон 316:1)"
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr "Ls"
 
@@ -657,7 +667,7 @@ msgstr "Ошибка програмиирования %1:%2"
 msgid "Public Service Announcement"
 msgstr "PSA (Социальная реклама)"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr "R"
 
@@ -669,7 +679,7 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
 msgid "Rating"
 msgstr "RTG (Рейтинг)"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr "Rc"
 
@@ -681,23 +691,23 @@ 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:475
 msgid "Right"
 msgstr "Правый"
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr "Правый центральный"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:485
 msgid "Right rear surround"
 msgstr "Правый тыловой surround"
 
-#: src/lib/util.cc:477
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Правый surround"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr "Rs"
 
@@ -714,7 +724,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 "Ошибка SSH (%1)"
 
@@ -851,7 +861,7 @@ msgstr "Преобразовать Л"
 msgid "Upmix R"
 msgstr "Преобразовать П"
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr "VI"
 
@@ -867,11 +877,11 @@ msgstr "Длительность видео"
 msgid "Video size"
 msgstr "Размер видео"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr "Для слабовидящих"
 
-#: src/lib/scp_dcp_job.cc:103
+#: src/lib/upload_job.cc:44
 msgid "Waiting"
 msgstr "Ожидание"
 
@@ -907,7 +917,7 @@ msgstr "не может содержать разрезы"
 msgid "connect timed out"
 msgstr "таймаут соединения"
 
-#: src/lib/scp_dcp_job.cc:127
+#: src/lib/uploader.cc:34
 msgid "connecting"
 msgstr "соединение"
 
@@ -919,7 +929,7 @@ msgstr "контейнер"
 msgid "content type"
 msgstr "тип контента"
 
-#: src/lib/scp_dcp_job.cc:176
+#: src/lib/uploader.cc:72
 msgid "copying %1"
 msgstr "копирование %1"
 
@@ -962,14 +972,13 @@ msgstr "не удалось запустить конвертер частоты
 #: src/lib/resampler.cc:77
 msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
 msgstr ""
-"не удалось запустить конвертер частоты дискретизации для %1 сэмплов (%2) "
-"(%3)"
+"не удалось запустить конвертер частоты дискретизации для %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-сессию"
 
@@ -1054,4 +1063,3 @@ msgstr "неизвестно"
 #: src/lib/video_content.cc:578
 msgid "video frames"
 msgstr "видеокадры"
-
diff --git a/src/lib/po/sv_SE.po b/src/lib/po/sv_SE.po
index e90c26e6a..85a267be1 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-21 23:06+0100\n"
+"POT-Creation-Date: 2015-07-30 10:07+0100\n"
 "PO-Revision-Date: 2014-01-19 08:59+0100\n"
 "Last-Translator: Adam Klotblixt <adam.klotblixt@gmail.com>\n"
 "Language-Team: \n"
@@ -129,15 +129,15 @@ msgstr ""
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/film.cc:1205
+#: src/lib/film.cc:1209
 msgid "BsL"
 msgstr ""
 
-#: src/lib/film.cc:1206
+#: src/lib/film.cc:1210
 msgid "BsR"
 msgstr ""
 
-#: src/lib/film.cc:1197
+#: src/lib/film.cc:1201
 msgid "C"
 msgstr ""
 
@@ -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:477
+#: src/lib/util.cc:476
 msgid "Centre"
 msgstr "Center"
 
@@ -372,7 +372,7 @@ msgid "De-interlacing"
 msgstr "Avflätning"
 
 # svåröversatt
-#: src/lib/config.cc:438
+#: src/lib/config.cc:437
 #, fuzzy
 msgid ""
 "Dear Projectionist\n"
@@ -492,11 +492,11 @@ msgstr ""
 msgid "Gradient debander"
 msgstr "Gradientutjämnare"
 
-#: src/lib/film.cc:1201
+#: src/lib/film.cc:1205
 msgid "HI"
 msgstr ""
 
-#: src/lib/util.cc:481
+#: src/lib/util.cc:480
 msgid "Hearing impaired"
 msgstr ""
 
@@ -516,11 +516,11 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr ""
 
-#: src/lib/config.cc:89
+#: src/lib/config.cc:88
 msgid "KDM delivery"
 msgstr ""
 
-#: src/lib/config.cc:214
+#: src/lib/config.cc:213
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
@@ -528,36 +528,36 @@ msgstr ""
 msgid "Kernel deinterlacer"
 msgstr "Kernel-avflätare"
 
-#: src/lib/film.cc:1195
+#: src/lib/film.cc:1199
 msgid "L"
 msgstr ""
 
-#: src/lib/film.cc:1203
+#: src/lib/film.cc:1207
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:475
+#: src/lib/mid_side_decoder.cc:92 src/lib/util.cc:474
 msgid "Left"
 msgstr "Vänster"
 
-#: src/lib/util.cc:483
+#: src/lib/util.cc:482
 msgid "Left centre"
 msgstr ""
 
-#: src/lib/util.cc:485
+#: src/lib/util.cc:484
 #, fuzzy
 msgid "Left rear surround"
 msgstr "Vänster surround"
 
-#: src/lib/util.cc:479
+#: src/lib/util.cc:478
 msgid "Left surround"
 msgstr "Vänster surround"
 
-#: src/lib/film.cc:1198
+#: src/lib/film.cc:1202
 msgid "Lfe"
 msgstr ""
 
-#: src/lib/util.cc:478
+#: src/lib/util.cc:477
 msgid "Lfe (sub)"
 msgstr "Lfe (sub)"
 
@@ -582,7 +582,7 @@ msgstr ""
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/film.cc:1199
+#: src/lib/film.cc:1203
 msgid "Ls"
 msgstr ""
 
@@ -673,7 +673,7 @@ msgstr ""
 msgid "Public Service Announcement"
 msgstr "Public Service Announcement"
 
-#: src/lib/film.cc:1196
+#: src/lib/film.cc:1200
 msgid "R"
 msgstr ""
 
@@ -685,7 +685,7 @@ msgstr ""
 msgid "Rating"
 msgstr "Rating"
 
-#: src/lib/film.cc:1204
+#: src/lib/film.cc:1208
 msgid "Rc"
 msgstr ""
 
@@ -698,24 +698,24 @@ msgstr "Rec. 709"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:476
+#: src/lib/mid_side_decoder.cc:93 src/lib/util.cc:475
 msgid "Right"
 msgstr "Höger"
 
-#: src/lib/util.cc:484
+#: src/lib/util.cc:483
 msgid "Right centre"
 msgstr ""
 
-#: src/lib/util.cc:486
+#: src/lib/util.cc:485
 #, fuzzy
 msgid "Right rear surround"
 msgstr "Höger surround"
 
-#: src/lib/util.cc:480
+#: src/lib/util.cc:479
 msgid "Right surround"
 msgstr "Höger surround"
 
-#: src/lib/film.cc:1200
+#: src/lib/film.cc:1204
 msgid "Rs"
 msgstr ""
 
@@ -871,7 +871,7 @@ msgstr ""
 msgid "Upmix R"
 msgstr ""
 
-#: src/lib/film.cc:1202
+#: src/lib/film.cc:1206
 msgid "VI"
 msgstr ""
 
@@ -888,7 +888,7 @@ msgstr ""
 msgid "Video size"
 msgstr ""
 
-#: src/lib/util.cc:482
+#: src/lib/util.cc:481
 msgid "Visually impaired"
 msgstr ""
 
@@ -1023,12 +1023,12 @@ msgid "frames per second"
 msgstr "bilder per sekund"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:140 src/lib/util.cc:143
+#: src/lib/util.cc:139 src/lib/util.cc:142
 msgid "h"
 msgstr ""
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:155 src/lib/util.cc:158
+#: src/lib/util.cc:154 src/lib/util.cc:157
 msgid "m"
 msgstr ""
 
@@ -1060,7 +1060,7 @@ msgid "remaining"
 msgstr "återstående tid"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:169
+#: src/lib/util.cc:168
 msgid "s"
 msgstr ""