X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fpo%2Fzh_CN.po;h=8013a68f33b21b32276760b12c3d4c489fb90303;hp=59807e9861173271cbcd0a8c54c4aadf33df7a7f;hb=eb3301dbdf655a36c98f50eb9b4adcfe4d1dad0c;hpb=cc09cc4b12d199d490217d7b60ed0af69afb90de

diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 59807e986..8013a68f3 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -1,25 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# libdcpomatic translation file, Chinese Simplified (Rov8 branch)
+# Copyright (C) 2015-2021 DCP-o-matic zh_CN contributors
+# This file is distributed under the same license as the DCP-o-matic package.
+#
+# Translators:
+# Rov (若文) <lojy2009@qq.com>, 2015-2016
+# Hanyuan (刘汉源), 2016-2019
+# kahn <bnm14744@gmail.com>, 2021
+# Dian Li <xslidian@gmail.com>, 2022
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-03 01:19+0200\n"
-"PO-Revision-Date: 2019-04-21 22:30+0800\n"
-"Last-Translator: Hanyuan\n"
-"Language-Team: Hanyuan\n"
-"Language: zh\n"
+"POT-Creation-Date: 2023-01-15 19:59+0100\n"
+"PO-Revision-Date: 2023-03-11 20:28+0800\n"
+"Last-Translator: Dian Li <xslidian@gmail.com>\n"
+"Language-Team: Chinese Simplified (Rov8 branch)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.2.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/lib/video_content.cc:468
+#: src/lib/video_content.cc:503
 #, c-format
 msgid ""
 "\n"
@@ -28,15 +33,15 @@ msgstr ""
 "\n"
 "源视频帧率 %.4f\n"
 
-#: src/lib/video_content.cc:433
+#: src/lib/video_content.cc:468
 msgid ""
 "\n"
 "Cropped to %1x%2"
 msgstr ""
 "\n"
-"裁剪为%1x%2"
+"裁剪为 %1x%2"
 
-#: src/lib/video_content.cc:426
+#: src/lib/video_content.cc:459
 #, c-format
 msgid ""
 "\n"
@@ -45,7 +50,7 @@ msgstr ""
 "\n"
 "显示宽高比 %.2f:1"
 
-#: src/lib/video_content.cc:456
+#: src/lib/video_content.cc:491
 msgid ""
 "\n"
 "Padded with black to fit container %1 (%2x%3)"
@@ -53,7 +58,7 @@ msgstr ""
 "\n"
 "填充为黑色，以适应打包宽高比 %1 (%2x%3)"
 
-#: src/lib/video_content.cc:446
+#: src/lib/video_content.cc:481
 msgid ""
 "\n"
 "Scaled to %1x%2"
@@ -61,21 +66,22 @@ msgstr ""
 "\n"
 "缩放到 %1x%2"
 
-#: src/lib/video_content.cc:450 src/lib/video_content.cc:461
+#: src/lib/video_content.cc:485 src/lib/video_content.cc:496
 #, c-format
 msgid " (%.2f:1)"
 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:494
+#: src/lib/job.cc:559
 msgid " on %1"
-msgstr " on %1"
+msgstr " 于 %1"
 
-#: src/lib/config.cc:1189
+#: src/lib/config.cc:1258
 msgid ""
 "$CPL_NAME\n"
 "\n"
+"CPL Filename: $CPL_FILENAME\n"
 "Type: $TYPE\n"
 "Format: $CONTAINER\n"
 "Audio: $AUDIO\n"
@@ -86,6 +92,7 @@ msgid ""
 msgstr ""
 "$CPL_NAME\n"
 "\n"
+"CPL 文件名: $CPL_FILENAME\n"
 "类型: $TYPE\n"
 "格式: $CONTAINER\n"
 "音轨: $AUDIO\n"
@@ -94,109 +101,142 @@ msgstr ""
 "长度: $LENGTH\n"
 "大小: $SIZE\n"
 
-#: src/lib/config.cc:1167
+#: src/lib/config.cc:1236
 msgid "$JOB_NAME: $JOB_STATUS"
-msgstr "$JOB_NAME: $JOB_STATUS"
+msgstr "$任务名称: $JOB_STATUS"
 
-#: src/lib/cross_common.cc:89
+#: src/lib/cross_common.cc:102
 msgid "%1 (%2 GB) [%3]"
-msgstr ""
+msgstr "%1 (%2 GB) [%3]"
 
-#: src/lib/atmos_mxf_content.cc:84
+#: src/lib/atmos_mxf_content.cc:96
 msgid "%1 [Atmos]"
 msgstr "%1 [全景声]"
 
-#: src/lib/dcp_content.cc:287
+#: src/lib/dcp_content.cc:316
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:353
+#: src/lib/ffmpeg_content.cc:349
 msgid "%1 [audio]"
 msgstr "%1 [音频]"
 
-#: src/lib/ffmpeg_content.cc:349
+#: src/lib/ffmpeg_content.cc:345
 msgid "%1 [movie]"
 msgstr "%1 [影片]"
 
-#: src/lib/ffmpeg_content.cc:351 src/lib/video_mxf_content.cc:97
+#: src/lib/ffmpeg_content.cc:347 src/lib/video_mxf_content.cc:105
 msgid "%1 [video]"
 msgstr "%1 [视频]"
 
-#: src/lib/video_content.cc:421
+#: src/lib/transcode_job.cc:172
+msgid "%1; %2/%3 frames"
+msgstr "%1; %2/%3 帧"
+
+#: src/lib/video_content.cc:454
 #, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ", 像素宽高比 %.2f:1"
 
-#: src/lib/ratio.cc:38
+#: src/lib/ratio.cc:45
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/ratio.cc:39
+#: src/lib/ratio.cc:46
 msgid "1.33 (4:3)"
 msgstr "1.33 (4:3)"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:47
 msgid "1.38 (Academy)"
-msgstr "1.38 (Academy学院)"
+msgstr "1.38 (Academy)"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ratio.cc:48
 msgid "1.43 (IMAX)"
 msgstr "1.43 (IMAX)"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:49
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:50
 msgid "1.78 (16:9 or HD)"
-msgstr "1.78 (16:9 or HD)"
+msgstr "1.78 (16:9 或 HD)"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:51
 msgid "1.85 (Flat)"
-msgstr "1.85 (Flat)"
+msgstr "1.85 (遮幅)"
 
-#: src/lib/ratio.cc:47
+#: src/lib/ratio.cc:54
 msgid "1.90 (Full frame)"
-msgstr "Full(全幅/1.90)"
+msgstr "1.90 (全幅)"
 
-#: src/lib/ratio.cc:45
+#: src/lib/util.cc:599
+msgid "10"
+msgstr "10"
+
+#: src/lib/util.cc:605
+msgid "16"
+msgstr "16"
+
+#: src/lib/ratio.cc:52
 msgid "2.35 (35mm Scope)"
-msgstr "2.35 (35mm Scope)"
+msgstr "2.35 (35mm 宽幅)"
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:53
 msgid "2.39 (Scope)"
-msgstr "2.39 (Scope)"
+msgstr "2.39 (宽幅)"
 
-#: src/lib/filter.cc:78
+#: src/lib/filter.cc:90
 msgid "3D denoiser"
 msgstr "3D 降噪"
 
+#: src/lib/hints.cc:209
+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 "
+"advisable to set the DCP to be 2K in the \"DCP→Video\" tab."
+msgstr ""
+"只有极少数的放映设备支持4K 3D，除非您确认你的设备支持放映，否则建议在“DCP→视"
+"频”选项卡中将DCP设置为2K。"
+
+#: src/lib/util.cc:598
+msgid "9"
+msgstr "9"
+
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:144
-#, c-format
-msgid "; %.1f fps"
-msgstr "; %.1f fps"
+#: src/lib/transcode_job.cc:175
+msgid "; %1 fps"
+msgstr "; %1 fps"
 
-#: src/lib/job.cc:499
+#: src/lib/job.cc:564
 msgid "; %1 remaining; finishing at %2%3"
 msgstr "; 剩余 %1 ; 完成于 %2%3"
 
-#: src/lib/analytics.cc:57
-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 "
-"of DCP-o-matic. I work on it in my spare time (with the help of a fine "
-"volunteer team of testers and translators) and I release it as free software."
-"<p>If you find DCP-o-matic useful, please consider a donation to the "
-"project. Financial support will help me to spend more time developing DCP-o-"
-"matic and making it better!<p><ul><li><a href=\"https://dcpomatic.com/"
-"donate_amount?amount=40\">Go to Paypal to donate €40</a><li><a href="
-"\"https://dcpomatic.com/donate_amount?amount=20\">Go to Paypal to donate "
-"€20</a><li><a href=\"https://dcpomatic.com/donate_amount?amount=10\">Go to "
-"Paypal to donate €10</a></ul><p>Thank you!"
+#: 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 of DCP-o-matic. I work on it in my spare time (with the help of a "
+"fine volunteer team of testers and translators) and I release it as free "
+"software.<p>If you find DCP-o-matic useful, please consider a donation to "
+"the project. Financial support will help me to spend more time developing "
+"DCP-o-matic and making it better!<p><ul><li><a href=\"https://dcpomatic.com/"
+"donate_amount?amount=40\">Go to Paypal to donate €40</a><li><a "
+"href=\"https://dcpomatic.com/donate_amount?amount=20\">Go to Paypal to "
+"donate €20</a><li><a href=\"https://dcpomatic.com/donate_amount?"
+"amount=10\">Go to Paypal to donate €10</a></ul><p>Thank you!"
 msgstr ""
-
-#: src/lib/hints.cc:150
+"<h2>您已经用 DCP-o-matic 创建了%1 DCPs！</h2><img width=“20%%” src=“memory:"
+"me.jpg” align=“center”><p>你好。我是卡尔，我是DCP-o-matic的开发者。我在业余时"
+"间(在一个优秀的测试员和翻译志愿者团队的帮助下)开发它，并将其作为开源软件发布."
+"<p>如果您觉得DCP-o-matic对您有帮助，请考虑向该项目捐款。资金支持将帮助我花更"
+"多的时间开发DCP-o-matic并使其变得更好！<p><ul><li><a href=“https://dcpomatic."
+"com/donate_amount?amount=40”>去贝宝(Paypal)捐款40欧元</a><li><a "
+"href=“https://dcpomatic.com/donate_amount?amount=20”>去贝宝(Paypal)捐款20欧元"
+"</a><li><a href=“https://dcpomatic.com/donate_amount?amount=10”>去贝宝"
+"(Paypal)捐款10欧元</a></ul><p>谢谢您！"
+
+#: src/lib/hints.cc:166
 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 "
@@ -205,24 +245,24 @@ msgstr ""
 "有些放映设备不支持高码率DCP,我们推荐使用200Mbit/s以内的码率来进行打包，这种细"
 "微的调整是肉眼很难分辨的。"
 
-#: src/lib/ffmpeg_content.cc:631
+#: src/lib/text_content.cc:248
+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 "
+"has been cleared."
+msgstr ""
+"此项目内有字幕或隐藏式字幕文件被标注为 DCP-o-matic 无法识别的“%1”语言。  该文"
+"件的语言字段已被清空。"
+
+#: src/lib/ffmpeg_content.cc:641
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
-msgstr "ARIB STD-B67 (HDR-HLG)"
+msgstr "ARIB STD-B67 (“HLG” HDR)"
 
-#: src/lib/dcp_content_type.cc:55
+#: src/lib/dcp_content_type.cc:62
 msgid "Advertisement"
 msgstr "广告片"
 
