pot/merge.

1 files changed, 194 insertions, 193 deletions

diff --git a/src/lib/po/tr_TR.po b/src/lib/po/tr_TR.po
index f1ce582d3..ef67705ca 100644
--- a/src/lib/po/tr_TR.po
+++ b/src/lib/po/tr_TR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-10 02:17+0200\n"
+"POT-Creation-Date: 2021-05-07 00:32+0200\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"
@@ -56,11 +56,11 @@ msgstr ""
 
 #. / TRANSLATORS: the %1 in this string will be filled in with a day of the week
 #. / to say what day a job will finish.
-#: src/lib/job.cc:489
+#: src/lib/job.cc:491
 msgid " on %1"
 msgstr ""
 
-#: src/lib/config.cc:1125
+#: src/lib/config.cc:1121
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -73,15 +73,15 @@ msgid ""
 "Size: $SIZE\n"
 msgstr ""
 
-#: src/lib/config.cc:1103
+#: src/lib/config.cc:1099
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr ""
 
-#: src/lib/cross_common.cc:91
+#: src/lib/cross_common.cc:94
 msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
-#: src/lib/atmos_mxf_content.cc:88
+#: src/lib/atmos_mxf_content.cc:96
 msgid "%1 [Atmos]"
 msgstr ""
 
@@ -97,7 +97,7 @@ msgstr ""
 msgid "%1 [movie]"
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:343 src/lib/video_mxf_content.cc:97
+#: src/lib/ffmpeg_content.cc:343 src/lib/video_mxf_content.cc:105
 msgid "%1 [video]"
 msgstr ""
 
@@ -146,11 +146,11 @@ msgstr ""
 msgid "2.39 (Scope)"
 msgstr ""
 
-#: src/lib/filter.cc:77
+#: src/lib/filter.cc:84
 msgid "3D denoiser"
 msgstr ""
 
-#: src/lib/hints.cc:206
+#: src/lib/hints.cc:211
 msgid ""
 "4K 3D is only supported by a very limited number of projectors.  Unless you "
 "know that you will play this DCP back on a capable projector, it is "
@@ -158,16 +158,16 @@ msgid ""
 msgstr ""
 
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:145
+#: src/lib/transcode_job.cc:155
 #, c-format
 msgid "; %.1f fps"
 msgstr ""
 
-#: src/lib/job.cc:494
+#: src/lib/job.cc:496
 msgid "; %1 remaining; finishing at %2%3"
 msgstr ""
 
-#: src/lib/analytics.cc:60
+#: src/lib/analytics.cc:64
 msgid ""
 "<h2>You have made %1 DCPs with DCP-o-matic!</h2><img width=\"20%%\" src="
 "\"memory:me.jpg\" align=\"center\"><p>Hello. I'm Carl and I'm the developer "
@@ -182,7 +182,7 @@ msgid ""
 "Paypal to donate €10</a></ul><p>Thank you!"
 msgstr ""
 
-#: src/lib/hints.cc:163
+#: src/lib/hints.cc:168
 msgid ""
 "A few projectors have problems playing back very high bit-rate DCPs.  It is "
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
@@ -193,11 +193,11 @@ msgstr ""
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:54
+#: src/lib/dcp_content_type.cc:60
 msgid "Advertisement"
 msgstr ""
 
-#: src/lib/hints.cc:140
+#: src/lib/hints.cc:145
 msgid ""
 "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
@@ -205,78 +205,78 @@ msgid ""
 "tab."
 msgstr ""
 
-#: src/lib/hints.cc:144
+#: src/lib/hints.cc:149
 msgid ""
 "All of your content narrower than 1.90:1 but your DCP's container is Scope "
 "(2.39:1).  This will pillar-box your content.  You may prefer to set your "
 "DCP's container to have the same ratio as your content."
 msgstr ""
 
-#: src/lib/job.cc:104
+#: src/lib/job.cc:106
 msgid "An error occurred whilst handling the file %1."
 msgstr ""
 
-#: src/lib/analyse_audio_job.cc:136
+#: src/lib/analyse_audio_job.cc:70
 msgid "Analysing audio"
 msgstr ""
 
-#: src/lib/analyse_subtitles_job.cc:52
+#: src/lib/analyse_subtitles_job.cc:55
 msgid "Analysing subtitles"
 msgstr ""
 
-#: src/lib/hints.cc:358
+#: src/lib/hints.cc:367
 msgid ""
 "At least one marker comes after the end of the project and will be ignored."
 msgstr ""
 
-#: src/lib/hints.cc:449
+#: src/lib/hints.cc:471
 msgid "At least one of your closed caption files is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:442
+#: src/lib/hints.cc:464
 msgid "At least one of your closed caption files' XML part is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:457
