pot/merge.

1 files changed, 174 insertions, 160 deletions

diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index e75c3a6ab..dbdb53624 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-03-29 01:56+0200\n"
+"POT-Creation-Date: 2023-09-05 14:06+0200\n"
 "PO-Revision-Date: 2023-07-15 00:03+0800\n"
 "Last-Translator: Dian Li <xslidian@gmail.com>\n"
 "Language-Team: Chinese Simplified (Rov8 branch)\n"
@@ -73,11 +73,11 @@ msgstr " (%.2f:1)"
 
 #. 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:582
+#: src/lib/job.cc:581
 msgid " on %1"
 msgstr " 于 %1"
 
-#: src/lib/config.cc:1264
+#: src/lib/config.cc:1268
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -101,7 +101,7 @@ msgstr ""
 "长度: $LENGTH\n"
 "大小: $SIZE\n"
 
-#: src/lib/config.cc:1242
+#: src/lib/config.cc:1246
 msgid "$JOB_NAME: $JOB_STATUS"
 msgstr "$任务名称: $JOB_STATUS"
 
@@ -113,7 +113,7 @@ msgstr "%1 (%2 GB) [%3]"
 msgid "%1 [Atmos]"
 msgstr "%1 [全景声]"
 
-#: src/lib/dcp_content.cc:316
+#: src/lib/dcp_content.cc:334
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
@@ -129,7 +129,7 @@ msgstr "%1 [影片]"
 msgid "%1 [video]"
 msgstr "%1 [视频]"
 
-#: src/lib/transcode_job.cc:172
+#: src/lib/transcode_job.cc:162
 msgid "%1; %2/%3 frames"
 msgstr "%1; %2/%3 帧"
 
@@ -170,11 +170,11 @@ msgstr "1.85 (遮幅)"
 msgid "1.90 (Full frame)"
 msgstr "1.90 (全幅)"
 
-#: src/lib/util.cc:654
+#: src/lib/util.cc:660
 msgid "10"
 msgstr "10"
 
-#: src/lib/util.cc:660
+#: src/lib/util.cc:666
 msgid "16"
 msgstr "16"
 
@@ -199,16 +199,16 @@ msgstr ""
 "只有极少数的放映设备支持4K 3D，除非您确认你的设备支持放映，否则建议在“DCP→视"
 "频”选项卡中将DCP设置为2K。"
 
-#: src/lib/util.cc:653
+#: src/lib/util.cc:659
 msgid "9"
 msgstr "9"
 
 #. TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:175
+#: src/lib/transcode_job.cc:165
 msgid "; %1 fps"
 msgstr "; %1 fps"
 
-#: src/lib/job.cc:587
+#: src/lib/job.cc:586
 msgid "; %1 remaining; finishing at %2%3"
 msgstr "; 剩余 %1 ; 完成于 %2%3"
 
@@ -245,7 +245,7 @@ msgstr ""
 "有些放映设备不支持高码率DCP，我们推荐使用200Mbit/s以内的码率来进行打包，这种"
 "细微的调整是肉眼很难分辨的。"
 
-#: src/lib/text_content.cc:249
+#: src/lib/text_content.cc:247
 msgid ""
 "A subtitle or closed caption file in this project is marked with the "
 "language '%1', which DCP-o-matic does not recognise.  The file's language "
@@ -281,7 +281,7 @@ msgstr ""
 "您添加的媒体画面宽高比小于1.90:1，但是DCP容器设置为2.39:1的模式。这将会使您的"
 "画面在放映时存在左右黑边。建议把DCP容器设置为与素材相同宽高比的模式。"
 
-#: src/lib/job.cc:115
+#: src/lib/job.cc:114
 msgid "An error occurred whilst handling the file %1."
 msgstr "处理文件 %1 时发生错误。"
 
@@ -289,7 +289,7 @@ msgstr "处理文件 %1 时发生错误。"
 msgid "Analysing audio"
 msgstr "分析音频中"
 
-#: src/lib/analyse_subtitles_job.cc:55
+#: src/lib/analyse_subtitles_job.cc:56
 msgid "Analysing subtitles"
 msgstr "分析字幕中"
 
@@ -298,55 +298,55 @@ msgid ""
 "At least one marker comes after the end of the project and will be ignored."
 msgstr "至少有一个标记出现在项目结束后，将被忽略。"
 
-#: src/lib/hints.cc:472
+#: src/lib/hints.cc:473
 msgid "At least one of your closed caption files is larger than "
 msgstr "至少有一个隐藏字幕文件过大了 "
 
-#: src/lib/hints.cc:465
+#: src/lib/hints.cc:466
 msgid "At least one of your closed caption files' XML part is larger than "
 msgstr "至少有一个隐藏式字幕文件的XML部分过大了 "
 
-#: src/lib/hints.cc:480
+#: src/lib/hints.cc:481
 msgid "At least one of your subtitle files is larger than "
 msgstr "至少有一个字幕文件过大了 "
 
-#: src/lib/hints.cc:444
+#: src/lib/hints.cc:445
 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 "至少有一行字幕超过52个字符，  建议每行最多52个字符。"
 