-#: src/lib/hints.cc:142
-msgid ""
-"All of your content is 2.35:1 or narrower 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 ""
-"您添加的媒体画面宽高比为2.35:1，但是DCP容器设置为2.39:1的模式。这将会使您的画"
-"面在放映时存在上下黑边。建议把DCP容器设置为与素材相同宽高比的模式。"
-
-#: src/lib/hints.cc:138
+#: src/lib/hints.cc:143
 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.  "
@@ -232,148 +272,216 @@ msgstr ""
 "您添加的媒体画面宽高比为2.39:1，但是DCP容器设置为1.85:1的模式。这将会使您的画"
 "面在放映时存在上下黑边。建议把DCP容器设置为2.39:1的模式。"
 
-#: src/lib/job.cc:109
+#: src/lib/hints.cc:147
+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 ""
+"您添加的媒体画面宽高比小于1.90:1，但是DCP容器设置为2.39:1的模式。这将会使您的"
+"画面在放映时存在左右黑边。建议把DCP容器设置为与素材相同宽高比的模式。"
+
+#: src/lib/job.cc:115
 msgid "An error occurred whilst handling the file %1."
-msgstr "执行错误 %1."
+msgstr "处理文件 %1 时发生错误。"
 
-#: src/lib/analyse_audio_job.cc:131
+#: src/lib/analyse_audio_job.cc:70
 msgid "Analysing audio"
 msgstr "分析音频中"
 
-#: src/lib/analyse_subtitles_job.cc:48
-#, fuzzy
+#: src/lib/analyse_subtitles_job.cc:55
 msgid "Analysing subtitles"
-msgstr "定位字幕中"
+msgstr "分析字幕中"
+
+#: src/lib/hints.cc:365
+msgid ""
+"At least one marker comes after the end of the project and will be ignored."
+msgstr "至少有一个标记出现在项目结束后，将被忽略。"
+
+#: src/lib/hints.cc:472
+msgid "At least one of your closed caption files is larger than "
+msgstr "至少有一个隐藏字幕文件过大了 "
 
-#: src/lib/audio_content.cc:258
+#: src/lib/hints.cc:465
+msgid "At least one of your closed caption files' XML part is larger than "
+msgstr "至少有一个隐藏式字幕文件的XML部分过大了 "
+
+#: src/lib/hints.cc:480
+msgid "At least one of your subtitle files is larger than "
+msgstr "至少有一个字幕文件过大了 "
+
+#: src/lib/hints.cc:444
+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
+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
+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
+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
+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
+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."
+msgstr ""
+"至少有一个字幕或隐藏字幕内容没有指定的语言，  建议在“内容→时间轴”、“内容→打开"
+"字幕”或“内容→隐藏字幕”选项卡中设置每段字幕或隐藏字幕内容的语言。"
+
+#: src/lib/audio_content.cc:277
 msgid "Audio will be resampled from %1Hz to %2Hz"
 msgstr "音频重新采样频率设置为 %1Hz 到 %2Hz"
 
-#: src/lib/audio_content.cc:260
+#: src/lib/audio_content.cc:279
 msgid "Audio will be resampled to %1Hz"
 msgstr "音频将被重新采样至 %1Hz"
 
-#: src/lib/audio_content.cc:249
+#: src/lib/audio_content.cc:268
 msgid "Audio will not be resampled"
-msgstr "音频不能被重新采样"
+msgstr "音频将不会被重新采样"
 
-#: src/lib/ffmpeg_content.cc:625
+#: src/lib/ffmpeg_content.cc:635
 msgid "BT1361 extended colour gamut"
 msgstr "BT1361扩展色域"
 
-#: src/lib/ffmpeg_content.cc:593
+#: src/lib/ffmpeg_content.cc:603
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:648
+#: src/lib/ffmpeg_content.cc:658
 msgid "BT2020 constant luminance"
 msgstr "BT2020 恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:627
+#: src/lib/ffmpeg_content.cc:637
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 采样深度为 10-bit"
 
-#: src/lib/ffmpeg_content.cc:628
+#: src/lib/ffmpeg_content.cc:638
 msgid "BT2020 for a 12-bit system"
-msgstr "BT2020 采样深度为 12 bits"
+msgstr "BT2020 采样深度为 12-bit"
 
-#: src/lib/ffmpeg_content.cc:647
+#: src/lib/ffmpeg_content.cc:657
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 非恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:652
+#: src/lib/ffmpeg_content.cc:662
 msgid "BT2100"
 msgstr "BT2100"
 
-#: src/lib/ffmpeg_content.cc:589
+#: src/lib/ffmpeg_content.cc:599
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:643
+#: src/lib/ffmpeg_content.cc:653
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:588
+#: src/lib/ffmpeg_content.cc:598
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:585 src/lib/ffmpeg_content.cc:614
-#: src/lib/ffmpeg_content.cc:639
+#: src/lib/ffmpeg_content.cc:595 src/lib/ffmpeg_content.cc:624
+#: src/lib/ffmpeg_content.cc:649
 msgid "BT709"
 msgstr "BT709"
 
-#: src/lib/ffmpeg_content.cc:659
+#: src/lib/ffmpeg_content.cc:669
 msgid "Bits per pixel"
 msgstr "像素位"
 
-#: src/lib/filter.cc:74
-#, fuzzy
+#: src/lib/filter.cc:86
 msgid "Bob Weaver Deinterlacing Filter"
-msgstr "反隔行扫描滤镜"
+msgstr "Bob Weaver 反隔行扫描滤镜"
 
-#: src/lib/util.cc:582
+#: src/lib/util.cc:600
 msgid "BsL"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:583
+#: src/lib/util.cc:601
 msgid "BsR"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:574
+#: src/lib/util.cc:592
 msgid "C"
 msgstr "中置"
 
-#: src/lib/job.cc:508
+#: src/lib/job.cc:573
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/lib/film.cc:348
+#: src/lib/make_dcp.cc:48
 msgid "Cannot contain slashes"
 msgstr "不能包含斜杠"
 
-#: src/lib/exceptions.cc:70
+#: src/lib/exceptions.cc:78
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "在 %2 不能处理图片格式 %1"
 
-#: src/lib/film.cc:1456
+#: src/lib/film.cc:1655
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr "不能生成KDM，因为项目没有被加密."
 
-#: src/lib/util.cc:543
+#: src/lib/util.cc:561
 msgid "Centre"
 msgstr "居中对齐"
 
-#: src/lib/audio_content.cc:293
+#: src/lib/audio_content.cc:315
 msgid "Channels"
 msgstr "声音通道"
 
-#: src/lib/check_content_change_job.cc:53
-msgid "Checking content for changes"
-msgstr "检查媒体内容是否有改变"
+#: src/lib/transcode_job.cc:108
+msgid "Check their new settings, then try again."
+msgstr "检查其新设置后再试。"
 
-#: src/lib/reel_writer.cc:204
+#: src/lib/check_content_job.cc:55
+#, fuzzy
+msgid "Checking content"
+msgstr "检查媒体内容"
+
+#: src/lib/reel_writer.cc:259
 msgid "Checking existing image data"
 msgstr "检查现有的图像数据"
 
-#: src/lib/check_content_change_job.cc:95
-msgid "Choose 'Make DCP' again when you have done this."
-msgstr "请在做完更改之后再次执行“制作DCP”命令"
-
-#: src/lib/ffmpeg_content.cc:651
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:661
 msgid "Chroma-derived constant luminance"
-msgstr "BT2020 恒定亮度"
+msgstr "色度派生的恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:650
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:660
 msgid "Chroma-derived non-constant luminance"
-msgstr "BT2020 非恒定亮度"
+msgstr "色度派生的非恒定亮度"
 
-#: src/lib/types.cc:140
+#: src/lib/dcp_content_type.cc:63
+msgid "Clip"
+msgstr "片段"
+
+#: src/lib/text_type.cc:72
 msgid "Closed captions"
 msgstr "隐藏式字幕"
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:620
 msgid "Colour primaries"
 msgstr "原色"
 
@@ -387,290 +495,319 @@ 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:542 src/lib/ffmpeg_content.cc:549
-#: src/lib/ffmpeg_content.cc:556 src/lib/ffmpeg_content.cc:566
-#: src/lib/ffmpeg_content.cc:571 src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:552 src/lib/ffmpeg_content.cc:559
+#: src/lib/ffmpeg_content.cc:566 src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:581 src/lib/ffmpeg_content.cc:586
 msgid "Colour range"
 msgstr "色彩范围"
 
-#: src/lib/ffmpeg_content.cc:635
+#: src/lib/ffmpeg_content.cc:645
 msgid "Colour transfer characteristic"
-msgstr "彩色传输特性"
+msgstr "色彩传输特性"
 
-#: src/lib/ffmpeg_content.cc:656
+#: src/lib/ffmpeg_content.cc:666
 msgid "Colourspace"
 msgstr "色彩空间"
 
-#: src/lib/content.cc:186
+#: src/lib/combine_dcp_job.cc:49
+msgid "Combine DCPs"
+msgstr "合并 DCP"
+
+#: src/lib/content.cc:179
 msgid "Computing digest"
 msgstr "计算Hash值中"
 
-#: src/lib/writer.cc:528
+#: src/lib/writer.cc:531
 msgid "Computing digests"
 msgstr "计算Hash值中"
 
-#: src/lib/analytics.cc:55
+#: src/lib/analytics.cc:62
 msgid "Congratulations!"
-msgstr ""
+msgstr "恭喜你！"
 
-#: src/lib/frame_rate_change.cc:101
+#: src/lib/frame_rate_change.cc:89
 msgid "Content and DCP have the same rate.\n"
 msgstr "源内容和DCP设定帧率需要一致。\n"
 
-#: src/lib/audio_content.cc:294
-msgid "Content audio sample rate"
+#: src/lib/audio_content.cc:318
+msgid "Content bit depth"
+msgstr "源内容位深"
+
+#: src/lib/audio_content.cc:316
+msgid "Content sample rate"
 msgstr "源音频采样率"
 
 #: src/lib/ffmpeg_content.cc:158
 msgid "Content to be joined must all have or not have audio"
-msgstr "要加入的内容必须都有或都没有音频"
+msgstr "添加的内容必须都有或都没有音频。"
 
 #: src/lib/ffmpeg_content.cc:161
 msgid "Content to be joined must all have or not have subtitles or captions"
-msgstr "要加入的内容必须都有或都没有隐藏式字幕"
+msgstr "添加的内容必须都有或都没有隐藏式字幕。"
 
 #: src/lib/ffmpeg_content.cc:155
 msgid "Content to be joined must all have or not have video"
-msgstr "要加入的内容必须都有或都没有视频"
+msgstr "添加的内容必须都有或都没有视频。"
 
-#: src/lib/video_content.cc:178
-#, fuzzy
+#: src/lib/text_content.cc:320
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "添加的内容必须均为主字幕语言或附加字幕语言。"
+
+#: src/lib/video_content.cc:217
 msgid "Content to be joined must have all its video used or not used."
-msgstr "内容帧率必须相同"
+msgstr "添加的内容必须均选中/不选中视频部分。"
 
-#: src/lib/text_content.cc:261
+#: src/lib/text_content.cc:275
 msgid "Content to be joined must have the same 'burn subtitles' setting."
-msgstr "所有要添加“刻录字幕”设置必须具有相同。"
+msgstr "添加的内容必须具有相同的“刻录字幕”设置。"
 
-#: src/lib/text_content.cc:257
+#: src/lib/text_content.cc:271
 msgid "Content to be joined must have the same 'use subtitles' setting."
-msgstr "所有要添加“use 字幕”设置必须具有相同。"
+msgstr "添加的内容必须具有相同的“使用字幕”设置。"
 
