pot/merge.

1 files changed, 136 insertions, 129 deletions

diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index dc61b214d..35ad7acaa 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-06 19:22+0200\n"
+"POT-Creation-Date: 2021-04-10 02:17+0200\n"
 "PO-Revision-Date: 2019-04-21 22:30+0800\n"
 "Last-Translator: Hanyuan\n"
 "Language-Team: Hanyuan\n"
@@ -106,19 +106,19 @@ msgstr ""
 msgid "%1 [Atmos]"
 msgstr "%1 [全景声]"
 
-#: src/lib/dcp_content.cc:315
+#: src/lib/dcp_content.cc:319
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:335
+#: src/lib/ffmpeg_content.cc:345
 msgid "%1 [audio]"
 msgstr "%1 [音频]"
 
-#: src/lib/ffmpeg_content.cc:331
+#: src/lib/ffmpeg_content.cc:341
 msgid "%1 [movie]"
 msgstr "%1 [影片]"
 
-#: src/lib/ffmpeg_content.cc:333 src/lib/video_mxf_content.cc:97
+#: src/lib/ffmpeg_content.cc:343 src/lib/video_mxf_content.cc:97
 msgid "%1 [video]"
 msgstr "%1 [视频]"
 
@@ -171,7 +171,7 @@ msgstr "2.39 (Scope)"
 msgid "3D denoiser"
 msgstr "3D 降噪"
 
-#: src/lib/hints.cc:214
+#: src/lib/hints.cc:206
 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 "
@@ -203,7 +203,7 @@ msgid ""
 "Paypal to donate €10</a></ul><p>Thank you!"
 msgstr ""
 
-#: src/lib/hints.cc:171
+#: src/lib/hints.cc:163
 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 "
@@ -212,7 +212,7 @@ msgstr ""
 "有些放映设备不支持高码率DCP,我们推荐使用200Mbit/s以内的码率来进行打包，这种细"
 "微的调整是肉眼很难分辨的。"
 
-#: src/lib/ffmpeg_content.cc:615
+#: src/lib/ffmpeg_content.cc:635
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr "ARIB STD-B67 (HDR-HLG)"
 
@@ -220,7 +220,7 @@ msgstr "ARIB STD-B67 (HDR-HLG)"
 msgid "Advertisement"
 msgstr "广告片"
 
-#: src/lib/hints.cc:148
+#: src/lib/hints.cc:140
 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.  "
@@ -230,7 +230,7 @@ msgstr ""
 "您添加的媒体画面宽高比为2.39:1，但是DCP容器设置为1.85:1的模式。这将会使您的画"
 "面在放映时存在上下黑边。建议把DCP容器设置为2.39:1的模式。"
 
-#: src/lib/hints.cc:152
+#: src/lib/hints.cc:144
 #, fuzzy
 msgid ""
 "All of your content narrower than 1.90:1 but your DCP's container is Scope "
@@ -253,52 +253,59 @@ msgstr "分析音频中"
 msgid "Analysing subtitles"
 msgstr "定位字幕中"
 
-#: src/lib/hints.cc:366
+#: src/lib/hints.cc:358
 msgid ""
 "At least one marker comes after the end of the project and will be ignored."
 msgstr ""
 
-#: src/lib/hints.cc:457
+#: src/lib/hints.cc:449
 msgid "At least one of your closed caption files is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:450
+#: src/lib/hints.cc:442
 msgid "At least one of your closed caption files' XML part is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:465
+#: src/lib/hints.cc:457
 msgid "At least one of your subtitle files is larger than "
 msgstr ""
 
-#: src/lib/hints.cc:567
+#: src/lib/hints.cc:559
 msgid ""
 "At least one of your subtitle lines has more than 52 characters.  It is "
-"advisable to make each line 52 characters at most in length."
+"recommended to make each line 52 characters at most in length."
+msgstr ""
+
+#: src/lib/hints.cc:564
+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:557
+#: src/lib/hints.cc:549
 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:547
+#: src/lib/hints.cc:539
 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:552
+#: src/lib/hints.cc:544
 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:597