-#: src/lib/hints.cc:446
+#: src/lib/hints.cc:447
 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 "至少有一行字幕超过79个字符，  你应该让每行最多79个字符。"
 
-#: src/lib/hints.cc:589
+#: src/lib/hints.cc:613
 msgid ""
 "At least one of your subtitles has more than 3 lines.  It is advisable to "
 "use no more than 3 lines."
 msgstr "您的字幕中至少有一个超过3行，  建议使用不超过3行。"
 
-#: src/lib/hints.cc:579
+#: src/lib/hints.cc:580
 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 "您的字幕中至少有一个持续时间少于15帧，  建议每个字幕至少15帧长。"
 
-#: src/lib/hints.cc:584
+#: src/lib/hints.cc:585
 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 ""
 "至少有一个字幕在前一个字幕后不到2帧开始，  建议字幕之间的间隔至少为2帧。"
 
-#: src/lib/hints.cc:632
+#: src/lib/hints.cc:656
+#, fuzzy
 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."
+"At least one piece of subtitle content has no specified language.  It is "
+"advisable to set the language for each piece of subtitle content in the "
+"\"Content→Timed text\" or \"Content→Open subtitles\" tab."
 msgstr ""
 "至少有一个字幕或隐藏字幕内容没有指定的语言，  建议在“内容→时间轴”、“内容→打开"
 "字幕”或“内容→隐藏字幕”选项卡中设置每段字幕或隐藏字幕内容的语言。"
@@ -416,19 +416,19 @@ msgstr "像素位"
 msgid "Bob Weaver Deinterlacing Filter"
 msgstr "Bob Weaver 反隔行扫描滤镜"
 
-#: src/lib/util.cc:655
+#: src/lib/util.cc:661
 msgid "BsL"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:656
+#: src/lib/util.cc:662
 msgid "BsR"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:647
+#: src/lib/util.cc:653
 msgid "C"
 msgstr "中置"
 
-#: src/lib/job.cc:596
+#: src/lib/job.cc:610
 msgid "Cancelled"
 msgstr "取消"
 
@@ -440,11 +440,11 @@ msgstr "不能包含斜杠"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "在 %2 不能处理图片格式 %1"
 
-#: src/lib/film.cc:1663
+#: src/lib/film.cc:1664
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr "不能生成KDM，因为项目没有被加密。"
 
-#: src/lib/util.cc:616
+#: src/lib/util.cc:622
 msgid "Centre"
 msgstr "中置"
 
@@ -460,7 +460,7 @@ msgstr "检查其新设置后再试。"
 msgid "Checking content"
 msgstr "检查媒体内容中"
 
-#: src/lib/reel_writer.cc:260
+#: src/lib/reel_writer.cc:275
 msgid "Checking existing image data"
 msgstr "检查现有的图像数据"
 
@@ -516,7 +516,7 @@ msgstr "合并 DCP"
 msgid "Computing digest"
 msgstr "计算Hash值中"
 
-#: src/lib/writer.cc:518
+#: src/lib/writer.cc:520
 msgid "Computing digests"
 msgstr "计算Hash值中"
 
@@ -548,7 +548,7 @@ msgstr "添加的内容必须都有或都没有隐藏式字幕"
 msgid "Content to be joined must all have or not have video"
 msgstr "添加的内容必须都有或都没有视频"
 
-#: src/lib/text_content.cc:321
+#: src/lib/text_content.cc:319
 msgid ""
 "Content to be joined must both be main subtitle languages or both additional."
 msgstr "添加的内容必须均为主字幕语言或附加字幕语言。"
@@ -557,11 +557,11 @@ msgstr "添加的内容必须均为主字幕语言或附加字幕语言。"
 msgid "Content to be joined must have all its video used or not used."
 msgstr "添加的内容必须均选中/不选中视频部分。"
 
-#: src/lib/text_content.cc:276
+#: src/lib/text_content.cc:274
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr "添加的内容必须具有相同的“刻录字幕”设置。"
 
-#: src/lib/text_content.cc:272
+#: src/lib/text_content.cc:270
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr "添加的内容必须具有相同的“使用字幕”设置。"
 
@@ -597,7 +597,7 @@ msgstr "添加的内容必须有相同的自定义尺寸设置。"
 msgid "Content to be joined must have the same fades."
 msgstr "添加的内容视频淡入淡出效果必须相同。"
 
-#: src/lib/text_content.cc:304
+#: src/lib/text_content.cc:302
 msgid "Content to be joined must have the same outline width."
 msgstr "添加的内容字幕宽度尺寸必须相同。"
 
@@ -605,27 +605,27 @@ msgstr "添加的内容字幕宽度尺寸必须相同。"
 msgid "Content to be joined must have the same picture size."
 msgstr "添加的内容视频图像尺寸必须相同。"
 
-#: src/lib/text_content.cc:280
+#: src/lib/text_content.cc:278
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr "添加的内容字幕X轴偏移必须相同。"
 
-#: src/lib/text_content.cc:288
+#: src/lib/text_content.cc:286
 msgid "Content to be joined must have the same subtitle X scale."
 msgstr "添加的内容字幕X轴缩放大小必须相同。"
 
