pot/merge.

1 files changed, 88 insertions, 67 deletions

diff --git a/src/tools/po/fr_FR.po b/src/tools/po/fr_FR.po
index 551338c97..b6c58dfaa 100644
--- a/src/tools/po/fr_FR.po
+++ b/src/tools/po/fr_FR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-o-matic FRENCH\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-10 09:55+0000\n"
+"POT-Creation-Date: 2018-01-13 01:41+0000\n"
 "PO-Revision-Date: 2017-11-07 23:37+0100\n"
 "Last-Translator: Grégoire AUSINA <gregoire@gisele-productions.eu>\n"
 "Language-Team: \n"
@@ -31,17 +31,17 @@ msgstr "%d KDMs créées dans %s"
 msgid "&Add Film...\tCtrl-A"
 msgstr "& Ajouter Film ... Ctrl-A"
 
-#: src/tools/dcpomatic_player.cc:176
+#: src/tools/dcpomatic_player.cc:179
 #, fuzzy
 msgid "&Add KDM..."
 msgstr "Ajouter Film..."
 
-#: src/tools/dcpomatic_player.cc:175
+#: src/tools/dcpomatic_player.cc:178
 #, fuzzy
 msgid "&Add OV..."
 msgstr "Ajouter Film..."
 
-#: src/tools/dcpomatic_player.cc:178
+#: src/tools/dcpomatic_player.cc:181
 msgid "&Close"
 msgstr ""
 
@@ -50,22 +50,22 @@ msgid "&Content"
 msgstr "&Contenu"
 
 #: src/tools/dcpomatic.cc:1096 src/tools/dcpomatic_batch.cc:85
-#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_player.cc:213
+#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_player.cc:216
 msgid "&Edit"
 msgstr "&Edition"
 
 #: src/tools/dcpomatic.cc:1047 src/tools/dcpomatic_batch.cc:65
-#: src/tools/dcpomatic_kdm.cc:229 src/tools/dcpomatic_player.cc:182
+#: src/tools/dcpomatic_kdm.cc:229 src/tools/dcpomatic_player.cc:185
 msgid "&Exit"
 msgstr "&Quitter"
 
 #: src/tools/dcpomatic.cc:1095 src/tools/dcpomatic_batch.cc:83
-#: src/tools/dcpomatic_kdm.cc:249 src/tools/dcpomatic_player.cc:211
+#: src/tools/dcpomatic_kdm.cc:249 src/tools/dcpomatic_player.cc:214
 msgid "&File"
 msgstr "&Fichier"
 
 #: src/tools/dcpomatic.cc:1100 src/tools/dcpomatic_batch.cc:88
-#: src/tools/dcpomatic_kdm.cc:253 src/tools/dcpomatic_player.cc:217
+#: src/tools/dcpomatic_kdm.cc:253 src/tools/dcpomatic_player.cc:220
 msgid "&Help"
 msgstr "&Aide"
 
@@ -77,19 +77,19 @@ msgstr "&Travaux"
 msgid "&Make DCP\tCtrl-M"
 msgstr "&Créer le DCP\tCtrl-M"
 
-#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_player.cc:174
+#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_player.cc:177
 msgid "&Open...\tCtrl-O"
 msgstr "&Ouvrir...\tCtrl-O"
 
 #: src/tools/dcpomatic.cc:1057 src/tools/dcpomatic.cc:1059
 #: src/tools/dcpomatic_batch.cc:71 src/tools/dcpomatic_batch.cc:74
 #: src/tools/dcpomatic_kdm.cc:235 src/tools/dcpomatic_kdm.cc:238
-#: src/tools/dcpomatic_player.cc:188 src/tools/dcpomatic_player.cc:191
+#: src/tools/dcpomatic_player.cc:191 src/tools/dcpomatic_player.cc:194
 msgid "&Preferences...\tCtrl-P"
 msgstr "&Préférences...\tCtrl-P"
 
 #: src/tools/dcpomatic.cc:1049 src/tools/dcpomatic_batch.cc:67
-#: src/tools/dcpomatic_kdm.cc:231 src/tools/dcpomatic_player.cc:184
+#: src/tools/dcpomatic_kdm.cc:231 src/tools/dcpomatic_player.cc:187
 msgid "&Quit"
 msgstr "&Quitter"
 