+#: src/lib/hints.cc:479
 msgid "At least one of your subtitle files is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:559
+#: src/lib/hints.cc:443
 msgid ""
 "At least one of your subtitle lines has more than 52 characters.  It is "
 "recommended to make each line 52 characters at most in length."
 msgstr ""
 
-#: src/lib/hints.cc:564
+#: src/lib/hints.cc:445
 msgid ""
 "At least one of your subtitle lines has more than 79 characters.  You should "
 "make each line 79 characters at most in length."
 msgstr ""
 
-#: src/lib/hints.cc:549
+#: src/lib/hints.cc:588
 msgid ""
 "At least one of your subtitles has more than 3 lines.  It is advisable to "
 "use no more than 3 lines."
 msgstr ""
 
-#: src/lib/hints.cc:539
+#: src/lib/hints.cc:578
 msgid ""
 "At least one of your subtitles lasts less than 15 frames.  It is advisable "
 "to make each subtitle at least 15 frames long."
 msgstr ""
 
-#: src/lib/hints.cc:544
+#: src/lib/hints.cc:583
 msgid ""
 "At least one of your subtitles starts less than 2 frames after the previous "
 "one.  It is advisable to make the gap between subtitles at least 2 frames."
 msgstr ""
 
-#: src/lib/hints.cc:594
+#: src/lib/hints.cc:631
 msgid ""
 "At least one piece of subtitle or closed caption content has no specified "
 "language.  It is advisable to set the language for each piece of subtitle or "
 "closed caption content in the \"Content→Timed text\", \"Content→Open "
-"subtitles\" or \"Content→Closed captions\" tab"
+"subtitles\" or \"Content→Closed captions\" tab."
 msgstr ""
 
 #: src/lib/audio_content.cc:291
@@ -340,7 +340,7 @@ msgstr ""
 msgid "Bits per pixel"
 msgstr ""
 
-#: src/lib/filter.cc:73
+#: src/lib/filter.cc:80
 msgid "Bob Weaver Deinterlacing Filter"
 msgstr ""
 
@@ -356,19 +356,19 @@ msgstr ""
 msgid "C"
 msgstr ""
 
-#: src/lib/job.cc:503
+#: src/lib/job.cc:505
 msgid "Cancelled"
 msgstr ""
 
-#: src/lib/film.cc:356
+#: src/lib/film.cc:363
 msgid "Cannot contain slashes"
 msgstr ""
 
-#: src/lib/exceptions.cc:70
+#: src/lib/exceptions.cc:78
 msgid "Cannot handle pixel format %1 during %2"
 msgstr ""
 
-#: src/lib/film.cc:1647
+#: src/lib/film.cc:1654
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr ""
 
@@ -384,7 +384,7 @@ msgstr ""
 msgid "Checking content for changes"
 msgstr ""
 
-#: src/lib/reel_writer.cc:248
+#: src/lib/reel_writer.cc:250
 msgid "Checking existing image data"
 msgstr ""
 
@@ -440,15 +440,15 @@ msgstr ""
 msgid "Computing digest"
 msgstr ""
 
-#: src/lib/writer.cc:567
+#: src/lib/writer.cc:535
 msgid "Computing digests"
 msgstr ""
 
-#: src/lib/analytics.cc:58
+#: src/lib/analytics.cc:62
 msgid "Congratulations!"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:101
+#: src/lib/frame_rate_change.cc:90
 msgid "Content and DCP have the same rate.\n"
 msgstr ""
 
@@ -585,19 +585,19 @@ msgstr ""
 msgid "Copy DCP to TMS"
 msgstr ""
 
-#: src/lib/reel_writer.cc:132
+#: src/lib/reel_writer.cc:134
 msgid "Copying old video file"
 msgstr ""
 
-#: src/lib/reel_writer.cc:387
+#: src/lib/reel_writer.cc:389
 msgid "Copying video file into DCP"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:52
+#: src/lib/scp_uploader.cc:55
 msgid "Could not connect to server %1 (%2)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:91
+#: src/lib/scp_uploader.cc:96
 msgid "Could not create remote directory %1 (%2)"
 msgstr ""
 
@@ -605,49 +605,49 @@ msgstr ""
 msgid "Could not decode JPEG2000 file %1 (%2)"
 msgstr ""
 
-#: src/lib/ffmpeg_image_proxy.cc:161
+#: src/lib/ffmpeg_image_proxy.cc:166
 msgid "Could not decode image (%1)"
 msgstr ""
 
-#: src/lib/encode_server_finder.cc:178
+#: src/lib/encode_server_finder.cc:191
 msgid ""
 "Could not listen for remote encode servers.  Perhaps another instance of DCP-"
 "o-matic is running."
 msgstr ""
 
