1 files changed, 46 insertions, 35 deletions
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"