@@ -102,21 +102,21 @@ msgid "&Send DCP to TMS"
 msgstr "&Envoyer le DCP au TMS"
 
 #: src/tools/dcpomatic.cc:1099 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_player.cc:216
+#: src/tools/dcpomatic_player.cc:219
 msgid "&Tools"
 msgstr "&Outils"
 
-#: src/tools/dcpomatic_player.cc:215
+#: src/tools/dcpomatic_player.cc:218
 msgid "&View"
 msgstr ""
 
 #: src/tools/dcpomatic.cc:1091 src/tools/dcpomatic_batch.cc:81
-#: src/tools/dcpomatic_kdm.cc:245 src/tools/dcpomatic_player.cc:207
+#: src/tools/dcpomatic_kdm.cc:245 src/tools/dcpomatic_player.cc:210
 msgid "About"
 msgstr "A propos"
 
 #: src/tools/dcpomatic.cc:1089 src/tools/dcpomatic_kdm.cc:243
-#: src/tools/dcpomatic_player.cc:205
+#: src/tools/dcpomatic_player.cc:208
 msgid "About DCP-o-matic"
 msgstr "À propos de DCP-o-matic"
 
@@ -132,8 +132,8 @@ msgstr "Ajouter dossier.."
 msgid "Add..."
 msgstr "Ajouter..."
 
-#: src/tools/dcpomatic.cc:1360 src/tools/dcpomatic_kdm.cc:619
-#: src/tools/dcpomatic_player.cc:512
+#: src/tools/dcpomatic.cc:1360 src/tools/dcpomatic_kdm.cc:617
+#: src/tools/dcpomatic_player.cc:526
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -142,8 +142,8 @@ msgstr ""
 "Erreur constatée: %s (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1369 src/tools/dcpomatic_kdm.cc:628
-#: src/tools/dcpomatic_player.cc:521
+#: src/tools/dcpomatic.cc:1369 src/tools/dcpomatic_kdm.cc:626
+#: src/tools/dcpomatic_player.cc:535
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -157,8 +157,8 @@ msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "Erreur inconnue avec le server DCP-o-matic"
 
 #: src/tools/dcpomatic.cc:740 src/tools/dcpomatic.cc:1374
-#: src/tools/dcpomatic_kdm.cc:361 src/tools/dcpomatic_kdm.cc:633
-#: src/tools/dcpomatic_kdm.cc:642 src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_kdm.cc:361 src/tools/dcpomatic_kdm.cc:631
+#: src/tools/dcpomatic_kdm.cc:640 src/tools/dcpomatic_player.cc:540
 msgid "An unknown exception occurred."
 msgstr "Exception inconnue"
 
@@ -171,15 +171,15 @@ msgstr ""
 "pourrez pas revenir en arrière."
 
 #: src/tools/dcpomatic.cc:630
-#, c-format
-msgid "Bad setting for %s (%s)"
+#, fuzzy, c-format
+msgid "Bad setting for %s."
 msgstr "Mauvais paramètres pour %s (%s)"
 
 #: src/tools/dcpomatic.cc:736 src/tools/dcpomatic_kdm.cc:357
 msgid "CPL's content is not encrypted."
 msgstr "Le contenu du CPL n'est pas crypté."
 
-#: src/tools/dcpomatic.cc:1083 src/tools/dcpomatic_player.cc:201
+#: src/tools/dcpomatic.cc:1083 src/tools/dcpomatic_player.cc:204
 msgid "Check for updates"
 msgstr "Recherche mises à jour"
 
@@ -191,7 +191,7 @@ msgstr "Fermer sans sauvegarder le film"
 msgid "Copy settings\tCtrl-C"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:435
+#: src/tools/dcpomatic_kdm.cc:433
 msgid ""
 "Could not decrypt the DKDM.  Perhaps it was not created with the correct "
 "certificate."
@@ -201,54 +201,65 @@ msgstr ""
 msgid "Could not find batch converter."
 msgstr "Convertisseur par lots introuvable"
 
-#: src/tools/dcpomatic_player.cc:471
-msgid "Could not load DCP %1 (%2)"
-msgstr ""
+#: src/tools/dcpomatic_player.cc:485
+#, fuzzy
+msgid "Could not load DCP %1."
+msgstr "N'a pas pu créer le DCP: %s."
 