-#: src/lib/audio_content.cc:107
+#: src/lib/audio_content.cc:116
 msgid "Content to be joined must have the same audio delay."
-msgstr "视频和音频的延迟必须相同。"
+msgstr "添加的内容音频延迟必须相同。"
 
-#: src/lib/audio_content.cc:103
+#: src/lib/audio_content.cc:112
 msgid "Content to be joined must have the same audio gain."
-msgstr "视频和音频增益必须相同。"
+msgstr "添加的内容音频增益必须相同。"
+
+#: src/lib/video_content.cc:249
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr "添加的内容必须具有相同的硬字幕语言。"
 
-#: src/lib/video_content.cc:198
+#: src/lib/video_content.cc:241
 msgid "Content to be joined must have the same colour conversion."
-msgstr "视频颜色转换必须相同。"
+msgstr "添加的内容视频颜色转换必须相同。"
 
-#: src/lib/video_content.cc:190
+#: src/lib/video_content.cc:229
 msgid "Content to be joined must have the same crop."
-msgstr "视频裁剪设置必须相同。"
+msgstr "添加的内容视频裁剪设置必须相同。"
+
+#: src/lib/video_content.cc:233
+msgid "Content to be joined must have the same custom ratio setting."
+msgstr "添加的内容必须有相同的自定义比率设置。"
 
-#: src/lib/video_content.cc:202
+#: src/lib/video_content.cc:237
+msgid "Content to be joined must have the same custom size setting."
+msgstr "添加的内容必须有相同的自定义尺寸设置。"
+
+#: src/lib/video_content.cc:245
 msgid "Content to be joined must have the same fades."
-msgstr "视频淡入淡出效果必须相同。"
+msgstr "添加的内容视频淡入淡出效果必须相同。"
 
-#: src/lib/text_content.cc:289
+#: src/lib/text_content.cc:303
 msgid "Content to be joined must have the same outline width."
-msgstr "字幕宽度尺寸必须相同。"
+msgstr "添加的内容字幕宽度尺寸必须相同。"
 
-#: src/lib/video_content.cc:182
+#: src/lib/video_content.cc:221
 msgid "Content to be joined must have the same picture size."
-msgstr "视频图像尺寸必须相同。"
-
-#: src/lib/video_content.cc:194
-msgid "Content to be joined must have the same scale setting."
-msgstr "视频比例设置必须相同。"
+msgstr "添加的内容视频图像尺寸必须相同。"
 
-#: src/lib/text_content.cc:265
+#: src/lib/text_content.cc:279
 msgid "Content to be joined must have the same subtitle X offset."
-msgstr "字幕X轴偏移必须相同。"
+msgstr "添加的内容字幕X轴偏移必须相同。"
 
-#: src/lib/text_content.cc:273
+#: src/lib/text_content.cc:287
 msgid "Content to be joined must have the same subtitle X scale."
-msgstr "字幕X轴缩放大小必须相同。"
+msgstr "添加的内容字幕X轴缩放大小必须相同。"
 
-#: src/lib/text_content.cc:269
+#: src/lib/text_content.cc:283
 msgid "Content to be joined must have the same subtitle Y offset."
-msgstr "字幕Y轴偏移必须相同。"
+msgstr "添加的内容字幕Y轴偏移必须相同。"
 
-#: src/lib/text_content.cc:277
+#: src/lib/text_content.cc:291
 msgid "Content to be joined must have the same subtitle Y scale."
-msgstr "字幕Y轴缩放大小必须相同。"
+msgstr "添加的内容字幕Y轴缩放大小必须相同。"
 
-#: src/lib/text_content.cc:285
+#: src/lib/text_content.cc:299
 msgid "Content to be joined must have the same subtitle fades."
-msgstr "字幕淡入淡出效果必须相同。"
+msgstr "添加的内容字幕淡入淡出效果必须相同。"
 
-#: src/lib/text_content.cc:281
+#: src/lib/text_content.cc:295
 msgid "Content to be joined must have the same subtitle line spacing."
-msgstr "字幕行距必须相同."
+msgstr "添加的内容字幕行距必须相同。"
 
-#: src/lib/content.cc:133 src/lib/content.cc:137
+#: src/lib/content.cc:127 src/lib/content.cc:131
 msgid "Content to be joined must have the same video frame rate"
-msgstr "内容帧率必须相同"
+msgstr "添加的内容内容帧率必须相同。"
 
-#: src/lib/video_content.cc:186
+#: src/lib/video_content.cc:225
 msgid "Content to be joined must have the same video frame type."
-msgstr "视频帧率必须相同。"
+msgstr "添加的内容视频帧率必须相同。"
 
-#: src/lib/text_content.cc:298
+#: src/lib/text_content.cc:312
 msgid "Content to be joined must use the same DCP track."
-msgstr "DCP轨道必须相同。"
+msgstr "添加的内容DCP轨道必须相同。"
 
-#: src/lib/text_content.cc:294 src/lib/text_content.cc:306
+#: src/lib/text_content.cc:308 src/lib/text_content.cc:328
 msgid "Content to be joined must use the same fonts."
-msgstr "字幕字体必须相同。"
+msgstr "添加的内容字幕字体必须相同。"
 
 #: src/lib/ffmpeg_content.cc:182
 msgid "Content to be joined must use the same subtitle stream."
-msgstr "字幕流必须相同。"
+msgstr "添加的内容字幕流必须相同。"
 
-#: src/lib/video_content.cc:412
+#: src/lib/text_content.cc:316
+msgid "Content to be joined must use the same text language."
+msgstr "添加的内容必须有相同的文字语言。"
+
+#: src/lib/video_content.cc:445
 msgid "Content video is %1x%2"
 msgstr "源视频分辨率是 %1x%2"
 
-#: src/lib/upload_job.cc:57
+#: src/lib/upload_job.cc:66
 msgid "Copy DCP to TMS"
-msgstr "复制DCP到TMS（影院内容管理系统）"
+msgstr "复制DCP到TMS"
 
-#: src/lib/reel_writer.cc:99
+#: src/lib/reel_writer.cc:139
 msgid "Copying old video file"
-msgstr ""
+msgstr "复制源视频文件"
 
-#: src/lib/reel_writer.cc:327
-#, fuzzy
+#: src/lib/reel_writer.cc:395
 msgid "Copying video file into DCP"
-msgstr "DCP中的视频分辨率不匹配"
+msgstr "正在将视频文件复制到 DCP"
 
-#: src/lib/scp_uploader.cc:51
+#: src/lib/scp_uploader.cc:56
 msgid "Could not connect to server %1 (%2)"
 msgstr "无法连接到服务器 %1 (%2)"
 
-#: src/lib/scp_uploader.cc:88
+#: src/lib/scp_uploader.cc:105
 msgid "Could not create remote directory %1 (%2)"
 msgstr "无法创建远程目录 %1 (%2)"
 
-#: src/lib/image_examiner.cc:62
+#: src/lib/image_examiner.cc:64
 msgid "Could not decode JPEG2000 file %1 (%2)"
 msgstr "无法解码JPEG2000文件%1 (%2)"
 
-#: src/lib/ffmpeg_image_proxy.cc:153
+#: src/lib/ffmpeg_image_proxy.cc:164
 msgid "Could not decode image (%1)"
-msgstr "无法解码图像媒体(%1)"
+msgstr "无法解码图像(%1)"
 
-#: src/lib/encode_server_finder.cc:185
+#: 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 "无法监测远程编码服务器。可能是另一个DCP-O-MATIC程序进程正在运行。"
+msgstr "无法侦听到远程编码服务器。可能另一个DCP-o-matic进程正在运行。"
 
-#: src/lib/job.cc:164 src/lib/job.cc:179
+#: src/lib/job.cc:170 src/lib/job.cc:185
 msgid "Could not open %1"
 msgstr "无法打开%1"
 
-#: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:101
+#: src/lib/curl_uploader.cc:102 src/lib/scp_uploader.cc:121
 msgid "Could not open %1 to send"
 msgstr "无法打开%1并发送"
 
-#: src/lib/internet.cc:158 src/lib/internet.cc:163
+#: src/lib/internet.cc:165 src/lib/internet.cc:170
 msgid "Could not open downloaded ZIP file"
 msgstr "无法打开下载的zip文件"
 
-#: src/lib/internet.cc:170
+#: src/lib/internet.cc:177
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
 msgstr "无法打开下载的zip文件 (%1:%2: %3)"
 
-#: src/lib/config.cc:1070
+#: src/lib/config.cc:1122
 msgid "Could not open file for writing"
 msgstr "无法执行写入，目标文件无法打开"
 
-#: src/lib/dcp_subtitle.cc:55
+#: src/lib/ffmpeg_file_encoder.cc:265
+msgid "Could not open output file %1 (%2)"
+msgstr "无法打开输出文件 %1 (%2)"
+
+#: src/lib/dcp_subtitle.cc:60
 msgid "Could not read subtitles (%1 / %2)"
 msgstr "无法读取字幕 (%1 / %2)"
 
-#: src/lib/scp_uploader.cc:71
-msgid "Could not start SCP session (%1)"
-msgstr "无法启动 SCP (%1)"
-
-#: src/lib/curl_uploader.cc:49
+#: src/lib/curl_uploader.cc:59
 msgid "Could not start transfer"
 msgstr "无法开始传输"
 
-#: src/lib/curl_uploader.cc:93 src/lib/scp_uploader.cc:118
+#: src/lib/curl_uploader.cc:110 src/lib/scp_uploader.cc:138
 msgid "Could not write to remote file (%1)"
 msgstr "写入远程文件 (%1)失败！"
 
-#: src/lib/util.cc:553
+#: src/lib/util.cc:571
 msgid "D-BOX primary"
 msgstr "一级D-BOX"
 
-#: src/lib/util.cc:554
+#: src/lib/util.cc:572
 msgid "D-BOX secondary"
 msgstr "二级D-BOX"
 
-#: src/lib/util.cc:584
+#: src/lib/util.cc:602
 msgid "DBP"
-msgstr "一级D-BOX通道"
+msgstr "DBP"
 
-#: src/lib/util.cc:585
+#: src/lib/util.cc:603
 msgid "DBS"
 msgstr "DBS"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:51
 msgid "DCI Flat"
 msgstr "DCI Flat(遮幅/1.77/1.78/1.85) "
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:53
 msgid "DCI Scope"
 msgstr "DCI Scope(宽银幕/2.35/2.39) "
 
-#: src/lib/dcp_subtitle_content.cc:109
+#: src/lib/dcp_subtitle_content.cc:114
 msgid "DCP XML subtitles"
 msgstr "DCP XML字幕"
 
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:339
 msgid "DCP sample rate"
 msgstr "DCP 采样率"
 
-#: src/lib/frame_rate_change.cc:114
+#: src/lib/frame_rate_change.cc:102
 #, c-format
 msgid "DCP will run at %.1f%% of the content speed.\n"
-msgstr "DCP列队将在速度为 %.1f%% 下运行.\n"
+msgstr "DCP队列将在速度 %.1f%% 下运行.\n"
 
-#: src/lib/frame_rate_change.cc:104
+#: src/lib/frame_rate_change.cc:92
 msgid "DCP will use every other frame of the content.\n"
 msgstr "将使用隔帧打包DCP.\n"
 
-#: src/lib/job.cc:166 src/lib/job.cc:181
+#: src/lib/job.cc:172 src/lib/job.cc:187
 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:1379
+#: src/lib/film.cc:1566
 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 ""
-"DCP-o-matic必须把您DCP的设置更改为OV（原创）。请重新检查设置确认设置内容是否"
-"为您的期望值。"
+"DCP-o-matic必须把您DCP的设置更改为OV。请重新检查设置确认设置内容是否为您的期"
+"望值。"
 