-#: src/lib/job.cc:159 src/lib/job.cc:174
+#: src/lib/job.cc:161 src/lib/job.cc:176
 msgid "Could not open %1"
 msgstr ""
 
-#: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:104
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:110
 msgid "Could not open %1 to send"
 msgstr ""
 
-#: src/lib/internet.cc:159 src/lib/internet.cc:164
+#: src/lib/internet.cc:164 src/lib/internet.cc:169
 msgid "Could not open downloaded ZIP file"
 msgstr ""
 
-#: src/lib/internet.cc:171
+#: src/lib/internet.cc:176
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr ""
 
-#: src/lib/config.cc:989
+#: src/lib/config.cc:985
 msgid "Could not open file for writing"
 msgstr ""
 
-#: src/lib/dcp_subtitle.cc:55
-msgid "Could not read subtitles (%1 / %2)"
+#: src/lib/ffmpeg_file_encoder.cc:266
+msgid "Could not open output file %1 (%2)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:74
-msgid "Could not start SCP session (%1)"
+#: src/lib/dcp_subtitle.cc:59
+msgid "Could not read subtitles (%1 / %2)"
 msgstr ""
 
-#: src/lib/curl_uploader.cc:49
+#: src/lib/curl_uploader.cc:50
 msgid "Could not start transfer"
 msgstr ""
 
-#: src/lib/curl_uploader.cc:93 src/lib/scp_uploader.cc:121
+#: src/lib/curl_uploader.cc:97 src/lib/scp_uploader.cc:127
 msgid "Could not write to remote file (%1)"
 msgstr ""
 
@@ -683,28 +683,28 @@ msgstr ""
 msgid "DCP sample rate"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:114
+#: src/lib/frame_rate_change.cc:103
 #, c-format
 msgid "DCP will run at %.1f%% of the content speed.\n"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:104
+#: src/lib/frame_rate_change.cc:93
 msgid "DCP will use every other frame of the content.\n"
 msgstr ""
 
-#: src/lib/job.cc:161 src/lib/job.cc:176
+#: src/lib/job.cc:163 src/lib/job.cc:178
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."
 msgstr ""
 
-#: src/lib/film.cc:1550
+#: src/lib/film.cc:1557
 msgid ""
 "DCP-o-matic had to change your settings for referring to DCPs as OV.  Please "
 "review those settings to make sure they are what you want."
 msgstr ""
 
-#: src/lib/film.cc:1518
+#: src/lib/film.cc:1525
 msgid ""
 "DCP-o-matic had to change your settings so that the film's frame rate is the "
 "same as that of your Atmos content."
@@ -715,20 +715,20 @@ msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr ""
 
-#: src/lib/config.cc:353 src/lib/config.cc:1100
+#: src/lib/config.cc:352 src/lib/config.cc:1096
 msgid "DCP-o-matic notification"
 msgstr ""
 
-#: src/lib/datasat_ap2x.cc:26
+#: src/lib/datasat_ap2x.cc:28
 msgid "Datasat AP20 or AP25"
 msgstr ""
 
-#: src/lib/filter.cc:70 src/lib/filter.cc:71 src/lib/filter.cc:72
-#: src/lib/filter.cc:73 src/lib/filter.cc:74
+#: src/lib/filter.cc:77 src/lib/filter.cc:78 src/lib/filter.cc:79
+#: src/lib/filter.cc:80 src/lib/filter.cc:81
 msgid "De-interlacing"
 msgstr ""
 
-#: src/lib/config.cc:1088
+#: src/lib/config.cc:1084
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -743,19 +743,19 @@ msgid ""
 "DCP-o-matic"
 msgstr ""
 
-#: src/lib/dolby_cp750.cc:28
+#: src/lib/dolby_cp750.cc:31
 msgid "Dolby CP650 or CP750"
 msgstr ""
 
-#: src/lib/internet.cc:116
+#: src/lib/internet.cc:121
 msgid "Download failed (%1 error %2)"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:106
+#: src/lib/frame_rate_change.cc:95
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr ""
 
-#: src/lib/frame_rate_change.cc:108
+#: src/lib/frame_rate_change.cc:97
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr ""
 
@@ -767,15 +767,15 @@ msgstr ""
 msgid "Email KDMs for %2"
 msgstr ""
 
-#: src/lib/send_notification_email_job.cc:50
+#: src/lib/send_notification_email_job.cc:55
 msgid "Email notification"
 msgstr ""
 
-#: src/lib/send_problem_report_job.cc:63
+#: src/lib/send_problem_report_job.cc:68
 msgid "Email problem report"
 msgstr ""
 
-#: src/lib/send_problem_report_job.cc:66
+#: src/lib/send_problem_report_job.cc:71
 msgid "Email problem report for %1"
 msgstr ""
 
@@ -783,20 +783,20 @@ msgstr ""
 msgid "Encoding"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:55