-#: src/lib/text_content.cc:284
+#: src/lib/text_content.cc:282
 msgid "Content to be joined must have the same subtitle Y offset."
 msgstr "添加的内容字幕Y轴偏移必须相同。"
 
-#: src/lib/text_content.cc:292
+#: src/lib/text_content.cc:290
 msgid "Content to be joined must have the same subtitle Y scale."
 msgstr "添加的内容字幕Y轴缩放大小必须相同。"
 
-#: src/lib/text_content.cc:300
+#: src/lib/text_content.cc:298
 msgid "Content to be joined must have the same subtitle fades."
 msgstr "添加的内容字幕淡入淡出效果必须相同。"
 
-#: src/lib/text_content.cc:296
+#: src/lib/text_content.cc:294
 msgid "Content to be joined must have the same subtitle line spacing."
 msgstr "添加的内容字幕行距必须相同。"
 
@@ -637,11 +637,11 @@ msgstr "添加的内容内容帧率必须相同"
 msgid "Content to be joined must have the same video frame type."
 msgstr "添加的内容视频帧率必须相同。"
 
-#: src/lib/text_content.cc:313
+#: src/lib/text_content.cc:311
 msgid "Content to be joined must use the same DCP track."
 msgstr "添加的内容DCP轨道必须相同。"
 
-#: src/lib/text_content.cc:309 src/lib/text_content.cc:329
+#: src/lib/text_content.cc:307 src/lib/text_content.cc:327
 msgid "Content to be joined must use the same fonts."
 msgstr "添加的内容字幕字体必须相同。"
 
@@ -649,7 +649,7 @@ msgstr "添加的内容字幕字体必须相同。"
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "添加的内容字幕流必须相同。"
 
-#: src/lib/text_content.cc:317
+#: src/lib/text_content.cc:315
 msgid "Content to be joined must use the same text language."
 msgstr "添加的内容必须有相同的文字语言。"
 
@@ -661,11 +661,11 @@ msgstr "源视频分辨率是 %1x%2"
 msgid "Copy DCP to TMS"
 msgstr "复制DCP到TMS"
 
-#: src/lib/reel_writer.cc:139
+#: src/lib/reel_writer.cc:141
 msgid "Copying old video file"
 msgstr "复制源视频文件"
 
-#: src/lib/reel_writer.cc:396
+#: src/lib/reel_writer.cc:411
 msgid "Copying video file into DCP"
 msgstr "正在将视频文件复制到 DCP"
 
@@ -691,7 +691,7 @@ msgid ""
 "o-matic is running."
 msgstr "无法侦听到远程编码服务器。可能另一个DCP-o-matic进程正在运行。"
 
-#: src/lib/job.cc:170 src/lib/job.cc:185
+#: src/lib/job.cc:169 src/lib/job.cc:184
 msgid "Could not open %1"
 msgstr "无法打开%1"
 
@@ -707,7 +707,7 @@ msgstr "无法打开下载的zip文件"
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr "无法打开下载的zip文件 (%1:%2: %3)"
 
-#: src/lib/config.cc:1128
+#: src/lib/config.cc:1132
 msgid "Could not open file for writing"
 msgstr "无法执行写入，目标文件无法打开"
 
@@ -727,19 +727,19 @@ msgstr "无法开始传输"
 msgid "Could not write to remote file (%1)"
 msgstr "写入远程文件 (%1)失败！"
 
-#: src/lib/util.cc:626
+#: src/lib/util.cc:632
 msgid "D-BOX primary"
 msgstr "一级D-BOX"
 
-#: src/lib/util.cc:627
+#: src/lib/util.cc:633
 msgid "D-BOX secondary"
 msgstr "二级D-BOX"
 
-#: src/lib/util.cc:657
+#: src/lib/util.cc:663
 msgid "DBP"
 msgstr "DBP"
 
-#: src/lib/util.cc:658
+#: src/lib/util.cc:664
 msgid "DBS"
 msgstr "DBS"
 
@@ -768,13 +768,13 @@ msgstr "DCP队列将在速度 %.1f%% 下运行。\n"
 msgid "DCP will use every other frame of the content.\n"
 msgstr "将使用隔帧打包DCP。\n"
 
-#: src/lib/job.cc:172 src/lib/job.cc:187
+#: src/lib/job.cc:171 src/lib/job.cc:186
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."
 msgstr "无法打开文件%1 (%2)。文件不存在或格式无法识别。"
 
-#: src/lib/film.cc:1589
+#: src/lib/film.cc:1590
 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."
@@ -782,7 +782,7 @@ msgstr ""
 "DCP-o-matic必须把您DCP的设置更改为OV。请重新检查设置确认设置内容是否为您的期"
 "望值。"
 
-#: src/lib/film.cc:1557
+#: src/lib/film.cc:1558
 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."
@@ -793,7 +793,7 @@ msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "不支持的格式`%1'。"
 
-#: src/lib/config.cc:421 src/lib/config.cc:1239
+#: src/lib/config.cc:422 src/lib/config.cc:1243
 msgid "DCP-o-matic notification"
 msgstr "DCP-o-matic提醒"
 