-#: src/lib/ffmpeg_content.cc:119
+#: src/lib/film.cc:1534
+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."
+msgstr "DCP-o-matic必须更改您DCP的设置，使影片的帧率与 Atmos 内容一致。"
+
+#: src/lib/ffmpeg_content.cc:122
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "不支持的格式`%1'。"
 
-#: src/lib/config.cc:370 src/lib/config.cc:1164
+#: src/lib/config.cc:420 src/lib/config.cc:1233
 msgid "DCP-o-matic notification"
 msgstr "DCP-o-matic提醒"
 
-#: src/lib/datasat_ap2x.cc:26
+#: src/lib/datasat_ap2x.cc:28
 msgid "Datasat AP20 or AP25"
-msgstr ""
+msgstr "数据来自AP20或AP25"
 
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-#: src/lib/filter.cc:74 src/lib/filter.cc:75
+#: src/lib/filter.cc:83 src/lib/filter.cc:84 src/lib/filter.cc:85
+#: src/lib/filter.cc:86 src/lib/filter.cc:87
 msgid "De-interlacing"
 msgstr "去除隔行"
 
-#: src/lib/config.cc:1152
+#: src/lib/config.cc:1221
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -686,73 +823,77 @@ msgid ""
 msgstr ""
 "亲爱的放映员\n"
 "\n"
-"请找到$ CPL_NAME的KDM。\n"
+"请找到附件中$CPL_NAME的KDM。\n"
 "\n"
-"电影：$ CINEMA_NAME\n"
-"银幕：$ SCREENS\n"
+"影院：$CINEMA_NAME\n"
+"屏幕（影厅服务器）：$SCREENS\n"
 "\n"
-"该KDMS的有效期是从$ START_TIME至$ END_TIME有效。\n"
+"该KDMS的有效期是从$START_TIME至$END_TIME有效。\n"
 "\n"
+"祝好，\n"
 "DCP-o-matic"
 
-#: src/lib/dolby_cp750.cc:28
-#, fuzzy
+#: src/lib/dolby_cp750.cc:31
 msgid "Dolby CP650 or CP750"
-msgstr "杜比 CP 650和CP 750"
+msgstr "杜比 CP650 或 CP750"
 
-#: src/lib/internet.cc:116
+#: src/lib/internet.cc:122
 msgid "Download failed (%1 error %2)"
 msgstr "下载失败 (%1 error %2)"
 
-#: src/lib/frame_rate_change.cc:106
+#: src/lib/frame_rate_change.cc:94
 msgid "Each content frame will be doubled in the DCP.\n"
-msgstr "该DCP中将每一帧复制为两帧。\n"
+msgstr "该DCP中每一帧将复制为两帧。\n"
 
-#: src/lib/frame_rate_change.cc:108
+#: src/lib/frame_rate_change.cc:96
 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:66
+#: src/lib/send_kdm_email_job.cc:94
 msgid "Email KDMs"
-msgstr "邮件发送 KDMs"
+msgstr "邮件发送 KDM"
 
-#: src/lib/send_kdm_email_job.cc:69
+#: src/lib/send_kdm_email_job.cc:97
 msgid "Email KDMs for %1"
-msgstr "邮件发送KDMs给 %1"
+msgstr "通过电子邮件发送 %1 的 KDM"
 
-#: src/lib/send_notification_email_job.cc:51
+#: src/lib/send_notification_email_job.cc:55
 msgid "Email notification"
-msgstr "Email提醒"
+msgstr "电子邮件提醒"
 
-#: src/lib/send_problem_report_job.cc:64
+#: src/lib/send_problem_report_job.cc:68
 msgid "Email problem report"
-msgstr "通过邮件发送BUG"
+msgstr "通过邮件发送报告"
 
-#: src/lib/send_problem_report_job.cc:67
+#: src/lib/send_problem_report_job.cc:71
 msgid "Email problem report for %1"
-msgstr "通过邮件发送BUG给 %1"
+msgstr "通过邮件发送报告给 %1"
 
-#: src/lib/dcp_encoder.cc:97 src/lib/ffmpeg_encoder.cc:130
+#: src/lib/dcp_encoder.cc:103 src/lib/ffmpeg_encoder.cc:136
 msgid "Encoding"
 msgstr "编码中"
 
-#: src/lib/dcp_content_type.cc:56
+#: src/lib/dcp_content_type.cc:66
 msgid "Episode"
-msgstr ""
+msgstr "插曲"
 
-#: src/lib/exceptions.cc:76
+#: src/lib/exceptions.cc:85
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr "字幕文件错误: 执行为 %1 实际要求为%2"
 
-#: src/lib/job.cc:506
+#: src/lib/job.cc:571
 msgid "Error: %1"
 msgstr "错误: (%1)"
 
-#: src/lib/hints.cc:260
-msgid "Examining closed captions"
-msgstr "检查隐藏式字幕中"
+#: src/lib/dcp_content_type.cc:68
+msgid "Event"
+msgstr "事件"
+
+#: src/lib/hints.cc:406
+msgid "Examining audio, subtitles and closed captions"
+msgstr "检查音频、字幕和隐藏式字幕中"
 
-#: src/lib/examine_content_job.cc:49
+#: src/lib/examine_content_job.cc:54
 msgid "Examining content"
 msgstr "检查媒体内容中"
 
@@ -760,577 +901,664 @@ msgstr "检查媒体内容中"
 msgid "Examining subtitles"
 msgstr "定位字幕中"
 
-#: src/lib/subtitle_encoder.cc:80
-#, fuzzy
+#: src/lib/hints.cc:404
+msgid "Examining subtitles and closed captions"
+msgstr "检查字幕和隐藏式字幕中"
+
+#: src/lib/subtitle_encoder.cc:97
 msgid "Extracting"
-msgstr "分级"
+msgstr "正在提取"
 
-#: src/lib/ffmpeg_content.cc:642
+#: src/lib/ffmpeg_content.cc:652
 msgid "FCC"
 msgstr "FCC"
 
-#: src/lib/scp_uploader.cc:61
+#: src/lib/scp_uploader.cc:68
 msgid "Failed to authenticate with server (%1)"
 msgstr "无法与服务器进行身份验证 (%1)"
 
-#: src/lib/job.cc:133 src/lib/job.cc:143
-#, fuzzy
+#: src/lib/job.cc:139 src/lib/job.cc:149
 msgid "Failed to encode the DCP."
-msgstr "电子邮件发送失败"
+msgstr "编码 DCP 失败。"
 
-#: src/lib/emailer.cc:224
+#: src/lib/emailer.cc:240
 msgid "Failed to send email"
 msgstr "电子邮件发送失败"
 
-#: src/lib/dcp_content_type.cc:46
+#: src/lib/dcp_content_type.cc:53
 msgid "Feature"
 msgstr "正片"
 
-#: src/lib/content.cc:436
+#: src/lib/content.cc:471
 msgid "Filename"
 msgstr "文件名"
 
-#: src/lib/ffmpeg_content.cc:592
+#: src/lib/content.cc:471
+msgid "Filenames"
+msgstr "文件名"
+
+#: src/lib/transcode_job.cc:108 src/lib/transcode_job.cc:113
+msgid "Files have changed since they were added to the project."
+msgstr "部分文件在添加到项目后被修改。"
+
+#: src/lib/ffmpeg_content.cc:602
 msgid "Film"
-msgstr "电影"
+msgstr "影片"
 
-#: src/lib/ffmpeg_examiner.cc:98
+#: src/lib/ffmpeg_examiner.cc:113
 msgid "Finding length"
 msgstr "定位长度"
 
-#: src/lib/content.cc:443
+#: src/lib/content.cc:481
 msgid "Frame rate"
 msgstr "帧率"
 
-#: src/lib/util.cc:916
+#: src/lib/job.cc:530
 msgid "Friday"
 msgstr "星期五"
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:586
 msgid "Full"
 msgstr "Full(全幅/1.90)"
 
-#: src/lib/ffmpeg_content.cc:556
+#: src/lib/ffmpeg_content.cc:566
 msgid "Full (0-%1)"
 msgstr "全幅 (0-%1)"
 
-#: src/lib/ratio.cc:47
+#: src/lib/ratio.cc:54
 msgid "Full frame"
 msgstr "Full(全幅/1.90)"
 
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:346
 msgid "Full length in audio samples at DCP rate"
-msgstr "DCP中音频采样率总时长"
+msgstr "DCP中音频采样总时长"
 
-#: src/lib/audio_content.cc:308
+#: src/lib/audio_content.cc:333
 msgid "Full length in audio samples at content rate"
 msgstr "源音频内容采样总时长"
 
-#: src/lib/audio_content.cc:315
+#: src/lib/audio_content.cc:340
 msgid "Full length in video frames at DCP rate"
 msgstr "DCP中视频总时长"
 
-#: src/lib/audio_content.cc:301
+#: src/lib/audio_content.cc:326
 msgid "Full length in video frames at content rate"
 msgstr "源视频时长"
 
-#: src/lib/ffmpeg_content.cc:617
+#: src/lib/ffmpeg_content.cc:627
 msgid "Gamma 22 (BT470M)"
 msgstr "伽玛 2.2 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:618
+#: src/lib/ffmpeg_content.cc:628
 msgid "Gamma 28 (BT470BG)"
 msgstr "伽玛 2.8 (BT470BG)"
 
-#: src/lib/filter.cc:76
+#: src/lib/filter.cc:88
 msgid "Gradient debander"
 msgstr "梯度"
 
-#: src/lib/util.cc:578
+#: src/lib/util.cc:596
 msgid "HI"
 msgstr "听力障碍"
 
-#: src/lib/util.cc:547
+#: src/lib/util.cc:565
 msgid "Hearing impaired"
 msgstr "听力障碍"
 
-#: src/lib/filter.cc:79
+#: src/lib/filter.cc:91
 msgid "High quality 3D denoiser"
 msgstr "高品质的3D降噪"
 
-#: src/lib/filter.cc:68
+#: src/lib/dcp_content_type.cc:67
+msgid "Highlights"
+msgstr "高光"
+
+#: src/lib/filter.cc:80
 msgid "Horizontal flip"
 msgstr "水平翻转"
 
-#: src/lib/audio_content.cc:294 src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:316 src/lib/audio_content.cc:339
 msgid "Hz"
 msgstr "Hz（赫兹）"
 
-#: src/lib/ffmpeg_content.cc:626
+#: src/lib/ffmpeg_content.cc:636
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB或sYCC)"
 
-#: src/lib/ffmpeg_content.cc:624
+#: src/lib/ffmpeg_content.cc:634
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
-#: src/lib/hints.cc:163
+#: src/lib/hints.cc:185
 msgid "If you do use 25fps you should change your DCP standard to SMPTE."
-msgstr "如果您选择使用25fps，那就必须把DCP标准选线设置为SMPTE"
+msgstr "如果您选择使用25fps，那就必须把DCP标准选线设置为SMPTE。"
+
+#: src/lib/hints.cc:248
+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 ""
+"一般建议您使用SMPTE DCPS，除非您有特殊原因使用Interop。建议您在“DCP”选项卡中"
+"将DCP设置为使用SMPTE标准。"
+
+#: src/lib/release_notes.cc:53
+msgid ""
+"In this version there are changes to the way that subtitles are positioned.  "
+"Positioning should now be more correct, with respect to the standards, but "
+"you should check any subtitles in your project to make sure that they are "
+"placed where you want them."
+msgstr ""
+"在这个版本中，字幕的定位方式发生了变化。相对于标准，定位现在应该更加正确，但"
+"您仍应该检查项目中的任何字幕，以确保它们放在您想要的位置。"
 