+#: src/lib/dcp_content_type.cc:61
 msgid "Episode"
 msgstr ""
 
-#: src/lib/exceptions.cc:76
+#: src/lib/exceptions.cc:85
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr ""
 
-#: src/lib/job.cc:501
+#: src/lib/job.cc:503
 msgid "Error: %1"
 msgstr ""
 
-#: src/lib/hints.cc:391
-msgid "Examining closed captions"
+#: src/lib/hints.cc:406
+msgid "Examining audio, subtitles and closed captions"
 msgstr ""
 
 #: src/lib/examine_content_job.cc:49
@@ -807,7 +807,11 @@ msgstr ""
 msgid "Examining subtitles"
 msgstr ""
 
-#: src/lib/subtitle_encoder.cc:94
+#: src/lib/hints.cc:404
+msgid "Examining subtitles and closed captions"
+msgstr ""
+
+#: src/lib/subtitle_encoder.cc:98
 msgid "Extracting"
 msgstr ""
 
@@ -815,19 +819,19 @@ msgstr ""
 msgid "FCC"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:64
+#: src/lib/scp_uploader.cc:67
 msgid "Failed to authenticate with server (%1)"
 msgstr ""
 
-#: src/lib/job.cc:128 src/lib/job.cc:138
+#: src/lib/job.cc:130 src/lib/job.cc:140
 msgid "Failed to encode the DCP."
 msgstr ""
 
-#: src/lib/emailer.cc:223
+#: src/lib/emailer.cc:234
 msgid "Failed to send email"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:45
+#: src/lib/dcp_content_type.cc:51
 msgid "Feature"
 msgstr ""
 
@@ -839,7 +843,7 @@ msgstr ""
 msgid "Film"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:112
+#: src/lib/ffmpeg_examiner.cc:113
 msgid "Finding length"
 msgstr ""
 
@@ -887,7 +891,7 @@ msgstr ""
 msgid "Gamma 28 (BT470BG)"
 msgstr ""
 
-#: src/lib/filter.cc:75
+#: src/lib/filter.cc:82
 msgid "Gradient debander"
 msgstr ""
 
@@ -899,11 +903,11 @@ msgstr ""
 msgid "Hearing impaired"
 msgstr ""
 
-#: src/lib/filter.cc:78
+#: src/lib/filter.cc:85
 msgid "High quality 3D denoiser"
 msgstr ""
 
-#: src/lib/filter.cc:67
+#: src/lib/filter.cc:74
 msgid "Horizontal flip"
 msgstr ""
 
@@ -919,24 +923,24 @@ msgstr ""
 msgid "IEC61966-2-4"
 msgstr ""
 
-#: src/lib/hints.cc:182
+#: src/lib/hints.cc:187
 msgid "If you do use 25fps you should change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/hints.cc:245
+#: src/lib/hints.cc:250
 msgid ""
 "In general it is now advisable to make SMPTE DCPs unless you have a "
 "particular reason to use Interop.  You are advised to set your DCP to use "
 "the SMPTE standard in the \"DCP\" tab."
 msgstr ""
 
-#: src/lib/hints.cc:532
+#: src/lib/hints.cc:571
 msgid ""
 "It is advisable to put your first subtitle at least 4 seconds after the "
 "start of the DCP to make sure it is seen."
 msgstr ""
 
-#: src/lib/job.cc:149 src/lib/job.cc:184 src/lib/job.cc:234 src/lib/job.cc:244
+#: src/lib/job.cc:151 src/lib/job.cc:186 src/lib/job.cc:236 src/lib/job.cc:246
 msgid "It is not known what caused this error."
 msgstr ""
 
@@ -944,11 +948,11 @@ msgstr ""
 msgid "JEDEC P22"
 msgstr ""
 
-#: src/lib/config.cc:343 src/lib/config.cc:1085
+#: src/lib/config.cc:342 src/lib/config.cc:1081
 msgid "KDM delivery: $CPL_NAME"
 msgstr ""
 
-#: src/lib/filter.cc:71
+#: src/lib/filter.cc:78
 msgid "Kernel deinterlacer"
 msgstr ""
 
@@ -960,7 +964,7 @@ msgstr ""
 msgid "Lc"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:97 src/lib/util.cc:553
+#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:553
 msgid "Left"
 msgstr ""
 
@@ -1008,7 +1012,7 @@ msgstr ""
 msgid "Logarithmic (316:1 range)"
 msgstr ""
 
-#: src/lib/exceptions.cc:128
+#: src/lib/exceptions.cc:145
 msgid "Lost communication between main and writer processes"
 msgstr ""
 
@@ -1016,11 +1020,11 @@ msgstr ""
 msgid "Ls"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:35