@@ -806,7 +806,7 @@ msgstr "数据来自AP20或AP25"
 msgid "De-interlacing"
 msgstr "去除隔行"
 
-#: src/lib/config.cc:1227
+#: src/lib/config.cc:1231
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -856,7 +856,7 @@ msgstr "邮件发送 KDM"
 msgid "Email KDMs for %1"
 msgstr "通过电子邮件发送 %1 的 KDM"
 
-#: src/lib/send_notification_email_job.cc:55
+#: src/lib/send_notification_email_job.cc:53
 msgid "Email notification"
 msgstr "电子邮件提醒"
 
@@ -880,7 +880,7 @@ msgstr "插曲"
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr "字幕文件错误: 执行为 %1 实际要求为%2"
 
-#: src/lib/job.cc:594
+#: src/lib/job.cc:608
 msgid "Error: %1"
 msgstr "错误: (%1)"
 
@@ -888,7 +888,7 @@ msgstr "错误: (%1)"
 msgid "Event"
 msgstr "事件"
 
-#: src/lib/hints.cc:406
+#: src/lib/hints.cc:407
 msgid "Examining audio, subtitles and closed captions"
 msgstr "检查音频、字幕和隐藏式字幕中"
 
@@ -900,11 +900,11 @@ msgstr "分析内容中"
 msgid "Examining subtitles"
 msgstr "定位字幕中"
 
-#: src/lib/hints.cc:404
+#: src/lib/hints.cc:405
 msgid "Examining subtitles and closed captions"
 msgstr "检查字幕和隐藏式字幕中"
 
-#: src/lib/subtitle_encoder.cc:97
+#: src/lib/subtitle_encoder.cc:98
 msgid "Extracting"
 msgstr "正在提取"
 
@@ -916,7 +916,7 @@ msgstr "FCC"
 msgid "Failed to authenticate with server (%1)"
 msgstr "无法与服务器进行身份验证 (%1)"
 
-#: src/lib/job.cc:139 src/lib/job.cc:149
+#: src/lib/job.cc:138 src/lib/job.cc:148
 msgid "Failed to encode the DCP."
 msgstr "编码 DCP 失败。"
 
@@ -928,11 +928,11 @@ msgstr "电子邮件发送失败"
 msgid "Feature"
 msgstr "正片"
 
-#: src/lib/content.cc:471
+#: src/lib/content.cc:475
 msgid "Filename"
 msgstr "文件名"
 
-#: src/lib/content.cc:471
+#: src/lib/content.cc:475
 msgid "Filenames"
 msgstr "文件名"
 
@@ -948,11 +948,11 @@ msgstr "影片"
 msgid "Finding length"
 msgstr "定位长度"
 
-#: src/lib/content.cc:481
+#: src/lib/content.cc:485
 msgid "Frame rate"
 msgstr "帧率"
 
-#: src/lib/job.cc:553
+#: src/lib/job.cc:552
 msgid "Friday"
 msgstr "星期五"
 
@@ -996,11 +996,11 @@ msgstr "伽玛 2.8 (BT470BG)"
 msgid "Gradient debander"
 msgstr "梯度"
 
-#: src/lib/util.cc:651
+#: src/lib/util.cc:657
 msgid "HI"
 msgstr "听力障碍"
 
-#: src/lib/util.cc:620
+#: src/lib/util.cc:626
 msgid "Hearing impaired"
 msgstr "听力障碍"
 
@@ -1051,13 +1051,13 @@ msgstr ""
 "在这个版本中，字幕的定位方式发生了变化。相对于标准，定位现在应该更加正确，但"
 "您仍应该检查项目中的任何字幕，以确保它们放在您想要的位置。"
 
-#: src/lib/hints.cc:572
+#: src/lib/hints.cc:573
 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 "建议在DCP开始后至少4秒放置您的第一个字幕，以确保它能被看到。"
 
-#: src/lib/job.cc:160 src/lib/job.cc:195 src/lib/job.cc:249 src/lib/job.cc:259
+#: src/lib/job.cc:159 src/lib/job.cc:194 src/lib/job.cc:248 src/lib/job.cc:258
 msgid "It is not known what caused this error."
 msgstr "未知原因错误。"
 
@@ -1065,7 +1065,7 @@ msgstr "未知原因错误。"
 msgid "JEDEC P22"
 msgstr "JEDEC P22"
 
-#: src/lib/config.cc:411 src/lib/config.cc:1224
+#: src/lib/config.cc:412 src/lib/config.cc:1228
 msgid "KDM delivery: $CPL_NAME"
 msgstr "发行KDM: $CPL_NAME"
 
@@ -1074,23 +1074,23 @@ msgid "Kernel deinterlacer"
 msgstr "隔行扫描"
 
 #. TRANSLATORS: L here is an abbreviation for "left", to indicate the left-eye part of a 3D export
-#: src/lib/ffmpeg_encoder.cc:267 src/lib/util.cc:645
+#: src/lib/ffmpeg_encoder.cc:267 src/lib/util.cc:651
 msgid "L"
 msgstr "左声道"
 