-#: src/lib/job.cc:154 src/lib/job.cc:189 src/lib/job.cc:239 src/lib/job.cc:249
+#: src/lib/hints.cc:572
+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
 msgid "It is not known what caused this error."
-msgstr "未知错误."
+msgstr "未知原因错误."
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:616
 msgid "JEDEC P22"
 msgstr "JEDEC P22"
 
-#: src/lib/config.cc:360 src/lib/config.cc:1149
+#: src/lib/config.cc:410 src/lib/config.cc:1218
 msgid "KDM delivery: $CPL_NAME"
 msgstr "发行KDM: $CPL_NAME"
 
-#: src/lib/dcp.cc:58
-#, fuzzy
-msgid "KDM was made for DCP-o-matic but not for its leaf certificate."
-msgstr "KDM是为DCP-o-matic生成，但是与上级证书不匹配。"
-
-#: src/lib/dcp.cc:56
-msgid "KDM was not made for DCP-o-matic's decryption certificate."
-msgstr "KDM不是为DCP-o-matic解密证书而生成"
-
-#: src/lib/filter.cc:72
+#: src/lib/filter.cc:84
 msgid "Kernel deinterlacer"
 msgstr "隔行扫描"
 
-#: src/lib/ffmpeg_encoder.cc:229 src/lib/util.cc:572
+#: src/lib/ffmpeg_encoder.cc:267 src/lib/util.cc:590
 msgid "L"
 msgstr "左声道"
 
-#: src/lib/util.cc:580
-msgid "Lc"
-msgstr "左中"
-
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:541
+#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:559
 msgid "Left"
 msgstr "左声道"
 
-#: src/lib/util.cc:549
+#: src/lib/util.cc:567
 msgid "Left centre"
 msgstr "左中"
 
-#: src/lib/util.cc:551
+#: src/lib/util.cc:569
 msgid "Left rear surround"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:545
+#: src/lib/util.cc:563
 msgid "Left surround"
 msgstr "左环绕"
 
-#: src/lib/video_content.cc:481
+#: src/lib/video_content.cc:516
 msgid "Length"
 msgstr "长度"
 
-#: src/lib/util.cc:575
+#: src/lib/util.cc:593
 msgid "Lfe"
 msgstr "次低"
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:562
 msgid "Lfe (sub)"
 msgstr "次低（重低音）"
 
-#: src/lib/ffmpeg_content.cc:571
+#: src/lib/ffmpeg_content.cc:581
 msgid "Limited"
 msgstr "限制"
 
-#: src/lib/ffmpeg_content.cc:549
-msgid "Limited (%1-%2)"
-msgstr "限制 (%1-%2)"
+#: src/lib/ffmpeg_content.cc:559
+#, fuzzy
+msgid "Limited / video (%1-%2)"
+msgstr "限制/视频 (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:621
+#: src/lib/ffmpeg_content.cc:631
 msgid "Linear"
 msgstr "线性"
 
-#: src/lib/ffmpeg_content.cc:622
+#: src/lib/ffmpeg_content.cc:632
 msgid "Logarithmic (100:1 range)"
 msgstr "对数 (范围 100:1)"
 
-#: src/lib/ffmpeg_content.cc:623
+#: src/lib/ffmpeg_content.cc:633
 msgid "Logarithmic (316:1 range)"
 msgstr "对数 (范围 316:1)"
 
-#: src/lib/exceptions.cc:128
+#: src/lib/exceptions.cc:161
 msgid "Lost communication between main and writer processes"
-msgstr ""
+msgstr "主进程和写入进程之间的通信丢失"
 
-#: src/lib/util.cc:576
+#: src/lib/util.cc:594
 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:76 src/lib/filter.cc:77 src/lib/filter.cc:80
+#: src/lib/filter.cc:88 src/lib/filter.cc:89 src/lib/filter.cc:92
 msgid "Misc"
 msgstr "其他"
 
-#: src/lib/dcp_examiner.cc:157
+#: src/lib/dcp_examiner.cc:180
 msgid "Mismatched audio channel counts in DCP"
 msgstr "DCP中的音频通道数不匹配"
 
-#: src/lib/dcp_examiner.cc:163
+#: src/lib/dcp_examiner.cc:186
 msgid "Mismatched audio sample rates in DCP"
-msgstr "DCP中的音频采样率不符合"
+msgstr "DCP中的音频采样率不匹配"
 
-#: src/lib/dcp_examiner.cc:130
+#: src/lib/dcp_examiner.cc:150
 msgid "Mismatched frame rates in DCP"
 msgstr "DCP中的帧率不匹配"
 
-#: src/lib/dcp_examiner.cc:138
+#: src/lib/dcp_examiner.cc:158
 msgid "Mismatched video sizes in DCP"
 msgstr "DCP中的视频分辨率不匹配"
 
-#: src/lib/exceptions.cc:64
+#: src/lib/exceptions.cc:71
 msgid "Missing required setting %1"
 msgstr "缺少必需的设置 %1"
 
-#: src/lib/util.cc:908
+#: src/lib/job.cc:522
 msgid "Monday"
 msgstr "星期一"
 
-#: src/lib/writer.cc:638
+#: src/lib/writer.cc:763
 msgid "Mono"
 msgstr "单声道"
 
-#: src/lib/filter.cc:71
+#: src/lib/filter.cc:83
 msgid "Motion compensating deinterlacer"
 msgstr "动态隔行补偿"
 
-#: src/lib/dcp_decoder.cc:98
+#: src/lib/dcp_decoder.cc:111
 msgid "No CPLs found in DCP."
-msgstr "DCP中没有找到CPL文件"
+msgstr "DCP中没有找到CPL文件。"
 
-#: src/lib/cinema_kdms.cc:201 src/lib/send_notification_email_job.cc:66
+#: src/lib/kdm_with_metadata.cc:216
+#, fuzzy
+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
 msgid "No mail server configured in preferences"
 msgstr "没有配置偏好的邮件服务"
 
-#: src/lib/video_content_scale.cc:105
-msgid "No scale"
-msgstr "不缩放"
-
-#: src/lib/video_content_scale.cc:102
-msgid "No stretch"
-msgstr "不拉伸"
-
-#: src/lib/image_content.cc:122
+#: src/lib/image_content.cc:130
 msgid "No valid image files were found in the folder."
-msgstr "未发现有效的图片序列文件。"
+msgstr "未在文件夹中发现有效的图片序列文件。"
 
-#: src/lib/filter.cc:78 src/lib/filter.cc:79 src/lib/filter.cc:81
+#: src/lib/filter.cc:90 src/lib/filter.cc:91 src/lib/filter.cc:93
 msgid "Noise reduction"
 msgstr "降噪"
 
-#: src/lib/writer.cc:636
+#: src/lib/writer.cc:731 src/lib/writer.cc:738 src/lib/writer.cc:761
 msgid "None"
 msgstr "无"
 
-#: src/lib/job.cc:504
+#: src/lib/job.cc:569
 msgid "OK (ran for %1)"
 msgstr "确认 (运行 %1)"
 
-#: src/lib/content.cc:122
+#: src/lib/content.cc:116
 msgid "Only the first piece of content to be joined can have a start trim."
-msgstr "只有第一段才可以进行开始裁剪。"
+msgstr "只有第一段被加入的内容才可以进行开始裁剪。"
 
-#: src/lib/content.cc:126
+#: src/lib/content.cc:120
 msgid "Only the last piece of content to be joined can have an end trim."
-msgstr "只有最后一段才可以进行结束裁剪。"
+msgstr "只有最后一段被加入的内容才可以进行结束裁剪。"
 
-#: src/lib/types.cc:138
+#: src/lib/text_type.cc:70
 msgid "Open subtitles"
 msgstr "开放式字幕"
 
-#: src/lib/filter.cc:67 src/lib/filter.cc:68 src/lib/filter.cc:69
-#: src/lib/filter.cc:70
+#: src/lib/transcode_job.cc:113
+msgid ""
+"Open the project in DCP-o-matic, check the settings, then save it before "
+"trying again."
+msgstr "在DCP-o-matic中打开项目，检查设置，然后保存后重试。"
+
+#: src/lib/filter.cc:79 src/lib/filter.cc:80 src/lib/filter.cc:81
+#: src/lib/filter.cc:82
 msgid "Orientation"
 msgstr "方向"
 
-#: src/lib/job.cc:213
+#: src/lib/job.cc:217
 msgid "Out of memory"
 msgstr "内存不足"
 
-#: src/lib/filter.cc:81
+#: src/lib/filter.cc:93
 msgid "Overcomplete wavelet denoiser"
 msgstr "小波降噪"
 
-#: src/lib/colour_conversion.cc:284
+#: src/lib/colour_conversion.cc:291
 msgid "P3"
 msgstr "P3"
 
-#: src/lib/util.h:58
-msgid ""
-"Please report this problem by using Help -> Report a problem or via email to "
-"carl@dcpomatic.com"
-msgstr ""
-"请提交这个问题，在帮助餐单中选择：通过Email反馈问题：carl@dcpomatic.com"
-
-#: src/lib/dcp_content_type.cc:53
+#: src/lib/dcp_content_type.cc:60
 msgid "Policy"
 msgstr "政策相关"
 
-#: src/lib/content.cc:452
+#: src/lib/content.cc:490
 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 "程序内部错误 %1:%2 %3"
 
-#: src/lib/dcp_content_type.cc:57
+#: src/lib/dcp_content_type.cc:64
 msgid "Promo"
-msgstr ""
+msgstr "宣传片"
 
-#: src/lib/dcp_content_type.cc:54
+#: src/lib/dcp_content_type.cc:61
 msgid "Public Service Announcement"
 msgstr "公共服务或公告"
 
-#: src/lib/ffmpeg_encoder.cc:237 src/lib/util.cc:573
+#: src/lib/ffmpeg_encoder.cc:272 src/lib/util.cc:591
 msgid "R"
 msgstr "右声道"
 
-#: src/lib/ffmpeg_content.cc:638
+#: src/lib/ffmpeg_content.cc:648
 msgid "RGB / sRGB (IEC61966-2-1)"
-msgstr "RGB / sRGB (IEC61966-2-1)"
+msgstr "颜色模式 RGB / sRGB (IEC61966-2-1)"
 
-#: src/lib/dcp_content_type.cc:51
+#: src/lib/dcp_content_type.cc:58
 msgid "Rating"
 msgstr "分级"
 
-#: src/lib/util.cc:581
-msgid "Rc"
-msgstr "右中"
-
-#: src/lib/colour_conversion.cc:285
+#: src/lib/colour_conversion.cc:292
 msgid "Rec. 1886"
 msgstr "Rec. 1886"
 
-#: src/lib/colour_conversion.cc:286
+#: src/lib/colour_conversion.cc:293
 msgid "Rec. 2020"
 msgstr "Rec. 2020"
 
-#: src/lib/colour_conversion.cc:282
+#: src/lib/colour_conversion.cc:289
 msgid "Rec. 601"
 msgstr "Rec. 601"
 
-#: src/lib/colour_conversion.cc:283
+#: src/lib/colour_conversion.cc:290
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:542
+#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:560
 msgid "Right"
 msgstr "右声道"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:568
 msgid "Right centre"
 msgstr "右中"
 
-#: src/lib/util.cc:552
+#: src/lib/util.cc:570
 msgid "Right rear surround"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:546
+#: src/lib/util.cc:564
 msgid "Right surround"
 msgstr "右环绕"
 
-#: src/lib/filter.cc:70
+#: src/lib/filter.cc:82
 msgid "Rotate 90 degrees anti-clockwise"
 msgstr "逆时针旋转90°"
 