+#: src/lib/mid_side_decoder.cc:39
 msgid "Mid-side decoder"
 msgstr ""
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:79
+#: src/lib/filter.cc:82 src/lib/filter.cc:83 src/lib/filter.cc:86
 msgid "Misc"
 msgstr ""
 
@@ -1040,7 +1044,7 @@ msgstr ""
 msgid "Mismatched video sizes in DCP"
 msgstr ""
 
-#: src/lib/exceptions.cc:64
+#: src/lib/exceptions.cc:71
 msgid "Missing required setting %1"
 msgstr ""
 
@@ -1048,19 +1052,19 @@ msgstr ""
 msgid "Monday"
 msgstr ""
 
-#: src/lib/writer.cc:746
+#: src/lib/writer.cc:757
 msgid "Mono"
 msgstr ""
 
-#: src/lib/filter.cc:70
+#: src/lib/filter.cc:77
 msgid "Motion compensating deinterlacer"
 msgstr ""
 
-#: src/lib/dcp_decoder.cc:105
+#: src/lib/dcp_decoder.cc:104
 msgid "No CPLs found in DCP."
 msgstr ""
 
-#: src/lib/kdm_with_metadata.cc:210 src/lib/send_notification_email_job.cc:65
+#: src/lib/kdm_with_metadata.cc:208 src/lib/send_notification_email_job.cc:72
 msgid "No mail server configured in preferences"
 msgstr ""
 
@@ -1068,15 +1072,15 @@ msgstr ""
 msgid "No valid image files were found in the folder."
 msgstr ""
 
-#: src/lib/filter.cc:77 src/lib/filter.cc:78 src/lib/filter.cc:80
+#: src/lib/filter.cc:84 src/lib/filter.cc:85 src/lib/filter.cc:87
 msgid "Noise reduction"
 msgstr ""
 
-#: src/lib/writer.cc:714 src/lib/writer.cc:721 src/lib/writer.cc:744
+#: src/lib/writer.cc:725 src/lib/writer.cc:732 src/lib/writer.cc:755
 msgid "None"
 msgstr ""
 
-#: src/lib/job.cc:499
+#: src/lib/job.cc:501
 msgid "OK (ran for %1)"
 msgstr ""
 
@@ -1092,16 +1096,16 @@ msgstr ""
 msgid "Open subtitles"
 msgstr ""
 
-#: src/lib/filter.cc:66 src/lib/filter.cc:67 src/lib/filter.cc:68
-#: src/lib/filter.cc:69
+#: src/lib/filter.cc:73 src/lib/filter.cc:74 src/lib/filter.cc:75
+#: src/lib/filter.cc:76
 msgid "Orientation"
 msgstr ""
 
-#: src/lib/job.cc:208
+#: src/lib/job.cc:210
 msgid "Out of memory"
 msgstr ""
 
-#: src/lib/filter.cc:80
+#: src/lib/filter.cc:87
 msgid "Overcomplete wavelet denoiser"
 msgstr ""
 
@@ -1115,7 +1119,7 @@ msgid ""
 "carl@dcpomatic.com"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:52
+#: src/lib/dcp_content_type.cc:58
 msgid "Policy"
 msgstr ""
 
@@ -1123,15 +1127,15 @@ msgstr ""
 msgid "Prepared for video frame rate"
 msgstr ""
 
-#: src/lib/exceptions.cc:94
+#: src/lib/exceptions.cc:106
 msgid "Programming error at %1:%2 %3"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:56
+#: src/lib/dcp_content_type.cc:62
 msgid "Promo"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:53
+#: src/lib/dcp_content_type.cc:59
 msgid "Public Service Announcement"
 msgstr ""
 
@@ -1143,7 +1147,7 @@ msgstr ""
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:50
+#: src/lib/dcp_content_type.cc:56
 msgid "Rating"
 msgstr ""
 
@@ -1167,7 +1171,7 @@ msgstr ""
 msgid "Rec. 709"
 msgstr ""
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:554
+#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:554
 msgid "Right"
 msgstr ""
 
@@ -1183,11 +1187,11 @@ msgstr ""
 msgid "Right surround"
 msgstr ""
 
-#: src/lib/filter.cc:69
+#: src/lib/filter.cc:76
 msgid "Rotate 90 degrees anti-clockwise"
 msgstr ""
 
-#: src/lib/filter.cc:68
+#: src/lib/filter.cc:75
 msgid "Rotate 90 degrees clockwise"
 msgstr ""
 
@@ -1216,7 +1220,7 @@ msgstr ""
 msgid "SMPTE 240M"
 msgstr ""
 
-#: src/lib/hints.cc:576
+#: src/lib/hints.cc:613
 msgid ""
 "SMPTE DCPs with the type FTR (feature) should have markers for the first "
 "frame of end credits (FFEC) and the first frame of moving credits (FFMC).  "