+#: src/lib/hints.cc:594
 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\" tab"
+"closed caption content in the \"Content→Timed text\", \"Content→Open "
+"subtitles\" or \"Content→Closed captions\" tab"
 msgstr ""
 
 #: src/lib/audio_content.cc:291
@@ -313,52 +320,52 @@ msgstr "音频将被重新采样至 %1Hz"
 msgid "Audio will not be resampled"
 msgstr "音频不能被重新采样"
 
-#: src/lib/ffmpeg_content.cc:609
+#: src/lib/ffmpeg_content.cc:629
 msgid "BT1361 extended colour gamut"
 msgstr "BT1361扩展色域"
 
-#: src/lib/ffmpeg_content.cc:577
+#: src/lib/ffmpeg_content.cc:597
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:632
+#: src/lib/ffmpeg_content.cc:652
 msgid "BT2020 constant luminance"
 msgstr "BT2020 恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:611
+#: src/lib/ffmpeg_content.cc:631
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 采样深度为 10-bit"
 
-#: src/lib/ffmpeg_content.cc:612
+#: src/lib/ffmpeg_content.cc:632
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 采样深度为 12 bits"
 
-#: src/lib/ffmpeg_content.cc:631
+#: src/lib/ffmpeg_content.cc:651
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 非恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:636
+#: src/lib/ffmpeg_content.cc:656
 msgid "BT2100"
 msgstr "BT2100"
 
-#: src/lib/ffmpeg_content.cc:573
+#: src/lib/ffmpeg_content.cc:593
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:627
+#: src/lib/ffmpeg_content.cc:647
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:572
+#: src/lib/ffmpeg_content.cc:592
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:569 src/lib/ffmpeg_content.cc:598
-#: src/lib/ffmpeg_content.cc:623
+#: src/lib/ffmpeg_content.cc:589 src/lib/ffmpeg_content.cc:618
+#: src/lib/ffmpeg_content.cc:643
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:643
+#: src/lib/ffmpeg_content.cc:663
 msgid "Bits per pixel"
 msgstr "像素位"
 
@@ -415,12 +422,12 @@ msgstr "检查现有的图像数据"
 msgid "Choose 'Make DCP' again when you have done this."
 msgstr "请在做完更改之后再次执行“制作DCP”命令"
 
-#: src/lib/ffmpeg_content.cc:635
+#: src/lib/ffmpeg_content.cc:655
 #, fuzzy
 msgid "Chroma-derived constant luminance"
 msgstr "BT2020 恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:634
+#: src/lib/ffmpeg_content.cc:654
 #, fuzzy
 msgid "Chroma-derived non-constant luminance"
 msgstr "BT2020 非恒定亮度"
@@ -429,7 +436,7 @@ msgstr "BT2020 非恒定亮度"
 msgid "Closed captions"
 msgstr "隐藏式字幕"
 
-#: src/lib/ffmpeg_content.cc:594
+#: src/lib/ffmpeg_content.cc:614
 msgid "Colour primaries"
 msgstr "原色"
 
@@ -443,17 +450,17 @@ msgstr "原色"
 #. / file is limited, so that not all possible values are valid.
 #. / TRANSLATORS: this means that the range of pixel values used in this
 #. / file is full, so that all possible pixel values are valid.
-#: src/lib/ffmpeg_content.cc:526 src/lib/ffmpeg_content.cc:533
-#: src/lib/ffmpeg_content.cc:540 src/lib/ffmpeg_content.cc:550
-#: src/lib/ffmpeg_content.cc:555 src/lib/ffmpeg_content.cc:560
+#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:553
+#: src/lib/ffmpeg_content.cc:560 src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:575 src/lib/ffmpeg_content.cc:580
 msgid "Colour range"
 msgstr "色彩范围"
 
-#: src/lib/ffmpeg_content.cc:619
+#: src/lib/ffmpeg_content.cc:639
 msgid "Colour transfer characteristic"
 msgstr "彩色传输特性"
 
-#: src/lib/ffmpeg_content.cc:640
+#: src/lib/ffmpeg_content.cc:660
 msgid "Colourspace"
 msgstr "色彩空间"
 