-#: src/lib/filter.cc:69
+#: src/lib/filter.cc:81
 msgid "Rotate 90 degrees clockwise"
 msgstr "顺时针旋转90°"
 
-#: src/lib/util.cc:577
+#: src/lib/util.cc:595
 msgid "Rs"
 msgstr "右环绕"
 
-#: src/lib/colour_conversion.cc:287
+#: src/lib/colour_conversion.cc:294
 msgid "S-Gamut3/S-Log3"
 msgstr "索尼S-Gamut3/S-Log3"
 
-#: src/lib/ffmpeg_content.cc:590 src/lib/ffmpeg_content.cc:619
+#: src/lib/ffmpeg_content.cc:600 src/lib/ffmpeg_content.cc:629
 msgid "SMPTE 170M (BT601)"
 msgstr "SMPTE 170M (BT601)"
 
-#: src/lib/ffmpeg_content.cc:644
+#: src/lib/ffmpeg_content.cc:654
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:649
+#: src/lib/ffmpeg_content.cc:659
 msgid "SMPTE 2085, Y'D'zD'x"
 msgstr "SMPTE 2085, Y'D'zD'x"
 
-#: src/lib/ffmpeg_content.cc:591 src/lib/ffmpeg_content.cc:620
-#: src/lib/ffmpeg_content.cc:645
+#: src/lib/ffmpeg_content.cc:601 src/lib/ffmpeg_content.cc:630
+#: src/lib/ffmpeg_content.cc:655
 msgid "SMPTE 240M"
 msgstr "SMPTE 240M"
 
-#: src/lib/ffmpeg_content.cc:629
+#: src/lib/hints.cc:614
+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 ""
+"类型为FTR(FEATURE)的SMPTE DCP应具有结束字幕的第一帧(FFEC)和移动字幕的第一帧"
+"(FFMC)的标记。您应该使用“DCP”选项卡中的“标记”按钮添加这些标记。"
+
+#: src/lib/ffmpeg_content.cc:639
 msgid "SMPTE ST 2084 for 10, 12, 14 and 16 bit systems"
-msgstr "SMPTE ST 2084 for 10, 12, 14和16 bit"
+msgstr "SMPTE ST 2084 10, 12, 14和16 bit"
 
-#: src/lib/ffmpeg_content.cc:630
+#: src/lib/ffmpeg_content.cc:640
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:594
+#: src/lib/ffmpeg_content.cc:604
 msgid "SMPTE ST 428-1 (CIE 1931 XYZ)"
 msgstr "SMPTE ST 428-1 (CIE 1931 XYZ)"
 
-#: src/lib/ffmpeg_content.cc:595
+#: src/lib/ffmpeg_content.cc:605
 msgid "SMPTE ST 431-2 (2011)"
 msgstr "SMPTE ST 431-2 (2011)"
 
-#: src/lib/ffmpeg_content.cc:596
+#: src/lib/ffmpeg_content.cc:606
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr "SMPTE ST 432-1 D65 (2010)"
 
-#: src/lib/scp_uploader.cc:56
-msgid "SSH error (%1)"
-msgstr "SSH错误 (%1)"
+#: src/lib/scp_uploader.cc:46
+msgid "SSH error [%1]"
+msgstr "SSH 错误 [%1]"
 
-#: src/lib/util.cc:918
+#: src/lib/scp_uploader.cc:62 src/lib/scp_uploader.cc:75
+#: src/lib/scp_uploader.cc:82
+msgid "SSH error [%1] (%2)"
+msgstr "SSH 错误 [%1] (%2)"
+
+#: src/lib/job.cc:532
 msgid "Saturday"
 msgstr "星期六"
 
-#: src/lib/image_content.cc:108
+#: src/lib/image_content.cc:116
 msgid "Scanning image files"
 msgstr "正在扫描图像"
 
-#: src/lib/send_problem_report_job.cc:79
+#: src/lib/send_problem_report_job.cc:85
 msgid "Sending email"
 msgstr "发送电子邮件"
 
-#: src/lib/dcp_content_type.cc:47
+#: src/lib/dcp_content_type.cc:54
 msgid "Short"
 msgstr "短片"
 
-#: src/lib/video_content.cc:482
+#: src/lib/util.cc:604
+msgid "Sign"
+msgstr "签名"
+
+#: src/lib/video_content.cc:517
 msgid "Size"
 msgstr "大小"
 
-#: src/lib/audio_content.cc:253
+#: src/lib/audio_content.cc:272
 msgid "Some audio will be resampled to %1Hz"
 msgstr "部分音频将被重新采样到%1Hz"
 
-#: src/lib/check_content_change_job.cc:91
+#: src/lib/transcode_job.cc:117
+msgid "Some files have been changed since they were added to the project."
+msgstr "有些文件在添加到项目后发生了更改。"
+
+#: src/lib/transcode_job.cc:107
 msgid ""
 "Some files have been changed since they were added to the project.\n"
 "\n"
-"These files will now be re-examined, so you may need to check their settings."
-msgstr ""
-
-#: src/lib/check_content_change_job.cc:102
-msgid ""
-"Some files have been changed since they were added to the project.  Open the "
-"project in DCP-o-matic, check the settings, then save it before trying again."
+"These files will now be re-examined, so you may need to check their settings "
+"before trying again."
 msgstr ""
+"有些文件在添加到项目后发生了更改\n"
+"\n"
+"这些文件现在将被重新检查，因此您可能需要在重试前检查它们的设置。"
 
-#: src/lib/hints.cc:309
+#: src/lib/check_content_job.cc:87
 msgid ""
-"Some of your closed captions have lines longer than %1 characters, so they "
-"will probably be word-wrapped."
+"Some files have been changed since they were added to the project.\n"
+"\n"
+"These files will now be re-examined, so you may need to check their settings."
 msgstr ""
+"有些文件在添加到项目后发生了更改\n"
+"\n"
+"这些文件现在将被重新检查，因此您可能需要检查它们的设置。"
 
-#: src/lib/hints.cc:315
+#: src/lib/hints.cc:553
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
+msgstr "您的某些隐藏字幕跨度超过%1行，因此它将被截断，可能显示不完整。"
+
+#: src/lib/hints.cc:652
+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 "
+"has no spoken parts."
 msgstr ""
+"您的某些内容有音频，但您尚未设置音频语言。建议在“DCP”选项卡设置音频语言，除非"
+"您的音频没有说话部分。"
+
+#: src/lib/make_dcp.cc:73
+msgid "Some of your content is missing"
+msgstr "部分内容已丢失"
 
-#: src/lib/film.cc:377
+#: src/lib/make_dcp.cc:77
 msgid "Some of your content needs a KDM"
-msgstr "一些内容需要KDM密匙"
+msgstr "一些内容需要KDM密钥"
 
-#: src/lib/film.cc:380
+#: src/lib/make_dcp.cc:80
 msgid "Some of your content needs an OV"
-msgstr "一些内容需要OV（声明原创）"
+msgstr "一些内容需要OV"
 
-#: src/lib/writer.cc:640
+#: src/lib/writer.cc:765
 msgid "Stereo"
 msgstr "双声道"
 
-#: src/lib/upmixer_a.cc:46
+#: src/lib/dcp_content_type.cc:65
+#, fuzzy
+msgid "Stereo card"
+msgstr "双声道"
+
+#: src/lib/upmixer_a.cc:51
 msgid "Stereo to 5.1 up-mixer A"
 msgstr "立体声到5.1，混音器A"
 
-#: src/lib/upmixer_b.cc:42
+#: src/lib/upmixer_b.cc:47
 msgid "Stereo to 5.1 up-mixer B"
 msgstr "立体声到5.1，混音器B"
 
-#: src/lib/util.cc:906
+#: src/lib/job.cc:520
 msgid "Sunday"
-msgstr "星期日/天"
+msgstr "星期日"
 
-#: src/lib/dcp_content_type.cc:52
+#: src/lib/dcp_content_type.cc:59
 msgid "Teaser"
 msgstr "传情片"
 
-#: src/lib/filter.cc:80
+#: src/lib/filter.cc:92
 msgid "Telecine filter"
 msgstr "胶转磁滤镜"
 
-#: src/lib/dcp_content_type.cc:49
+#: src/lib/dcp_content_type.cc:56
 msgid "Test"
 msgstr "测试片"
 
-#: src/lib/string_text_file_content.cc:76
+#: src/lib/string_text_file_content.cc:119
 msgid "Text subtitles"
 msgstr "文本字幕"
 
-#: src/lib/film.cc:360
+#: src/lib/make_dcp.cc:60
 msgid "The DCP is empty, perhaps because all the content has zero length."
-msgstr ""
+msgstr "DCP为空，可能是因为所有内容的长度都为零。"
 
-#: 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 "证书签名无效(%1)"
 
-#: src/lib/video_decoder.cc:80
+#: src/lib/hints.cc:668
+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 "
+"correctly on some systems.  You are advised to re-create the signing "
+"certificate chain by clicking the \"Re-make certificates and key...\" button "
+"in the Keys page of Preferences."
+msgstr ""
+"DCP-o-matic用于签名DCP和KDM的证书链包含一个小错误，这将阻止DCP在某些系统上被"
+"正确验证。建议您通过单击“首选项”的“密钥”页面中的“重新制作证书和密钥…”按钮来重"
+"新创建签名证书链。"
+
+#: src/lib/hints.cc:674
+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 "
+"DCPs on some systems. You are advised to re-create the signing certificate "
+"chain by clicking the \"Re-make certificates and key...\" button in the Keys "
+"page of Preferences."
+msgstr ""
+"DCP-o-matic用于签署DCP和KDM的证书链的有效期太长。这将导致在某些系统上播放DCP"
+"时出现问题。建议您通过单击“首选项”的“密钥”页面中的“重新制作证书和密钥…”按钮来"
+"重新创建签名证书链。"
+
+#: src/lib/video_decoder.cc:81
 msgid ""
 "The content file %1 is set as 3D but does not appear to contain 3D images.  "
 "Please set it to 2D.  You can still make a 3D DCP from this content by "
 "ticking the 3D option in the DCP video tab."
 msgstr ""
+"内容文件%1设置为3D，但似乎不包含3D图像。请将其设置为2D。通过勾选DCP视频选项卡"
+"中的3D选项，您仍然可以根据此内容制作3D DCP。"
 
-#: src/lib/job.cc:115
+#: src/lib/job.cc:121
 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:227
+#: src/lib/playlist.cc:228
 msgid "The file %1 has been moved %2 milliseconds earlier."
 msgstr "文件 %1 被向前移动了 %2 毫秒."
 
-#: src/lib/playlist.cc:222
+#: src/lib/playlist.cc:223
 msgid "The file %1 has been moved %2 milliseconds later."
 msgstr "文件 %1 被向后移动了 %2 毫秒."
 
-#: src/lib/playlist.cc:247
+#: src/lib/playlist.cc:248
 msgid "The file %1 has been trimmed by %2 milliseconds less."
 msgstr "文件 %1 被缩短了 %2 毫秒."
 
-#: src/lib/playlist.cc:242
+#: src/lib/playlist.cc:243
 msgid "The file %1 has been trimmed by %2 milliseconds more."
 msgstr "文件 %1 被延长了 %2 毫秒."
 
-#: src/lib/hints.cc:201
+#: src/lib/hints.cc:238
 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 "
@@ -1338,202 +1566,215 @@ msgid ""
 "rate to one closer to your content, provided that your target projection "
 "systems support your chosen DCP rate."
 msgstr ""
+"您的DCP和某些内容的帧速率不符。可能导致声画不同步。如果您的放映服务器支持当前"
+"速率，建议您将DCP帧速率设置为更接近当前原视频的速率。"
 