@@ -1243,8 +1247,13 @@ msgstr ""
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:58
-msgid "SSH error (%1)"
+#: src/lib/scp_uploader.cc:45
+msgid "SSH error [%1]"
+msgstr ""
+
+#: src/lib/scp_uploader.cc:61 src/lib/scp_uploader.cc:72
+#: src/lib/scp_uploader.cc:77
+msgid "SSH error [%1] (%2)"
 msgstr ""
 
 #: src/lib/util.cc:941
@@ -1255,11 +1264,11 @@ msgstr ""
 msgid "Scanning image files"
 msgstr ""
 
-#: src/lib/send_problem_report_job.cc:78
+#: src/lib/send_problem_report_job.cc:85
 msgid "Sending email"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:46
+#: src/lib/dcp_content_type.cc:52
 msgid "Short"
 msgstr ""
 
@@ -1284,21 +1293,21 @@ msgid ""
 "project in DCP-o-matic, check the settings, then save it before trying again."
 msgstr ""
 
-#: src/lib/hints.cc:513
+#: src/lib/hints.cc:552
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
 msgstr ""
 
-#: src/lib/film.cc:385
+#: src/lib/film.cc:392
 msgid "Some of your content needs a KDM"
 msgstr ""
 
-#: src/lib/film.cc:388
+#: src/lib/film.cc:395
 msgid "Some of your content needs an OV"
 msgstr ""
 
-#: src/lib/writer.cc:748
+#: src/lib/writer.cc:759
 msgid "Stereo"
 msgstr ""
 
@@ -1306,7 +1315,7 @@ msgstr ""
 msgid "Stereo to 5.1 up-mixer A"
 msgstr ""
 
-#: src/lib/upmixer_b.cc:42
+#: src/lib/upmixer_b.cc:47
 msgid "Stereo to 5.1 up-mixer B"
 msgstr ""
 
@@ -1314,15 +1323,15 @@ msgstr ""
 msgid "Sunday"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:51
+#: src/lib/dcp_content_type.cc:57
 msgid "Teaser"
 msgstr ""
 
-#: src/lib/filter.cc:79
+#: src/lib/filter.cc:86
 msgid "Telecine filter"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:48
+#: src/lib/dcp_content_type.cc:54
 msgid "Test"
 msgstr ""
 
@@ -1330,15 +1339,15 @@ msgstr ""
 msgid "Text subtitles"
 msgstr ""
 
-#: src/lib/film.cc:368
+#: src/lib/film.cc:375
 msgid "The DCP is empty, perhaps because all the content has zero length."
 msgstr ""
 
-#: src/lib/exceptions.cc:82
+#: src/lib/exceptions.cc:92
 msgid "The certificate chain for signing is invalid"
 msgstr ""
 
-#: src/lib/exceptions.cc:88
+#: src/lib/exceptions.cc:99
 msgid "The certificate chain for signing is invalid (%1)"
 msgstr ""
 
@@ -1349,7 +1358,7 @@ msgid ""
 "ticking the 3D option in the DCP video tab."
 msgstr ""
 
-#: src/lib/job.cc:110
+#: src/lib/job.cc:112
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
@@ -1371,7 +1380,7 @@ msgstr ""
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr ""
 
-#: src/lib/hints.cc:235
+#: src/lib/hints.cc:240
 msgid ""
 "There is a large difference between the frame rate of your DCP and that of "
 "some of your content.  This will cause your audio to play back at a much "
@@ -1384,7 +1393,7 @@ msgstr ""
 msgid "There is no video in this DCP"
 msgstr ""
 
-#: src/lib/job.cc:208
+#: src/lib/job.cc:210
 msgid ""
 "There was not enough memory to do this.  If you are running a 32-bit "
 "operating system try reducing the number of encoding threads in the General "
@@ -1399,7 +1408,7 @@ msgstr ""
 msgid "This KDM was not made for DCP-o-matic's decryption certificate."
 msgstr ""
 
-#: src/lib/job.cc:129
+#: src/lib/job.cc:131
 msgid ""
 "This error has probably occurred because you are running the 32-bit version "
 "of DCP-o-matic and trying to use too many encoding threads.  Please reduce "
@@ -1407,26 +1416,26 @@ msgid ""
 "Preferences and try again."
 msgstr ""
 
-#: src/lib/job.cc:139
+#: src/lib/job.cc:141
 msgid ""
 "This error has probably occurred because you are running the 32-bit version "
 "of DCP-o-matic.  Please re-install DCP-o-matic with the 64-bit installer and "
 "try again."
 msgstr ""
 
-#: src/lib/exceptions.cc:100
+#: src/lib/exceptions.cc:113
 msgid ""
 "This file is a KDM.  KDMs should be added to DCP content by right-clicking "
 "the content and choosing \"Add KDM\"."
 msgstr ""
 