@@ -481,15 +488,15 @@ msgstr "源内容和DCP设定帧率需要一致。\n"
 msgid "Content audio sample rate"
 msgstr "源音频采样率"
 
-#: src/lib/ffmpeg_content.cc:148
+#: src/lib/ffmpeg_content.cc:155
 msgid "Content to be joined must all have or not have audio"
 msgstr "要加入的内容必须都有或都没有音频"
 
-#: src/lib/ffmpeg_content.cc:151
+#: src/lib/ffmpeg_content.cc:158
 msgid "Content to be joined must all have or not have subtitles or captions"
 msgstr "要加入的内容必须都有或都没有隐藏式字幕"
 
-#: src/lib/ffmpeg_content.cc:145
+#: src/lib/ffmpeg_content.cc:152
 msgid "Content to be joined must all have or not have video"
 msgstr "要加入的内容必须都有或都没有视频"
 
@@ -600,7 +607,7 @@ msgstr "DCP轨道必须相同。"
 msgid "Content to be joined must use the same fonts."
 msgstr "字幕字体必须相同。"
 
-#: src/lib/ffmpeg_content.cc:172
+#: src/lib/ffmpeg_content.cc:179
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "字幕流必须相同。"
 
@@ -748,7 +755,7 @@ msgstr ""
 "DCP-o-matic必须把您DCP的设置更改为OV（原创）。请重新检查设置确认设置内容是否"
 "为您的期望值。"
 
-#: src/lib/ffmpeg_content.cc:112
+#: src/lib/ffmpeg_content.cc:118
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "不支持的格式`%1'。"
@@ -808,11 +815,11 @@ msgstr "该DCP中将每一帧复制为两帧。\n"
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "每个内容帧将在DCP中重复%1次。\n"
 
-#: src/lib/send_kdm_email_job.cc:83
+#: src/lib/send_kdm_email_job.cc:89
 msgid "Email KDMs"
 msgstr "邮件发送 KDMs"
 
-#: src/lib/send_kdm_email_job.cc:86
+#: src/lib/send_kdm_email_job.cc:92
 #, fuzzy
 msgid "Email KDMs for %2"
 msgstr "邮件发送KDMs给 %1"
@@ -845,7 +852,7 @@ msgstr "字幕文件错误: 执行为 %1 实际要求为%2"
 msgid "Error: %1"
 msgstr "错误: (%1)"
 
-#: src/lib/hints.cc:399
+#: src/lib/hints.cc:391
 msgid "Examining closed captions"
 msgstr "检查隐藏式字幕中"
 
@@ -862,7 +869,7 @@ msgstr "定位字幕中"
 msgid "Extracting"
 msgstr "分级"
 
-#: src/lib/ffmpeg_content.cc:626
+#: src/lib/ffmpeg_content.cc:646
 msgid "FCC"
 msgstr "FCC"
 
@@ -887,11 +894,11 @@ msgstr "正片"
 msgid "Filename"
 msgstr "文件名"
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:596
 msgid "Film"
 msgstr "电影"
 
-#: src/lib/ffmpeg_examiner.cc:111
+#: src/lib/ffmpeg_examiner.cc:112
 msgid "Finding length"
 msgstr "定位长度"
 
@@ -903,11 +910,11 @@ msgstr "帧率"
 msgid "Friday"
 msgstr "星期五"
 
-#: src/lib/ffmpeg_content.cc:560
+#: src/lib/ffmpeg_content.cc:580
 msgid "Full"
 msgstr "Full(全幅/1.90)"
 
-#: src/lib/ffmpeg_content.cc:540
+#: src/lib/ffmpeg_content.cc:560
 msgid "Full (0-%1)"
 msgstr "全幅 (0-%1)"
 
@@ -931,11 +938,11 @@ msgstr "DCP中视频总时长"
 msgid "Full length in video frames at content rate"
 msgstr "源视频时长"
 