-#: src/lib/dcp_content.cc:620
+#: src/lib/dcp_content.cc:655
 msgid "There is no video in this DCP"
-msgstr "DCP中不包含画面"
+msgstr "DCP中不包含视频画面"
 
-#: src/lib/job.cc:213
+#: src/lib/job.cc:217
 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/job.cc:134
+#: src/lib/util.cc:965
+msgid "This KDM was made for DCP-o-matic but not for its leaf certificate."
+msgstr "KDM是为DCP-o-matic生成，但不是为它的叶子证书生成。"
+
+#: src/lib/util.cc:963
+msgid "This KDM was not made for DCP-o-matic's decryption certificate."
+msgstr "KDM不是为DCP-o-matic解密证书而生成。"
+
+#: src/lib/job.cc:140
 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 "
 "the 'number of threads DCP-o-matic should use' in the General tab of "
 "Preferences and try again."
 msgstr ""
+"出现此错误可能是因为您正在运行32位版本的DCP-o-matic，并且试图使用太多编码线"
+"程。请在“首选项”的“常规”选项卡中减少“DCP-o-matic应该使用的线程数”，然后重试。"
 
-#: src/lib/job.cc:144
+#: src/lib/job.cc:150
 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 ""
+"出现此错误可能是因为您正在运行32位版本的DCP-o-matic。请使用64位安装程序重新安"
+"装DCP-o-matic，然后重试。"
 
-#: 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 ""
-"这是一个KDM密匙文件。KDM密匙文件可以通过在你的DCP包上右键，点击添加KDM文件添"
-"加到DCP中。"
+"这是一个KDM密钥文件。KDM密钥文件可以通过在你的DCP包上右键，点击“添加KDM文"
+"件”添加到DCP中。"
 
-#: src/lib/film.cc:522
+#: src/lib/film.cc:526
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
-msgstr "不支持新版本创建的工程文件!"
+msgstr ""
+"这一工程文件是使用新版DCP-o-matic创建的，无法被这一版本的DCP-o-matic加载。抱"
+"歉！"
 
-#: src/lib/film.cc:507
+#: src/lib/film.cc:511
 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 "
 "create a new Film, re-add your content and set it up again.  Sorry!"
-msgstr "不支持老版本创建的工程文件!"
+msgstr ""
+"这一工程文件是使用旧版本的DCP-o-matic创建的，很遗憾无法被这一版本的DCP-o-"
+"matic加载。您需要创建一个新的工程文件，重新添加内容并重新设置。抱歉！"
 
-#: src/lib/util.cc:914
+#: src/lib/job.cc:528
 msgid "Thursday"
 msgstr "星期四"
 
-#: src/lib/types.cc:136
+#: src/lib/text_type.cc:68
 msgid "Timed text"
 msgstr "时控文本"
 
-#: src/lib/dcp_content_type.cc:48
+#: src/lib/dcp_content_type.cc:55
 msgid "Trailer"
 msgstr "预告片"
 
-#: src/lib/transcode_job.cc:63
+#: src/lib/transcode_job.cc:74
 msgid "Transcoding %1"
 msgstr "转码中 %1"
 
-#: src/lib/dcp_content_type.cc:50
+#: src/lib/dcp_content_type.cc:57
 msgid "Transitional"
 msgstr "过渡片"
 
-#: src/lib/util.cc:910
+#: src/lib/job.cc:524
 msgid "Tuesday"
 msgstr "星期二"
 
-#: src/lib/usl.cc:26
+#: src/lib/usl.cc:28
 msgid "USL"
-msgstr ""
+msgstr "规格上限 USL"
 
-#: src/lib/internet.cc:179
+#: src/lib/internet.cc:186
 msgid "Unexpected ZIP file contents"
 msgstr "意外的ZIP文件的内容"
 
-#: src/lib/image_proxy.cc:49
+#: src/lib/image_proxy.cc:53
 msgid "Unexpected image type received by server"
 msgstr "服务器接收到意外的图像类型"
 
-#: src/lib/cross_common.cc:86
-#, fuzzy
+#: src/lib/cross_common.cc:99 src/lib/dcp_text_track.cc:53
 msgid "Unknown"
 msgstr "未知"
 
-#: src/lib/job.cc:248
+#: src/lib/job.cc:258
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/lib/ffmpeg_decoder.cc:333
+#: src/lib/ffmpeg_decoder.cc:375
 msgid "Unrecognised audio sample format (%1)"
 msgstr "无法识别的音频采样格式 (%1)"
 
-#: src/lib/filter.cc:77
+#: src/lib/filter.cc:89
 msgid "Unsharp mask and Gaussian blur"
 msgstr "USM锐化和高斯模糊"
 
-#: src/lib/ffmpeg_content.cc:542 src/lib/ffmpeg_content.cc:566
-#: src/lib/ffmpeg_content.cc:584 src/lib/ffmpeg_content.cc:586
-#: src/lib/ffmpeg_content.cc:587 src/lib/ffmpeg_content.cc:613
-#: src/lib/ffmpeg_content.cc:615 src/lib/ffmpeg_content.cc:616
-#: src/lib/ffmpeg_content.cc:640 src/lib/ffmpeg_content.cc:641
+#: src/lib/ffmpeg_content.cc:552 src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:594 src/lib/ffmpeg_content.cc:596
+#: src/lib/ffmpeg_content.cc:597 src/lib/ffmpeg_content.cc:623
+#: src/lib/ffmpeg_content.cc:625 src/lib/ffmpeg_content.cc:626
+#: src/lib/ffmpeg_content.cc:650 src/lib/ffmpeg_content.cc:651
 msgid "Unspecified"
 msgstr "未指定"
 
-#: src/lib/colour_conversion.cc:240
+#: src/lib/colour_conversion.cc:247
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/lib/util.cc:555 src/lib/util.cc:556
+#: src/lib/util.cc:573 src/lib/util.cc:574
 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:148
 msgid "Upmix L"
-msgstr "左混"
+msgstr "上变换混音（左）"
 
-#: src/lib/upmixer_a.cc:128 src/lib/upmixer_b.cc:138
+#: src/lib/upmixer_a.cc:139 src/lib/upmixer_b.cc:149
 msgid "Upmix R"
-msgstr "右混"
+msgstr "上变换混音（右）"
 
-#: src/lib/util.cc:579
+#: src/lib/util.cc:597
 msgid "VI"
 msgstr "视力障碍"
 
-#: src/lib/verify_dcp_job.cc:47
+#: src/lib/verify_dcp_job.cc:55
 msgid "Verify DCP"
 msgstr "验证DCP中"
 
-#: src/lib/filter.cc:67
+#: src/lib/filter.cc:79
 msgid "Vertical flip"
 msgstr "垂直翻转"
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:566
 msgid "Visually impaired"
 msgstr "视力障碍"
 
-#: src/lib/upload_job.cc:44
+#: src/lib/upload_job.cc:51
 msgid "Waiting"
 msgstr "请稍候"
 
-#: src/lib/filter.cc:75
-#, fuzzy
+#: src/lib/filter.cc:87
 msgid "Weave filter"
-msgstr "胶转磁滤镜"
+msgstr "Weave 滤镜"
 
-#: src/lib/util.cc:912
+#: src/lib/job.cc:526
 msgid "Wednesday"
 msgstr "星期三"
 
-#: src/lib/ffmpeg_content.cc:646
+#: src/lib/ffmpeg_content.cc:656
 msgid "YCOCG"
 msgstr "YCOCG"
 
-#: src/lib/filter.cc:73
+#: src/lib/filter.cc:85
 msgid "Yet Another Deinterlacing Filter"
 msgstr "反隔行扫描滤镜"
 
-#: src/lib/hints.cc:176
-#, fuzzy
+#: src/lib/hints.cc:198
 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 ""
-"你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准（SMPTE）"
-"的DCP。"
+"您设置的帧率为%1 fps的DCP。并非所有放映设备都支持此帧率。建议您将DCP帧率更改"
+"为%2 fps。"
 
-#: src/lib/hints.cc:160
-#, fuzzy
+#: src/lib/hints.cc:182
 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 ""
-"你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准（SMPTE）"
-"的DCP。"
+"您设置的帧率为%1 fps的DCP。并非所有放映设备都支持此帧率。建议您将帧率更改为 "
+"%2 fps。"
 
-#: src/lib/hints.cc:170
-#, fuzzy
+#: src/lib/hints.cc:192
 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 ""
-"你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准（SMPTE）"
-"的DCP。"
+msgstr "您设置的DCP帧速率为30fps，这不是所有放映设备都支持 ，请注意兼容问题。"
 
-#: src/lib/hints.cc:223
+#: src/lib/hints.cc:303
 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模式。"
+msgstr ""
+"您添加的内容是3D内容，但您的DCP包设置为2D模式，如果您想在3D放映系统（如Real-"
+"D, MasterImage等）上播放，请设置到3D模式。"
 
 #: src/lib/hints.cc:119
 msgid ""
@@ -1541,10 +1782,10 @@ msgid ""
 "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 ""
-"你用的是dcp-o-matic双声道转5.1立体声的混频器。这是实验性的功能，可能导致音频"
-"质量差。如果你继续，你应该检查完成的DCP声音."
+"你用的是DCP-o-matic双声道转5.1环绕声的上混音器。这是实验性的功能，可能导致音"
+"频质量变差。如果你继续，你应该在影院试听完成的DCP声音以确认。"
 
-#: src/lib/hints.cc:212
+#: src/lib/hints.cc:287
 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."
@@ -1552,277 +1793,323 @@ msgstr ""
 "您已经添加了 %1 个VOB文件，如果他们来自一张DVD，请确保您已经导入了所有文件，"
 "否则可能无法正常播放。"
 
-#: src/lib/hints.cc:325
+#: src/lib/film.cc:1530
+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
 msgid ""
 "You have overlapping closed captions, which are not allowed in Interop "
 "DCPs.  Change your DCP standard to SMPTE."
 msgstr ""
+"您有重叠的隐藏式字幕，这在 Interop DCP中是不允许的。请您的DCP标准更改为"
+"SMPTE。"
 
-#: src/lib/hints.cc:110
+#: src/lib/hints.cc:271
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
-msgstr "您添加的字体文件超过了640KB，部分服务器不支持超过640KB大小的字体。"
+msgstr ""
+"您添加的字体文件超过了640KB，部分服务器不支持超过640KB大小的字体，可能在播放"
+"时出现问题。"
 
-#: src/lib/film.cc:356
-#, fuzzy
+#: src/lib/make_dcp.cc:56
 msgid "You must add some content to the DCP before creating it"
-msgstr "您必须在创建DCP之前添加一些内容"
+msgstr "在创建 DCP 之前，必须向其中添加一些内容"
 
-#: src/lib/hints.cc:114
+#: src/lib/hints.cc:109
 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 "
 "matter if your content has fewer channels, as DCP-o-matic will fill the "
 "extras with silence."
 msgstr ""
+"您的DCP的音轨少于6个，某些放映设备可能不支持。但是如果您的内容没有这么多的音"
+"轨，您仍然可以设置成6个音轨，因为DCP-o-matic将用空白音轨补齐。"
 
-#: src/lib/hints.cc:146
+#: src/lib/hints.cc:157
 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"
+"projectors.  If possible, use Flat or Scope for the DCP container ratio."
 msgstr ""
-"DCP使用了不常见的画幅比例，可能导致部分电影放映机无法正常播放，建议改成Flat "
-"(1.77/1.78/1.85) 或者Scope (2.35/2.39) 比例"
+"您的DCP使用了不常见的画幅比例，可能导致部分电影放映机无法正常播放，建议改成"
+"Flat (1.77/1.78/1.85) 或者Scope (2.35/2.39) 比例。"
 