-#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:614
+#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:620
 msgid "Left"
 msgstr "左声道"
 
-#: src/lib/util.cc:622
+#: src/lib/util.cc:628
 msgid "Left centre"
 msgstr "左中"
 
-#: src/lib/util.cc:624
+#: src/lib/util.cc:630
 msgid "Left rear surround"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:618
+#: src/lib/util.cc:624
 msgid "Left surround"
 msgstr "左环绕"
 
@@ -1098,11 +1098,11 @@ msgstr "左环绕"
 msgid "Length"
 msgstr "长度"
 
-#: src/lib/util.cc:648
+#: src/lib/util.cc:654
 msgid "Lfe"
 msgstr "次低"
 
-#: src/lib/util.cc:617
+#: src/lib/util.cc:623
 msgid "Lfe (sub)"
 msgstr "次低（重低音）"
 
@@ -1130,7 +1130,7 @@ msgstr "对数 (范围 316:1)"
 msgid "Lost communication between main and writer processes"
 msgstr "主进程和写入进程之间的通信丢失"
 
-#: src/lib/util.cc:649
+#: src/lib/util.cc:655
 msgid "Ls"
 msgstr "左环绕"
 
@@ -1146,7 +1146,7 @@ msgstr "其他"
 msgid "Mismatched audio channel counts in DCP"
 msgstr "DCP中的音频通道数不匹配"
 
-#: src/lib/dcp_examiner.cc:186
+#: src/lib/dcp_examiner.cc:188
 msgid "Mismatched audio sample rates in DCP"
 msgstr "DCP中的音频采样率不匹配"
 
@@ -1162,11 +1162,11 @@ msgstr "DCP中的视频分辨率不匹配"
 msgid "Missing required setting %1"
 msgstr "缺少必需的设置 %1"
 
-#: src/lib/job.cc:545
+#: src/lib/job.cc:544
 msgid "Monday"
 msgstr "星期一"
 
-#: src/lib/writer.cc:753
+#: src/lib/writer.cc:757
 msgid "Mono"
 msgstr "单声道"
 
@@ -1182,7 +1182,7 @@ msgstr "DCP中没有找到CPL文件。"
 msgid "No KDM from address configured in preferences"
 msgstr "首选项中配置的地址没有 KDM"
 
-#: src/lib/kdm_with_metadata.cc:212 src/lib/send_notification_email_job.cc:72
+#: src/lib/kdm_with_metadata.cc:212 src/lib/send_notification_email_job.cc:70
 msgid "No mail server configured in preferences"
 msgstr "没有配置偏好的邮件服务"
 
@@ -1194,11 +1194,20 @@ msgstr "未在文件夹中发现有效的图片序列文件。"
 msgid "Noise reduction"
 msgstr "降噪"
 
-#: src/lib/writer.cc:721 src/lib/writer.cc:728 src/lib/writer.cc:751
+#: src/lib/writer.cc:725 src/lib/writer.cc:732 src/lib/writer.cc:755
 msgid "None"
 msgstr "无"
 
-#: src/lib/job.cc:592
+#: src/lib/job.cc:600
+msgid "OK"
+msgstr ""
+
+#: src/lib/job.cc:605
+#, fuzzy
+msgid "OK (ran for %1 from %2 to %3)"
+msgstr "完成 (运行用时 %1)"
+
+#: src/lib/job.cc:603
 msgid "OK (ran for %1)"
 msgstr "完成 (运行用时 %1)"
 
@@ -1225,7 +1234,7 @@ msgstr "在DCP-o-matic中打开项目，检查设置，然后保存后重试。"
 msgid "Orientation"
 msgstr "方向"
 
-#: src/lib/job.cc:217
+#: src/lib/job.cc:216
 msgid "Out of memory"
 msgstr "内存不足"
 
@@ -1241,7 +1250,7 @@ msgstr "P3"
 msgid "Policy"
 msgstr "政策相关"
 
-#: src/lib/content.cc:490
+#: src/lib/content.cc:494
 msgid "Prepared for video frame rate"
 msgstr "准备视频帧率"
 
@@ -1258,7 +1267,7 @@ msgid "Public Service Announcement"
 msgstr "公共服务或公告"
 
 #. TRANSLATORS: R here is an abbreviation for "right", to indicate the right-eye part of a 3D export
-#: src/lib/ffmpeg_encoder.cc:272 src/lib/util.cc:646
+#: src/lib/ffmpeg_encoder.cc:272 src/lib/util.cc:652
 msgid "R"
 msgstr "右声道"
 
@@ -1286,19 +1295,19 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:615
+#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:621
 msgid "Right"
 msgstr "右声道"
 
-#: src/lib/util.cc:623
+#: src/lib/util.cc:629
 msgid "Right centre"
 msgstr "右中"
 
-#: src/lib/util.cc:625
+#: src/lib/util.cc:631
 msgid "Right rear surround"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:619
+#: src/lib/util.cc:625
 msgid "Right surround"
 msgstr "右环绕"
 