-#: src/lib/ffmpeg_content.cc:601
+#: src/lib/ffmpeg_content.cc:621
 msgid "Gamma 22 (BT470M)"
 msgstr "伽玛 2.2 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:602
+#: src/lib/ffmpeg_content.cc:622
 msgid "Gamma 28 (BT470BG)"
 msgstr "伽玛 2.8 (BT470BG)"
 
@@ -963,26 +970,26 @@ msgstr "水平翻转"
 msgid "Hz"
 msgstr "Hz（赫兹）"
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:630
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB或sYCC)"
 
-#: src/lib/ffmpeg_content.cc:608
+#: src/lib/ffmpeg_content.cc:628
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
-#: src/lib/hints.cc:190
+#: src/lib/hints.cc:182
 msgid "If you do use 25fps you should change your DCP standard to SMPTE."
 msgstr "如果您选择使用25fps，那就必须把DCP标准选线设置为SMPTE"
 
-#: src/lib/hints.cc:253
+#: src/lib/hints.cc:245
 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:540
+#: src/lib/hints.cc:532
 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."
@@ -992,7 +999,7 @@ msgstr ""
 msgid "It is not known what caused this error."
 msgstr "未知错误."
 
-#: src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:610
 msgid "JEDEC P22"
 msgstr "JEDEC P22"
 
@@ -1040,23 +1047,23 @@ msgstr "次低"
 msgid "Lfe (sub)"
 msgstr "次低（重低音）"
 
-#: src/lib/ffmpeg_content.cc:555
+#: src/lib/ffmpeg_content.cc:575
 msgid "Limited"
 msgstr "限制"
 
-#: src/lib/ffmpeg_content.cc:533
+#: src/lib/ffmpeg_content.cc:553
 msgid "Limited (%1-%2)"
 msgstr "限制 (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:605
+#: src/lib/ffmpeg_content.cc:625
 msgid "Linear"
 msgstr "线性"
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:626
 msgid "Logarithmic (100:1 range)"
 msgstr "对数 (范围 100:1)"
 
-#: src/lib/ffmpeg_content.cc:607
+#: src/lib/ffmpeg_content.cc:627
 msgid "Logarithmic (316:1 range)"
 msgstr "对数 (范围 316:1)"
 
@@ -1076,19 +1083,19 @@ msgstr "中置解码"
 msgid "Misc"
 msgstr "其他"
 
-#: src/lib/dcp_examiner.cc:152
+#: src/lib/dcp_examiner.cc:164
 msgid "Mismatched audio channel counts in DCP"
 msgstr "DCP中的音频通道数不匹配"
 
-#: src/lib/dcp_examiner.cc:158
+#: src/lib/dcp_examiner.cc:170
 msgid "Mismatched audio sample rates in DCP"
 msgstr "DCP中的音频采样率不符合"
 
-#: src/lib/dcp_examiner.cc:125
+#: src/lib/dcp_examiner.cc:137
 msgid "Mismatched frame rates in DCP"
 msgstr "DCP中的帧率不匹配"
 
-#: src/lib/dcp_examiner.cc:133
+#: src/lib/dcp_examiner.cc:145
 msgid "Mismatched video sizes in DCP"
 msgstr "DCP中的视频分辨率不匹配"
 
@@ -1112,7 +1119,7 @@ msgstr "动态隔行补偿"
 msgid "No CPLs found in DCP."
 msgstr "DCP中没有找到CPL文件"
 
-#: src/lib/kdm_with_metadata.cc:207 src/lib/send_notification_email_job.cc:65
+#: src/lib/kdm_with_metadata.cc:210 src/lib/send_notification_email_job.cc:65
 msgid "No mail server configured in preferences"
 msgstr "没有配置偏好的邮件服务"
 
@@ -1192,7 +1199,7 @@ msgstr "公共服务或公告"
 msgid "R"
 msgstr "右声道"
 
-#: src/lib/ffmpeg_content.cc:622
+#: src/lib/ffmpeg_content.cc:642
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
@@ -1252,47 +1259,47 @@ msgstr "右环绕"
 msgid "S-Gamut3/S-Log3"
 msgstr "索尼S-Gamut3/S-Log3"
 