-#: src/lib/hints.cc:248
+#: src/lib/hints.cc:337
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
 msgstr "您的音频增益过大 (在%1)，请降低音频增益。"
 
-#: src/lib/config.cc:304
-msgid ""
-"Your default container is not valid and has been changed to Flat (1.85:1)"
-msgstr "默认设置的容器不可用，已被替换为Flat (1.85:1)"
-
-#: src/lib/playlist.cc:218
+#: src/lib/playlist.cc:219
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
 msgstr "您的项目包含不与帧边界对齐的视频内容."
 
-#: src/lib/playlist.cc:238
+#: src/lib/playlist.cc:239
 msgid ""
 "Your project contains video content whose trim was not aligned to a frame "
 "boundary."
 msgstr "您的项目包含的视频内容包含修剪不对齐的帧边界."
 
-#: src/lib/image_content.cc:72
+#: src/lib/image_content.cc:77
 msgid "[moving images]"
 msgstr "[动态图像]"
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:75
 msgid "[still]"
 msgstr "[静态图像]"
 
-#: src/lib/dcp_subtitle_content.cc:103 src/lib/string_text_file_content.cc:70
+#: src/lib/dcp_subtitle_content.cc:108 src/lib/string_text_file_content.cc:112
 msgid "[subtitles]"
 msgstr "[字幕]"
 
 #. / TRANSLATORS: _reel%1 here is to be added to an export filename to indicate
 #. / which reel it is.  Preserve the %1; it will be replaced with the reel number.
-#: src/lib/ffmpeg_encoder.cc:74 src/lib/subtitle_encoder.cc:63
+#: src/lib/ffmpeg_encoder.cc:153
 msgid "_reel%1"
 msgstr "_卷号%1"
 
-#: src/lib/dcpomatic_socket.cc:73
+#: src/lib/audio_content.cc:318
+#, fuzzy
+msgid "bits"
+msgstr "位"
+
+#: src/lib/dcpomatic_socket.cc:78
 msgid "connect timed out"
 msgstr "连接超时"
 
-#: src/lib/uploader.cc:35
+#: src/lib/uploader.cc:38
 msgid "connecting"
 msgstr "连接"
 
-#: src/lib/film.cc:352
+#: src/lib/make_dcp.cc:52
 msgid "container"
 msgstr "打包类型"
 
-#: src/lib/film.cc:364
+#: src/lib/make_dcp.cc:64
 msgid "content type"
 msgstr "打包类型"
 
-#: src/lib/uploader.cc:73
+#: src/lib/uploader.cc:79
 msgid "copying %1"
-msgstr "复制中... %1"
+msgstr "复制 %1 中..."
 
-#: src/lib/ffmpeg.cc:142 src/lib/ffmpeg_image_proxy.cc:158
+#: src/lib/ffmpeg.cc:142
 msgid "could not find stream information"
 msgstr "找不到流信息"
 
-#: src/lib/reel_writer.cc:357
+#: src/lib/reel_writer.cc:441
+msgid "could not move atmos asset into the DCP (%1)"
+msgstr "无法将 Atmos asset移动到 DCP (%1)"
+
+#: src/lib/reel_writer.cc:424
 msgid "could not move audio asset into the DCP (%1)"
-msgstr "无法移动的音频文件 (%1)"
+msgstr "无法将音频asset移动到 DCP (%1)"
 
-#: src/lib/exceptions.cc:35
-#, fuzzy
+#: src/lib/exceptions.cc:38
 msgid "could not open file %1 for read (%2)"
 msgstr "读取 %1文件失败(%2)"
 
-#: src/lib/exceptions.cc:34
-#, fuzzy
+#: src/lib/exceptions.cc:37
 msgid "could not open file %1 for read/write (%2)"
-msgstr "读取 %1文件失败(%2)"
+msgstr "无法打开文件 %1 来读写 (%2)"
 
-#: src/lib/exceptions.cc:35
-#, fuzzy
+#: src/lib/exceptions.cc:38
 msgid "could not open file %1 for write (%2)"
 msgstr "写入 %1文件失败(%2)"
 
-#: src/lib/exceptions.cc:52
+#: src/lib/exceptions.cc:57
 msgid "could not read from file %1 (%2)"
-msgstr "无法从文件中读取 %1 (%2)"
+msgstr "无法从文件 %1 中读取(%2)"
 
-#: src/lib/scp_uploader.cc:66
-msgid "could not start SCP session (%1)"
-msgstr "无法启动SCP (%1)"
-
-#: src/lib/scp_uploader.cc:41
-msgid "could not start SSH session"
-msgstr "无法启动SSH"
-
-#: src/lib/exceptions.cc:58
+#: src/lib/exceptions.cc:64
 msgid "could not write to file %1 (%2)"
 msgstr "不能写入文件 %1 (%2)"
 
-#: src/lib/dcpomatic_socket.cc:69
+#: src/lib/dcpomatic_socket.cc:74
 msgid "error during async_connect (%1)"
 msgstr "异步连接错误 (%1)"
 
-#: src/lib/dcpomatic_socket.cc:126
+#: src/lib/dcpomatic_socket.cc:142
 msgid "error during async_read (%1)"
 msgstr "异步读取错误 (%1)"
 
-#: src/lib/dcpomatic_socket.cc:94
+#: src/lib/dcpomatic_socket.cc:108
 msgid "error during async_write (%1)"
 msgstr "异步写入错误 (%1)"
 
-#: src/lib/content.cc:445 src/lib/content.cc:454
+#: src/lib/content.cc:483 src/lib/content.cc:492
 msgid "frames per second"
 msgstr "每秒帧数"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:189
+#: src/lib/util.cc:205
 msgid "h"
 msgstr "小时"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:706
-#, fuzzy
+#: src/lib/dcp_content.cc:748
 msgid "it does not have closed captions in all its reels."
-msgstr "该DCP的所有分卷无声音。"
+msgstr "它的所有分卷都没有隐藏式字幕。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:701
-#, fuzzy
+#: src/lib/dcp_content.cc:737
 msgid "it does not have open subtitles in all its reels."
-msgstr "该DCP的所有分卷无字幕。"
+msgstr "它的所有分卷都没有开放式字幕。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:669
-#, fuzzy
+#: src/lib/dcp_content.cc:704
 msgid "it does not have sound in all its reels."
-msgstr "该DCP的所有分卷无声音。"
+msgstr "它的所有分卷都没有声音。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:573
-#, fuzzy
+#: src/lib/dcp_content.cc:608
 msgid "it has a different frame rate to the film."
-msgstr "影片与DCP的帧速率不一致."
+msgstr "它的帧率与影片不一致。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:630
-#, fuzzy
+#: src/lib/dcp_content.cc:763
+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
 msgid "it is 2K and the film is 4K."
-msgstr "打包内容被设置为Interop类型，而实际打包类型是 SMPTE。"
+msgstr "它是 2K 分辨率，而影片是 4K。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:627
-#, fuzzy
+#: src/lib/dcp_content.cc:662
 msgid "it is 4K and the film is 2K."
-msgstr "打包内容被设置为Interop类型，而实际打包类型是 SMPTE。"
+msgstr "它是 4K 分辨率，而影片是 2K。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:561
-#, fuzzy
+#: src/lib/dcp_content.cc:596
 msgid "it is Interop and the film is set to SMPTE."
-msgstr "打包内容被设置为Interop类型，而实际打包类型是 SMPTE。"
+msgstr "它是Interop类型，而实际打包类型是 SMPTE。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:565
-#, fuzzy
+#: src/lib/dcp_content.cc:600
 msgid "it is SMPTE and the film is set to Interop."
-msgstr "打包内容被设置为SMPTE类型，而实际打包类型是 Interop。"
+msgstr "它是SMPTE类型，而实际打包类型是 Interop。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:675
-#, fuzzy
+#: src/lib/dcp_content.cc:710
 msgid "it overlaps other audio content; remove the other content."
-msgstr "音频文件重复，请删除重复项."
+msgstr "与其他音频内容重叠；请删除其他内容。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:712
-#, fuzzy
+#: src/lib/dcp_content.cc:768
 msgid "it overlaps other text content; remove the other content."
-msgstr "视频文件重复，请删除重复项."
+msgstr "与其他文字内容重叠；请删除其他内容。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:640
-#, fuzzy
+#: src/lib/dcp_content.cc:675
 msgid "it overlaps other video content; remove the other content."
-msgstr "视频文件重复，请删除重复项."
+msgstr "与其他视频内容重叠；请删除其他内容。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:596
-#, fuzzy
+#: src/lib/dcp_content.cc:631
 msgid ""
 "its reel lengths differ from those in the film; set the reel mode to 'split "
 "by video content'."
-msgstr "影片时长与DCP中的分卷时长不一致，请设置 【 分卷模式 】 来分割该内容。"
+msgstr ""
+"其分卷时长与影片中的不一致；请设置 【 分卷模式 】 为【 按视频内容分割 】。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:635
-#, fuzzy
+#: src/lib/dcp_content.cc:670
 msgid "its video frame size differs from the film's."
-msgstr "视频帧大小与DCP不一致。"
+msgstr "视频帧大小与影片不一致。"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:198
+#: src/lib/util.cc:214
 msgid "m"
 msgstr "分"
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:93
 msgid "moving"
 msgstr "移动"
 
-#: src/lib/film.cc:348
+#: src/lib/make_dcp.cc:48
 msgid "name"
 msgstr "名字"
 
+#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:754
+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
+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:208
+#: src/lib/util.cc:224
 msgid "s"
 msgstr "秒"
 
-#: src/lib/colour_conversion.cc:281
+#: src/lib/colour_conversion.cc:288
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/film.cc:373
-msgid "some of your content is missing"
-msgstr "内容不完整"
-
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:91
 msgid "still"
 msgstr "静止图像"
 
-#: src/lib/ffmpeg_examiner.cc:264
+#: src/lib/ffmpeg_examiner.cc:342
 msgid "unknown"
 msgstr "未知"
 
-#: src/lib/video_content.cc:481
+#: src/lib/video_content.cc:516
 msgid "video frames"
 msgstr "视频帧"
 
+#~ msgid ""
+#~ "Please report this problem by using Help -> Report a problem or via email "
+#~ "to carl@dcpomatic.com"
+#~ msgstr ""
+#~ "请提交这个问题，在帮助餐单中选择：通过Email反馈问题：carl@dcpomatic.com"
+
+#~ msgid ""
+#~ "Your default container is not valid and has been changed to Flat (1.85:1)"
+#~ msgstr "默认设置的容器不可用，已被替换为Flat (1.85:1)"
+
+#~ msgid "Lc"
+#~ msgstr "左中"
+
+#~ msgid "Rc"
+#~ msgstr "右中"
+
+#~ msgid "Choose 'Make DCP' again when you have done this."
+#~ msgstr "请在做完更改之后再次执行“制作DCP”命令。"
+
+#, fuzzy
+#~ msgid "Content to be joined must have the same audio language."
+#~ msgstr "视频和音频增益必须相同。"
+
+#~ msgid "Could not start SCP session (%1)"
+#~ msgstr "无法启动 SCP (%1)"
+
+#~ msgid "could not start SCP session (%1)"
+#~ msgstr "无法启动SCP (%1)"
+
+#~ msgid "could not start SSH session"
+#~ msgstr "无法启动SSH"
+
+#~ msgid "No scale"
+#~ msgstr "不缩放"
+
+#~ msgid "No stretch"
+#~ msgstr "不拉伸"
+
 #~ msgid ""
 #~ "Your DCP has fewer than 6 audio channels.  This may cause problems on "
 #~ "some projectors."