-#: src/tools/dcpomatic_player.cc:288
-#, c-format
-msgid "Could not load KDM (%s)"
-msgstr ""
+#: src/tools/dcpomatic_player.cc:294
+#, fuzzy
+msgid "Could not load KDM."
+msgstr "Ouverture du DCP impossible"
 
-#: src/tools/dcpomatic.cc:1288 src/tools/dcpomatic_batch.cc:342
+#: src/tools/dcpomatic_batch.cc:341
+#, fuzzy
+msgid "Could not load film %1"
+msgstr "Impossible de charger le film %1 (%2)"
+
+#: src/tools/dcpomatic.cc:1288
 msgid "Could not load film %1 (%2)"
 msgstr "Impossible de charger le film %1 (%2)"
 
 #: src/tools/dcpomatic.cc:632
-#, c-format
-msgid "Could not make DCP: %s."
+#, fuzzy
+msgid "Could not make DCP."
 msgstr "N'a pas pu créer le DCP: %s."
 
 #: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:140
-#, c-format
-msgid "Could not open film at %s (%s)"
+#, fuzzy, c-format
+msgid "Could not open film at %s"
 msgstr "Impossible d'ouvrir le film à %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:427
-#, c-format
+#: src/tools/dcpomatic_kdm.cc:426
+#, fuzzy
 msgid ""
 "Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
-"at all.\n"
-"\n"
-"%s"
+"at all."
 msgstr ""
 "Lecture du fichier KDM impossible. Peut-être est il mal formaté ou peut-être "
 "ne s'agit il pas du tout d'une KDM.\n"
 "\n"
 "%s"
 
-#: src/tools/dcpomatic.cc:819
-msgid "Could not show DCP"
-msgstr "Ouverture du DCP impossible"
-
 #: src/tools/dcpomatic.cc:810
-msgid "Could not show DCP (could not run konqueror)"
+#, fuzzy
+msgid "Could not run konqueror"
 msgstr "Ouverture du DCP impossible (konqueror est introuvable)"
 
 #: src/tools/dcpomatic.cc:803
-msgid "Could not show DCP (could not run nautilus)"
+#, fuzzy
+msgid "Could not run nautilus"
 msgstr "Ouverture du DCP impossible (nautilus est introuvable)"
 
+#: src/tools/dcpomatic.cc:810 src/tools/dcpomatic.cc:819
+msgid "Could not show DCP"
+msgstr "Ouverture du DCP impossible"
+
+#: src/tools/dcpomatic.cc:803
+#, fuzzy
+msgid "Could not show DCP."
+msgstr "Ouverture du DCP impossible"
+
 #: src/tools/dcpomatic.cc:1113
 #, c-format
 msgid ""
@@ -257,7 +268,7 @@ msgstr ""
 "Ecriture dans le fichier cinemas à %s impossible. Vos modifications n'ont pu "
 "être sauvegardées."
 
-#: src/tools/dcpomatic.cc:1125 src/tools/dcpomatic_player.cc:378
+#: src/tools/dcpomatic.cc:1125 src/tools/dcpomatic_player.cc:384
 #, c-format
 msgid ""
 "Could not write to config file at %s.  Your changes have not been saved."
@@ -282,29 +293,39 @@ msgstr "DCP-o-matic - Convertisseur par lots"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic Serveur d'Encodage"
 
-#: src/tools/dcpomatic_kdm.cc:555 src/tools/dcpomatic_kdm.cc:591
+#: src/tools/dcpomatic_kdm.cc:553 src/tools/dcpomatic_kdm.cc:589
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic Créateur de KDM"
 
-#: src/tools/dcpomatic_player.cc:78 src/tools/dcpomatic_player.cc:143
-#: src/tools/dcpomatic_player.cc:421
+#: src/tools/dcpomatic_player.cc:78 src/tools/dcpomatic_player.cc:144
+#: src/tools/dcpomatic_player.cc:435
 #, fuzzy
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic"
 
+#: src/tools/dcpomatic_player.cc:499
+#, fuzzy
+msgid "DCP-o-matic Player could not start."
+msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
+
+#: src/tools/dcpomatic_kdm.cc:604
+#, fuzzy
+msgid "DCP-o-matic could not start"
+msgstr "DCP-o-matic"
+
 #: src/tools/dcpomatic_kdm.cc:145
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic_player.cc:196
+#: src/tools/dcpomatic_player.cc:199
 msgid "Decode at full resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:197
+#: src/tools/dcpomatic_player.cc:200
 msgid "Decode at half resolution"
 msgstr ""
 