-#: src/lib/film.cc:554
+#: src/lib/film.cc:561
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
 msgstr ""
 
-#: src/lib/film.cc:539
+#: src/lib/film.cc:546
 msgid ""
 "This film was created with an older version of DCP-o-matic, and "
 "unfortunately it cannot be loaded into this version.  You will need to "
@@ -1441,15 +1450,15 @@ msgstr ""
 msgid "Timed text"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:47
+#: src/lib/dcp_content_type.cc:53
 msgid "Trailer"
 msgstr ""
 
-#: src/lib/transcode_job.cc:64
+#: src/lib/transcode_job.cc:71
 msgid "Transcoding %1"
 msgstr ""
 
-#: src/lib/dcp_content_type.cc:49
+#: src/lib/dcp_content_type.cc:55
 msgid "Transitional"
 msgstr ""
 
@@ -1457,11 +1466,11 @@ msgstr ""
 msgid "Tuesday"
 msgstr ""
 
-#: src/lib/usl.cc:26
+#: src/lib/usl.cc:28
 msgid "USL"
 msgstr ""
 
-#: src/lib/internet.cc:180
+#: src/lib/internet.cc:185
 msgid "Unexpected ZIP file contents"
 msgstr ""
 
@@ -1469,19 +1478,19 @@ msgstr ""
 msgid "Unexpected image type received by server"
 msgstr ""
 
-#: src/lib/cross_common.cc:88 src/lib/dcp_text_track.cc:53
+#: src/lib/cross_common.cc:91 src/lib/dcp_text_track.cc:53
 msgid "Unknown"
 msgstr ""
 
-#: src/lib/job.cc:243
+#: src/lib/job.cc:245
 msgid "Unknown error"
 msgstr ""
 
-#: src/lib/ffmpeg_decoder.cc:359
+#: src/lib/ffmpeg_decoder.cc:343
 msgid "Unrecognised audio sample format (%1)"
 msgstr ""
 
-#: src/lib/filter.cc:76
+#: src/lib/filter.cc:83
 msgid "Unsharp mask and Gaussian blur"
 msgstr ""
 
@@ -1501,11 +1510,11 @@ msgstr ""
 msgid "Unused"
 msgstr ""
 
-#: src/lib/upmixer_a.cc:138 src/lib/upmixer_b.cc:137
+#: src/lib/upmixer_a.cc:138 src/lib/upmixer_b.cc:148
 msgid "Upmix L"
 msgstr ""
 
-#: src/lib/upmixer_a.cc:139 src/lib/upmixer_b.cc:138
+#: src/lib/upmixer_a.cc:139 src/lib/upmixer_b.cc:149
 msgid "Upmix R"
 msgstr ""
 
@@ -1513,11 +1522,11 @@ msgstr ""
 msgid "VI"
 msgstr ""
 
-#: src/lib/verify_dcp_job.cc:50
+#: src/lib/verify_dcp_job.cc:55
 msgid "Verify DCP"
 msgstr ""
 
-#: src/lib/filter.cc:66
+#: src/lib/filter.cc:73
 msgid "Vertical flip"
 msgstr ""
 
@@ -1529,7 +1538,7 @@ msgstr ""
 msgid "Waiting"
 msgstr ""
 
-#: src/lib/filter.cc:74
+#: src/lib/filter.cc:81
 msgid "Weave filter"
 msgstr ""
 
@@ -1541,72 +1550,72 @@ msgstr ""
 msgid "YCOCG"
 msgstr ""
 
-#: src/lib/filter.cc:72
+#: src/lib/filter.cc:79
 msgid "Yet Another Deinterlacing Filter"
 msgstr ""
 
-#: src/lib/hints.cc:195
+#: src/lib/hints.cc:200
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
 "supported by all projectors.  You are advised to change the DCP frame rate "
 "to %2 fps."
 msgstr ""
 
-#: src/lib/hints.cc:179
+#: src/lib/hints.cc:184
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
 "supported by all projectors.  You may want to consider changing your frame "
 "rate to %2 fps."
 msgstr ""
 
-#: src/lib/hints.cc:189
+#: src/lib/hints.cc:194
 msgid ""
 "You are set up for a DCP frame rate of 30fps, which is not supported by all "
 "projectors.  Be aware that you may have compatibility problems."
 msgstr ""
 
-#: src/lib/hints.cc:300
+#: src/lib/hints.cc:305
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
 msgstr ""
 
-#: src/lib/hints.cc:116
+#: src/lib/hints.cc:121
 msgid ""
 "You are using DCP-o-matic's stereo-to-5.1 upmixer.  This is experimental and "
 "may result in poor-quality audio.  If you continue, you should listen to the "
 "resulting DCP in a cinema to make sure that it sounds good."
 msgstr ""
 