-#: src/lib/ffmpeg_content.cc:574 src/lib/ffmpeg_content.cc:603
+#: src/lib/ffmpeg_content.cc:594 src/lib/ffmpeg_content.cc:623
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:628
+#: src/lib/ffmpeg_content.cc:648
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:633
+#: src/lib/ffmpeg_content.cc:653
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr "SMPTE 2085, Y'D'zD'x"
 
-#: src/lib/ffmpeg_content.cc:575 src/lib/ffmpeg_content.cc:604
-#: src/lib/ffmpeg_content.cc:629
+#: src/lib/ffmpeg_content.cc:595 src/lib/ffmpeg_content.cc:624
+#: src/lib/ffmpeg_content.cc:649
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/hints.cc:579
+#: src/lib/hints.cc:576
 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).  "
 "You should add these markers using the 'Markers' button in the \"DCP\" tab."
 msgstr ""
 
-#: src/lib/ffmpeg_content.cc:613
+#: src/lib/ffmpeg_content.cc:633
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
 msgstr "SMPTE ST 2084 for 10, 12, 14和16 bit"
 
-#: src/lib/ffmpeg_content.cc:614
+#: src/lib/ffmpeg_content.cc:634
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:578
+#: src/lib/ffmpeg_content.cc:598
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
-#: src/lib/ffmpeg_content.cc:579
+#: src/lib/ffmpeg_content.cc:599
 msgid "SMPTE ST 431-2 (2011)"
 msgstr "SMPTE ST 431-2 (2011)"
 
-#: src/lib/ffmpeg_content.cc:580
+#: src/lib/ffmpeg_content.cc:600
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr "SMPTE ST 432-1 D65 (2010)"
 
@@ -1337,7 +1344,7 @@ msgid ""
 "project in DCP-o-matic, check the settings, then save it before trying again."
 msgstr ""
 
-#: src/lib/hints.cc:521
+#: src/lib/hints.cc:513
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
@@ -1355,7 +1362,7 @@ msgstr "一些内容需要OV（声明原创）"
 msgid "Stereo"
 msgstr "双声道"
 
-#: src/lib/upmixer_a.cc:46
+#: src/lib/upmixer_a.cc:51
 msgid "Stereo to 5.1 up-mixer A"
 msgstr "立体声到5.1，混音器A"
 
@@ -1379,7 +1386,7 @@ msgstr "胶转磁滤镜"
 msgid "Test"
 msgstr "测试片"
 
-#: src/lib/string_text_file_content.cc:77
+#: src/lib/string_text_file_content.cc:85
 msgid "Text subtitles"
 msgstr "文本字幕"
 
@@ -1424,7 +1431,7 @@ msgstr "文件 %1 被缩短了 %2 毫秒."
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr "文件 %1 被延长了 %2 毫秒."
 
-#: src/lib/hints.cc:243
+#: src/lib/hints.cc:235
 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 "
@@ -1433,7 +1440,7 @@ msgid ""
 "systems support your chosen DCP rate."
 msgstr ""
 
-#: src/lib/dcp_content.cc:654
+#: src/lib/dcp_content.cc:658
 msgid "There is no video in this DCP"
 msgstr "DCP中不包含画面"
 
@@ -1526,7 +1533,7 @@ msgstr "意外的ZIP文件的内容"
 msgid "Unexpected image type received by server"
 msgstr "服务器接收到意外的图像类型"
 
-#: src/lib/cross_common.cc:88 src/lib/dcp_examiner.cc:182
+#: src/lib/cross_common.cc:88 src/lib/dcp_text_track.cc:53
 #, fuzzy
 msgid "Unknown"
 msgstr "未知"
@@ -1543,11 +1550,11 @@ msgstr "无法识别的音频采样格式 (%1)"
 msgid "Unsharp mask and Gaussian blur"
 msgstr "USM锐化和高斯模糊"
 