@@ -1310,7 +1319,7 @@ msgstr "逆时针旋转90°"
 msgid "Rotate 90 degrees clockwise"
 msgstr "顺时针旋转90°"
 
-#: src/lib/util.cc:650
+#: src/lib/util.cc:656
 msgid "Rs"
 msgstr "右环绕"
 
@@ -1335,7 +1344,7 @@ msgstr "SMPTE 2085, Y'D'zD'x"
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/hints.cc:614
+#: src/lib/hints.cc:638
 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).  "
@@ -1373,7 +1382,7 @@ msgstr "SSH 错误 [%1]"
 msgid "SSH error [%1] (%2)"
 msgstr "SSH 错误 [%1] (%2)"
 
-#: src/lib/job.cc:555
+#: src/lib/job.cc:554
 msgid "Saturday"
 msgstr "星期六"
 
@@ -1389,7 +1398,7 @@ msgstr "发送电子邮件"
 msgid "Short"
 msgstr "短片"
 
-#: src/lib/util.cc:659
+#: src/lib/util.cc:665
 msgid "Sign"
 msgstr "签名"
 
@@ -1426,13 +1435,13 @@ msgstr ""
 "\n"
 "这些文件现在将被重新检查，因此您可能需要检查它们的设置。"
 
-#: src/lib/hints.cc:553
+#: src/lib/hints.cc:554
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
 msgstr "您的某些隐藏字幕跨度超过%1行，因此它将被截断，可能显示不完整。"
 
-#: src/lib/hints.cc:652
+#: src/lib/hints.cc:676
 msgid ""
 "Some of your content has audio but you have not set the audio language.  It "
 "is advisable to set the audio language in the \"DCP\" tab unless your audio "
@@ -1453,7 +1462,7 @@ msgstr "一些内容需要KDM密钥"
 msgid "Some of your content needs an OV"
 msgstr "一些内容需要OV"
 
-#: src/lib/writer.cc:755
+#: src/lib/writer.cc:759
 msgid "Stereo"
 msgstr "立体声"
 
@@ -1469,7 +1478,7 @@ msgstr "立体声到5.1，混音器A"
 msgid "Stereo to 5.1 up-mixer B"
 msgstr "立体声到5.1，混音器B"
 
-#: src/lib/job.cc:543
+#: src/lib/job.cc:542
 msgid "Sunday"
 msgstr "星期日"
 
@@ -1501,7 +1510,7 @@ msgstr "证书签名无效"
 msgid "The certificate chain for signing is invalid (%1)"
 msgstr "证书签名无效(%1)"
 
-#: src/lib/hints.cc:668
+#: src/lib/hints.cc:692
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
 "contains a small error which will prevent DCPs from being validated "
@@ -1513,7 +1522,7 @@ msgstr ""
 "正确验证。建议您通过单击“首选项”的“密钥”页面中的“重新制作证书和密钥…”按钮来重"
 "新创建签名证书链。"
 
-#: src/lib/hints.cc:674
+#: src/lib/hints.cc:698
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a "
 "validity period that is too long.  This will cause problems playing back "
@@ -1534,25 +1543,25 @@ msgstr ""
 "内容文件%1设置为3D，但似乎不包含3D图像。请将其设置为2D。通过勾选DCP视频选项卡"
 "中的3D选项，您仍然可以根据此内容制作3D DCP。"
 
-#: src/lib/job.cc:121
+#: src/lib/job.cc:120
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
 msgstr "磁盘空间不足，清理磁盘空间以继续。"
 
-#: src/lib/playlist.cc:228
+#: src/lib/playlist.cc:244
 msgid "The file %1 has been moved %2 milliseconds earlier."
 msgstr "文件 %1 被向前移动了 %2 毫秒。"
 
-#: src/lib/playlist.cc:223
+#: src/lib/playlist.cc:239
 msgid "The file %1 has been moved %2 milliseconds later."
 msgstr "文件 %1 被向后移动了 %2 毫秒。"
 
-#: src/lib/playlist.cc:248
+#: src/lib/playlist.cc:264
 msgid "The file %1 has been trimmed by %2 milliseconds less."
 msgstr "文件 %1 被缩短了 %2 毫秒。"
 
-#: src/lib/playlist.cc:243
+#: src/lib/playlist.cc:259
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr "文件 %1 被延长了 %2 毫秒。"
 
@@ -1567,26 +1576,26 @@ msgstr ""
 "您的DCP和某些内容的帧速率不符。可能导致声画不同步。如果您的放映服务器支持当前"
 "速率，建议您将DCP帧速率设置为更接近当前原视频的速率。"
 
-#: src/lib/dcp_content.cc:655
+#: src/lib/dcp_content.cc:672
 msgid "There is no video in this DCP"
 msgstr "DCP中不包含视频画面"
 
-#: src/lib/job.cc:217
+#: src/lib/job.cc:216
 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 "
 "tab of Preferences."
 msgstr "内存不足，如您是32位系统，请重新设置运行线程数量来达到稳定运行。"
 
-#: src/lib/util.cc:1020
+#: src/lib/util.cc:1026
 msgid "This KDM was made for DCP-o-matic but not for its leaf certificate."
 msgstr "KDM是为DCP-o-matic生成，但不是为它的叶子证书生成。"
 