-#: src/lib/hints.cc:284
+#: src/lib/hints.cc:289
 msgid ""
 "You have %1 files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
 msgstr ""
 
-#: src/lib/film.cc:1514
+#: src/lib/film.cc:1521
 msgid ""
 "You have more than one piece of Atmos content, and they do not have the same "
 "frame rate.  You must remove some Atmos content."
 msgstr ""
 
-#: src/lib/hints.cc:520
+#: src/lib/hints.cc:559
 msgid ""
 "You have overlapping closed captions, which are not allowed in Interop "
 "DCPs.  Change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/hints.cc:268
+#: src/lib/hints.cc:273
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
 msgstr ""
 
-#: src/lib/film.cc:364
+#: src/lib/film.cc:371
 msgid "You must add some content to the DCP before creating it"
 msgstr ""
 
-#: src/lib/hints.cc:106
+#: src/lib/hints.cc:111
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors.  You may want to set the DCP to have 6 channels.  It does not "
@@ -1614,19 +1623,19 @@ msgid ""
 "extras with silence."
 msgstr ""
 
-#: src/lib/hints.cc:154
+#: src/lib/hints.cc:159
 msgid ""
 "Your DCP uses an unusual container ratio.  This may cause problems on some "
 "projectors.  If possible, use Flat or Scope for the DCP container ratio"
 msgstr ""
 
-#: src/lib/hints.cc:330
+#: src/lib/hints.cc:339
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
 msgstr ""
 
-#: src/lib/config.cc:288
+#: src/lib/config.cc:287
 msgid ""
 "Your default container is not valid and has been changed to Flat (1.85:1)"
 msgstr ""
@@ -1664,59 +1673,51 @@ msgstr ""
 msgid "connect timed out"
 msgstr ""
 
-#: src/lib/uploader.cc:35
+#: src/lib/uploader.cc:38
 msgid "connecting"
 msgstr ""
 
-#: src/lib/film.cc:360
+#: src/lib/film.cc:367
 msgid "container"
 msgstr ""
 
-#: src/lib/film.cc:372
+#: src/lib/film.cc:379
 msgid "content type"
 msgstr ""
 
-#: src/lib/uploader.cc:73
+#: src/lib/uploader.cc:79
 msgid "copying %1"
 msgstr ""
 
-#: src/lib/ffmpeg.cc:139 src/lib/ffmpeg_image_proxy.cc:166
+#: src/lib/ffmpeg.cc:137
 msgid "could not find stream information"
 msgstr ""
 
-#: src/lib/reel_writer.cc:433
+#: src/lib/reel_writer.cc:435
 msgid "could not move atmos asset into the DCP (%1)"
 msgstr ""
 
-#: src/lib/reel_writer.cc:416
+#: src/lib/reel_writer.cc:418
 msgid "could not move audio asset into the DCP (%1)"
 msgstr ""
 
-#: src/lib/exceptions.cc:35
+#: src/lib/exceptions.cc:38
 msgid "could not open file %1 for read (%2)"
 msgstr ""
 
-#: src/lib/exceptions.cc:34
+#: src/lib/exceptions.cc:37
 msgid "could not open file %1 for read/write (%2)"
 msgstr ""
 
-#: src/lib/exceptions.cc:35
+#: src/lib/exceptions.cc:38
 msgid "could not open file %1 for write (%2)"
 msgstr ""
 
-#: src/lib/exceptions.cc:52
+#: src/lib/exceptions.cc:57
 msgid "could not read from file %1 (%2)"
 msgstr ""
 
-#: src/lib/scp_uploader.cc:69
-msgid "could not start SCP session (%1)"
-msgstr ""
-
-#: src/lib/scp_uploader.cc:42
-msgid "could not start SSH session"
-msgstr ""
-
-#: src/lib/exceptions.cc:58
+#: src/lib/exceptions.cc:64
 msgid "could not write to file %1 (%2)"
 msgstr ""
 
@@ -1823,7 +1824,7 @@ msgstr ""
 msgid "moving"
 msgstr ""
 
-#: src/lib/film.cc:356
+#: src/lib/film.cc:363
 msgid "name"
 msgstr ""
 
@@ -1850,7 +1851,7 @@ msgstr ""
 msgid "sRGB"
 msgstr ""
 
-#: src/lib/film.cc:381
+#: src/lib/film.cc:388
 msgid "some of your content is missing"
 msgstr ""
 
@@ -1858,7 +1859,7 @@ msgstr ""
 msgid "still"
 msgstr ""
 
-#: src/lib/ffmpeg_examiner.cc:334
+#: src/lib/ffmpeg_examiner.cc:339
 msgid "unknown"
 msgstr ""