-#: src/lib/ffmpeg_content.cc:526 src/lib/ffmpeg_content.cc:550
-#: src/lib/ffmpeg_content.cc:568 src/lib/ffmpeg_content.cc:570
-#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:597
-#: src/lib/ffmpeg_content.cc:599 src/lib/ffmpeg_content.cc:600
-#: src/lib/ffmpeg_content.cc:624 src/lib/ffmpeg_content.cc:625
+#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:570
+#: src/lib/ffmpeg_content.cc:588 src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:591 src/lib/ffmpeg_content.cc:617
+#: src/lib/ffmpeg_content.cc:619 src/lib/ffmpeg_content.cc:620
+#: src/lib/ffmpeg_content.cc:644 src/lib/ffmpeg_content.cc:645
 msgid "Unspecified"
 msgstr "未指定"
 
@@ -1559,11 +1566,11 @@ msgstr "无标题"
 msgid "Unused"
 msgstr "未使用"
 
-#: src/lib/upmixer_a.cc:127 src/lib/upmixer_b.cc:137
+#: src/lib/upmixer_a.cc:138 src/lib/upmixer_b.cc:137
 msgid "Upmix L"
 msgstr "左混"
 
-#: src/lib/upmixer_a.cc:128 src/lib/upmixer_b.cc:138
+#: src/lib/upmixer_a.cc:139 src/lib/upmixer_b.cc:138
 msgid "Upmix R"
 msgstr "右混"
 
@@ -1596,7 +1603,7 @@ msgstr "胶转磁滤镜"
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/lib/ffmpeg_content.cc:630
+#: src/lib/ffmpeg_content.cc:650
 msgid "YCOCG"
 msgstr "YCOCG"
 
@@ -1604,7 +1611,7 @@ msgstr "YCOCG"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "反隔行扫描滤镜"
 
-#: src/lib/hints.cc:203
+#: src/lib/hints.cc:195
 #, fuzzy
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
@@ -1614,7 +1621,7 @@ msgstr ""
 "你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准（SMPTE）"
 "的DCP。"
 
-#: src/lib/hints.cc:187
+#: src/lib/hints.cc:179
 #, fuzzy
 msgid ""
 "You are set up for a DCP at a frame rate of %1 fps.  This frame rate is not "
@@ -1624,7 +1631,7 @@ msgstr ""
 "你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准（SMPTE）"
 "的DCP。"
 
-#: src/lib/hints.cc:197
+#: src/lib/hints.cc:189
 #, fuzzy
 msgid ""
 "You are set up for a DCP frame rate of 30fps, which is not supported by all "
@@ -1633,13 +1640,13 @@ msgstr ""
 "你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准（SMPTE）"
 "的DCP。"
 
-#: src/lib/hints.cc:308
+#: src/lib/hints.cc:300
 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 "您添加的内容是3D内容，但您的DCP包设置为2D模式，请设置到3D模式。"
 
-#: src/lib/hints.cc:124
+#: src/lib/hints.cc:116
 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 "
@@ -1648,7 +1655,7 @@ msgstr ""
 "你用的是dcp-o-matic双声道转5.1立体声的混频器。这是实验性的功能，可能导致音频"
 "质量差。如果你继续，你应该检查完成的DCP声音."
 
-#: src/lib/hints.cc:292
+#: src/lib/hints.cc:284
 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."
@@ -1662,13 +1669,13 @@ msgid ""
 "frame rate.  You must remove some Atmos content."
 msgstr ""
 
-#: src/lib/hints.cc:528
+#: src/lib/hints.cc:520
 msgid ""
 "You have overlapping closed captions, which are not allowed in Interop "
 "DCPs.  Change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/hints.cc:276
+#: src/lib/hints.cc:268
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
@@ -1679,7 +1686,7 @@ msgstr "您添加的字体文件超过了640KB，部分服务器不支持超过6
 msgid "You must add some content to the DCP before creating it"
 msgstr "您必须在创建DCP之前添加一些内容"
 
-#: src/lib/hints.cc:114
+#: src/lib/hints.cc:106
 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 "
@@ -1687,7 +1694,7 @@ msgid ""
 "extras with silence."
 msgstr ""
 
-#: src/lib/hints.cc:162
+#: src/lib/hints.cc:154
 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"