-#: src/lib/util.cc:1018
+#: src/lib/util.cc:1024
 msgid "This KDM was not made for DCP-o-matic's decryption certificate."
 msgstr "KDM不是为DCP-o-matic解密证书而生成。"
 
-#: src/lib/job.cc:140
+#: src/lib/job.cc:139
 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 "
@@ -1596,7 +1605,7 @@ msgstr ""
 "出现此错误可能是因为您正在运行32位版本的DCP-o-matic，并且试图使用太多编码线"
 "程。请在“首选项”的“常规”选项卡中减少“DCP-o-matic应该使用的线程数”，然后重试。"
 
-#: src/lib/job.cc:150
+#: src/lib/job.cc:149
 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 "
@@ -1613,7 +1622,7 @@ msgstr ""
 "这是一个KDM密钥文件。KDM密钥文件可以通过在你的DCP包上右键，点击“添加KDM文"
 "件”添加到DCP中。"
 
-#: src/lib/film.cc:534
+#: src/lib/film.cc:539
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
@@ -1621,7 +1630,7 @@ msgstr ""
 "这一工程文件是使用新版DCP-o-matic创建的，无法被这一版本的DCP-o-matic加载。抱"
 "歉！"
 
-#: src/lib/film.cc:519
+#: src/lib/film.cc:524
 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 "
@@ -1630,7 +1639,7 @@ msgstr ""
 "这一工程文件是使用旧版本的DCP-o-matic创建的，很遗憾无法被这一版本的DCP-o-"
 "matic加载。您需要创建一个新的工程文件，重新添加内容并重新设置。抱歉！"
 
-#: src/lib/job.cc:551
+#: src/lib/job.cc:550
 msgid "Thursday"
 msgstr "星期四"
 
@@ -1650,7 +1659,7 @@ msgstr "转码中 %1"
 msgid "Transitional"
 msgstr "过渡片"
 
-#: src/lib/job.cc:547
+#: src/lib/job.cc:546
 msgid "Tuesday"
 msgstr "星期二"
 
@@ -1670,11 +1679,11 @@ msgstr "服务器接收到意外的图像类型"
 msgid "Unknown"
 msgstr "未知"
 
-#: src/lib/job.cc:258
+#: src/lib/job.cc:257
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/lib/ffmpeg_decoder.cc:375
+#: src/lib/ffmpeg_decoder.cc:370
 msgid "Unrecognised audio sample format (%1)"
 msgstr "无法识别的音频采样格式 (%1)"
 
@@ -1694,7 +1703,7 @@ msgstr "未指定"
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/lib/util.cc:628 src/lib/util.cc:629
+#: src/lib/util.cc:634 src/lib/util.cc:635
 msgid "Unused"
 msgstr "未使用"
 
@@ -1706,7 +1715,7 @@ msgstr "上变换混音（左）"
 msgid "Upmix R"
 msgstr "上变换混音（右）"
 
-#: src/lib/util.cc:652
+#: src/lib/util.cc:658
 msgid "VI"
 msgstr "视力障碍"
 
@@ -1718,7 +1727,7 @@ msgstr "验证DCP中"
 msgid "Vertical flip"
 msgstr "垂直翻转"
 
-#: src/lib/util.cc:621
+#: src/lib/util.cc:627
 msgid "Visually impaired"
 msgstr "视力障碍"
 
@@ -1730,7 +1739,7 @@ msgstr "请稍候"
 msgid "Weave filter"
 msgstr "Weave 滤镜"
 
-#: src/lib/job.cc:549
+#: src/lib/job.cc:548
 msgid "Wednesday"
 msgstr "星期三"
 
@@ -1791,13 +1800,13 @@ msgstr ""
 "您已经添加了 %1 个VOB文件，如果他们来自一张DVD，请确保您已经导入了所有文件，"
 "否则可能无法正常播放。"
 
-#: src/lib/film.cc:1553
+#: src/lib/film.cc:1554
 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:560
+#: src/lib/hints.cc:561
 msgid ""
 "You have overlapping closed captions, which are not allowed in Interop "
 "DCPs.  Change your DCP standard to SMPTE."
@@ -1817,6 +1826,13 @@ msgstr ""
 msgid "You must add some content to the DCP before creating it"
 msgstr "在创建 DCP 之前，必须向其中添加一些内容"
 
+#: src/lib/hints.cc:715
+msgid ""
+"Your DCP has %1 audio channels, rather than 8 or 16.  This may cause some "
+"distributors to raise QC errors when they check your DCP.  To avoid this, "
+"set the DCP audio channels to 8 or 16."
+msgstr ""
+
 #: src/lib/hints.cc:109
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
@@ -1841,12 +1857,12 @@ msgid ""
 "audio content."
 msgstr "您的音频增益过大 (在%1)，请降低音频增益。"
 
-#: src/lib/playlist.cc:219
+#: src/lib/playlist.cc:235
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
 msgstr "您的项目包含不与帧边界对齐的视频内容。"
 