-#: src/tools/dcpomatic_player.cc:198
+#: src/tools/dcpomatic_player.cc:201
 msgid "Decode at quarter resolution"
 msgstr ""
 
@@ -369,7 +390,7 @@ msgstr "Conseils...\tCtrl-H"
 msgid "KDM|Timing"
 msgstr "Durées"
 
-#: src/tools/dcpomatic_player.cc:143
+#: src/tools/dcpomatic_player.cc:144
 msgid "Loading DCP"
 msgstr ""
 
@@ -411,7 +432,7 @@ msgid "Remove"
 msgstr "Supprimer"
 
 #: src/tools/dcpomatic.cc:1093 src/tools/dcpomatic_kdm.cc:247
-#: src/tools/dcpomatic_player.cc:209
+#: src/tools/dcpomatic_player.cc:212
 msgid "Report a problem..."
 msgstr "Signaler un problème"
 
@@ -457,12 +478,12 @@ msgstr "Adapter pour remplir largeur"
 msgid "Screens"
 msgstr "Ecrans"
 
-#: src/tools/dcpomatic_player.cc:227
+#: src/tools/dcpomatic_player.cc:230
 #, fuzzy
 msgid "Select DCP to open"
 msgstr "Sélectionner le film à ouvrir"
 
-#: src/tools/dcpomatic_player.cc:252
+#: src/tools/dcpomatic_player.cc:255
 #, fuzzy
 msgid "Select DCP to open as OV"
 msgstr "Sélectionner le film à ouvrir"
@@ -471,7 +492,7 @@ msgstr "Sélectionner le film à ouvrir"
 msgid "Select DKDM file"
 msgstr "Sélectionner le fichier DKDM"
 
-#: src/tools/dcpomatic_player.cc:280
+#: src/tools/dcpomatic_player.cc:284
 #, fuzzy
 msgid "Select KDM"
 msgstr "Sélectionner le fichier DKDM"
@@ -484,7 +505,7 @@ msgstr "Sélectionner le film à ouvrir"
 msgid "Send KDM emails"
 msgstr "Envoyer les e-mails de KDM"
 
-#: src/tools/dcpomatic_player.cc:195
+#: src/tools/dcpomatic_player.cc:198
 msgid "Set decode resolution to match display"
 msgstr ""
 
@@ -510,13 +531,13 @@ msgstr ""
 "Le DCP de ce film pèsera environ %.1f Go. Le disque que vous utilisez n'a "
 "que %.1f Go disponible(s). Souhaitez-vous continuer?"
 
-#: src/tools/dcpomatic.cc:1183 src/tools/dcpomatic_player.cc:361
+#: src/tools/dcpomatic.cc:1183 src/tools/dcpomatic_player.cc:367
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "Le serveur de téléchargement de DCP-o-matic ne peut être contacté."
 
-#: src/tools/dcpomatic.cc:1407 src/tools/dcpomatic_batch.cc:376
-#: src/tools/dcpomatic_kdm.cc:652 src/tools/dcpomatic_server.cc:333
-#: src/tools/dcpomatic_player.cc:550
+#: src/tools/dcpomatic.cc:1407 src/tools/dcpomatic_batch.cc:373
+#: src/tools/dcpomatic_kdm.cc:650 src/tools/dcpomatic_server.cc:333
+#: src/tools/dcpomatic_player.cc:564
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
@@ -524,7 +545,7 @@ msgstr ""
 "La configuration existante n'a pu être chargée. Les paramètres par défaut "
 "seront utilisés à la place. Cela peut prendre un peu de temps."
 
-#: src/tools/dcpomatic.cc:1185 src/tools/dcpomatic_player.cc:363
+#: src/tools/dcpomatic.cc:1185 src/tools/dcpomatic_player.cc:369
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "Pas de mise à jour disponible de DCP-o-matic pour l'instant."
 
@@ -586,7 +607,7 @@ msgstr ""
 "\">SAUVEGARDES</span>  si vous souhaitez créer des KDMs pour ce projet."
 
 #: src/tools/dcpomatic.cc:446 src/tools/dcpomatic_batch.cc:226
-#: src/tools/dcpomatic_player.cc:233 src/tools/dcpomatic_player.cc:261
+#: src/tools/dcpomatic_player.cc:236 src/tools/dcpomatic_player.cc:264
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."