@@ -1695,7 +1702,7 @@ msgstr ""
 "DCP使用了不常见的画幅比例，可能导致部分电影放映机无法正常播放，建议改成Flat "
 "(1.77/1.78/1.85) 或者Scope (2.35/2.39) 比例"
 
-#: src/lib/hints.cc:338
+#: src/lib/hints.cc:330
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
@@ -1725,7 +1732,7 @@ msgstr "[动态图像]"
 msgid "[still]"
 msgstr "[静态图像]"
 
-#: src/lib/dcp_subtitle_content.cc:97 src/lib/string_text_file_content.cc:71
+#: src/lib/dcp_subtitle_content.cc:97 src/lib/string_text_file_content.cc:78
 msgid "[subtitles]"
 msgstr "[字幕]"
 
@@ -1755,7 +1762,7 @@ msgstr "打包类型"
 msgid "copying %1"
 msgstr "复制中... %1"
 
-#: src/lib/ffmpeg.cc:135 src/lib/ffmpeg_image_proxy.cc:166
+#: src/lib/ffmpeg.cc:139 src/lib/ffmpeg_image_proxy.cc:166
 msgid "could not find stream information"
 msgstr "找不到流信息"
 
@@ -1821,79 +1828,79 @@ msgid "h"
 msgstr "小时"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:747
+#: src/lib/dcp_content.cc:751
 #, fuzzy
 msgid "it does not have closed captions in all its reels."
 msgstr "该DCP的所有分卷无声音。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:736
+#: src/lib/dcp_content.cc:740
 #, fuzzy
 msgid "it does not have open subtitles in all its reels."
 msgstr "该DCP的所有分卷无字幕。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:703
+#: src/lib/dcp_content.cc:707
 #, fuzzy
 msgid "it does not have sound in all its reels."
 msgstr "该DCP的所有分卷无声音。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:607
+#: src/lib/dcp_content.cc:611
 #, fuzzy
 msgid "it has a different frame rate to the film."
 msgstr "影片与DCP的帧速率不一致."
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:762
+#: src/lib/dcp_content.cc:766
 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:664
+#: src/lib/dcp_content.cc:668
 #, fuzzy
 msgid "it is 2K and the film is 4K."
 msgstr "打包内容被设置为Interop类型，而实际打包类型是 SMPTE。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:661
+#: src/lib/dcp_content.cc:665
 #, fuzzy
 msgid "it is 4K and the film is 2K."
 msgstr "打包内容被设置为Interop类型，而实际打包类型是 SMPTE。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:595
+#: src/lib/dcp_content.cc:599
 #, fuzzy
 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:599
+#: src/lib/dcp_content.cc:603
 #, fuzzy
 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:709
+#: src/lib/dcp_content.cc:713
 #, fuzzy
 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:767
+#: src/lib/dcp_content.cc:771
 #, fuzzy
 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:674
+#: src/lib/dcp_content.cc:678
 #, fuzzy
 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:630
+#: src/lib/dcp_content.cc:634
 #, fuzzy
 msgid ""
 "its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1901,7 +1908,7 @@ msgid ""
 msgstr "影片时长与DCP中的分卷时长不一致，请设置 【 分卷模式 】 来分割该内容。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:669
+#: src/lib/dcp_content.cc:673
 #, fuzzy
 msgid "its video frame size differs from the film's."
 msgstr "视频帧大小与DCP不一致。"
@@ -1920,14 +1927,14 @@ msgid "name"
 msgstr "名字"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:753
+#: src/lib/dcp_content.cc:757
 msgid ""
 "one if 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:740
+#: src/lib/dcp_content.cc:744
 msgid ""
 "one if its subtitle reels has a non-zero entry point so it must be re-"
 "written."
@@ -1950,7 +1957,7 @@ msgstr "内容不完整"
 msgid "still"
 msgstr "静止图像"
 
-#: src/lib/ffmpeg_examiner.cc:329
+#: src/lib/ffmpeg_examiner.cc:334
 msgid "unknown"
 msgstr "未知"