-#: src/lib/playlist.cc:239
+#: src/lib/playlist.cc:255
 msgid ""
 "Your project contains video content whose trim was not aligned to a frame "
 "boundary."
@@ -1898,11 +1914,11 @@ msgstr "复制 %1 中"
 msgid "could not find stream information"
 msgstr "找不到流信息"
 
-#: src/lib/reel_writer.cc:442
+#: src/lib/reel_writer.cc:457
 msgid "could not move atmos asset into the DCP (%1)"
 msgstr "无法将 Atmos asset移动到 DCP (%1)"
 
-#: src/lib/reel_writer.cc:425
+#: src/lib/reel_writer.cc:440
 msgid "could not move audio asset into the DCP (%1)"
 msgstr "无法将音频asset移动到 DCP (%1)"
 
@@ -1938,78 +1954,71 @@ msgstr "异步读取错误 (%1)"
 msgid "error during async_write (%1)"
 msgstr "异步写入错误 (%1)"
 
-#: src/lib/content.cc:483 src/lib/content.cc:492
+#: src/lib/content.cc:487 src/lib/content.cc:496
 msgid "frames per second"
 msgstr "每秒帧数"
 
 #. TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:206
+#: src/lib/util.cc:207
 msgid "h"
 msgstr "小时"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:748
+#: src/lib/dcp_content.cc:768
 msgid "it does not have closed captions in all its reels."
 msgstr "它的所有分卷都没有隐藏式字幕。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:737
+#: src/lib/dcp_content.cc:757
 msgid "it does not have open subtitles in all its reels."
 msgstr "它的所有分卷都没有开放式字幕。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:704
+#: src/lib/dcp_content.cc:723
 msgid "it does not have sound in all its reels."
 msgstr "它的所有分卷都没有声音。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:608
+#: src/lib/dcp_content.cc:630
 msgid "it has a different frame rate to the film."
 msgstr "它的帧率与影片不一致。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:763
+#: src/lib/dcp_content.cc:783
 msgid ""
 "it has a start trim so its subtitles or closed captions must be re-written."
 msgstr "当前内容有修剪，所以字幕或隐藏字幕必须重写。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:665
+#: src/lib/dcp_content.cc:682
 msgid "it is 2K and the film is 4K."
 msgstr "它是 2K 分辨率，而影片是 4K。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:662
+#: src/lib/dcp_content.cc:679
 msgid "it is 4K and the film is 2K."
 msgstr "它是 4K 分辨率，而影片是 2K。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:596
+#: src/lib/dcp_content.cc:618
 msgid "it is Interop and the film is set to SMPTE."
 msgstr "它是Interop类型，而实际打包类型是 SMPTE。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:600
+#: src/lib/dcp_content.cc:622
 msgid "it is SMPTE and the film is set to Interop."
 msgstr "它是SMPTE类型，而实际打包类型是 Interop。"
 
-#. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:710
+#: src/lib/dcp_content.cc:733
 msgid "it overlaps other audio content; remove the other content."
 msgstr "与其他音频内容重叠；请删除其他内容。"
 
-#. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:768
-msgid "it overlaps other text content; remove the other content."
-msgstr "与其他文字内容重叠；请删除其他内容。"
-
-#. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:675
+#: src/lib/dcp_content.cc:697
 msgid "it overlaps other video content; remove the other content."
 msgstr "与其他视频内容重叠；请删除其他内容。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:631
+#: src/lib/dcp_content.cc:653
 msgid ""
 "its reel lengths differ from those in the film; set the reel mode to 'split "
 "by video content'."
@@ -2017,12 +2026,12 @@ msgstr ""
 "其分卷时长与影片中的不一致；请设置 【 分卷模式 】 为【 按视频内容分割 】。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:670
+#: src/lib/dcp_content.cc:687
 msgid "its video frame size differs from the film's."
 msgstr "视频帧大小与影片不一致。"
 
 #. TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:215
+#: src/lib/util.cc:216
 msgid "m"
 msgstr "分"
 
@@ -2035,21 +2044,21 @@ msgid "name"
 msgstr "名字"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:754
+#: src/lib/dcp_content.cc:774
 msgid ""
 "one of its closed caption has a non-zero entry point so it must be re-"
 "written."
 msgstr "它的一个隐藏字幕有一个非零的时间点，因此必须重写。"
 
 #. TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:741
+#: src/lib/dcp_content.cc:761
 msgid ""
 "one of its subtitle reels has a non-zero entry point so it must be re-"
 "written."
 msgstr "它的一个字幕卷轴有一个非零的时间点，因此必须重写。"
 
 #. TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:225
+#: src/lib/util.cc:226
 msgid "s"
 msgstr "秒"
 
@@ -2061,6 +2070,11 @@ msgstr "sRGB"
 msgid "still"
 msgstr "静止图像"
 
+#: src/lib/dcp_content.cc:793
+#, fuzzy
+msgid "they overlap other text content; remove the other content."
+msgstr "与其他文字内容重叠；请删除其他内容。"
+
 #: src/lib/ffmpeg_examiner.cc:342
 msgid "unknown"
 msgstr "未知"