X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpo%2Fzh_CN.po;h=57b23904a8697972380186550eb433d2d4d1bf44;hb=423996af81218d48dbeaccef52ff822e02c43128;hp=485241f265aa989d2122df0bca53817ad80417c2;hpb=81d517a86149e1f934b5c906e2623db00adea915;p=dcpomatic.git

diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 485241f26..57b23904a 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -7,19 +7,19 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-10-20 21:26+0100\n"
-"PO-Revision-Date: 2018-04-05 20:13+0800\n"
+"POT-Creation-Date: 2021-08-12 22:33+0200\n"
+"PO-Revision-Date: 2019-04-21 22:30+0800\n"
 "Last-Translator: Hanyuan\n"
 "Language-Team: Hanyuan\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/lib/video_content.cc:448
+#: src/lib/video_content.cc:486
 #, c-format
 msgid ""
 "\n"
@@ -28,7 +28,7 @@ msgstr ""
 "\n"
 "源视频帧率 %.4f\n"
 
-#: src/lib/video_content.cc:412
+#: src/lib/video_content.cc:451
 msgid ""
 "\n"
 "Cropped to %1x%2"
@@ -36,7 +36,7 @@ msgstr ""
 "\n"
 "裁剪为%1x%2"
 
-#: src/lib/video_content.cc:405
+#: src/lib/video_content.cc:444
 #, c-format
 msgid ""
 "\n"
@@ -45,7 +45,7 @@ msgstr ""
 "\n"
 "显示宽高比 %.2f:1"
 
-#: src/lib/video_content.cc:436
+#: src/lib/video_content.cc:474
 msgid ""
 "\n"
 "Padded with black to fit container %1 (%2x%3)"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 "填充为黑色，以适应打包宽高比 %1 (%2x%3)"
 
-#: src/lib/video_content.cc:426
+#: src/lib/video_content.cc:464
 msgid ""
 "\n"
 "Scaled to %1x%2"
@@ -61,18 +61,18 @@ msgstr ""
 "\n"
 "缩放到 %1x%2"
 
-#: src/lib/video_content.cc:430 src/lib/video_content.cc:441
+#: src/lib/video_content.cc:468 src/lib/video_content.cc:479
 #, 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:447
+#: src/lib/job.cc:491
 msgid " on %1"
 msgstr " on %1"
 
-#: src/lib/config.cc:1055
+#: src/lib/config.cc:1128
 msgid ""
 "$CPL_NAME\n"
 "\n"
@@ -94,90 +94,116 @@ msgstr ""
 "长度: $LENGTH\n"
 "大小: $SIZE\n"
 
-#: src/lib/config.cc:1033
+#: src/lib/config.cc:1106
 msgid "$JOB_NAME: $JOB_STATUS"
+msgstr "$JOB_NAME: $JOB_STATUS"
+
+#: src/lib/cross_common.cc:94
+msgid "%1 (%2 GB) [%3]"
 msgstr ""
 
-#: src/lib/atmos_mxf_content.cc:83
+#: src/lib/atmos_mxf_content.cc:96
 msgid "%1 [Atmos]"
 msgstr "%1 [全景声]"
 
-#: src/lib/dcp_content.cc:247
+#: src/lib/dcp_content.cc:318
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:332
+#: src/lib/ffmpeg_content.cc:345
 msgid "%1 [audio]"
 msgstr "%1 [音频]"
 
-#: src/lib/ffmpeg_content.cc:328
+#: src/lib/ffmpeg_content.cc:341
 msgid "%1 [movie]"
 msgstr "%1 [影片]"
 
-#: src/lib/ffmpeg_content.cc:330 src/lib/video_mxf_content.cc:96
+#: src/lib/ffmpeg_content.cc:343 src/lib/video_mxf_content.cc:105
 msgid "%1 [video]"
 msgstr "%1 [视频]"
 
-#: src/lib/video_content.cc:400
+#: src/lib/video_content.cc:439
 #, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ", 像素宽高比 %.2f:1"
 
-#: src/lib/ratio.cc:38
+#: src/lib/ratio.cc:42
 msgid "1.19"
 msgstr "1.19"
 
-#: src/lib/ratio.cc:39
+#: src/lib/ratio.cc:43
 msgid "1.33 (4:3)"
 msgstr "1.33 (4:3)"
 
-#: src/lib/ratio.cc:40
+#: src/lib/ratio.cc:44
 msgid "1.38 (Academy)"
 msgstr "1.38 (Academy学院)"
 
-#: src/lib/ratio.cc:41
+#: src/lib/ratio.cc:45
 msgid "1.43 (IMAX)"
 msgstr "1.43 (IMAX)"
 
-#: src/lib/ratio.cc:42
+#: src/lib/ratio.cc:46
 msgid "1.66"
 msgstr "1.66"
 
-#: src/lib/ratio.cc:43
+#: src/lib/ratio.cc:47
 msgid "1.78 (16:9 or HD)"
 msgstr "1.78 (16:9 or HD)"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:48
 msgid "1.85 (Flat)"
 msgstr "1.85 (Flat)"
 
-#: src/lib/ratio.cc:47
+#: src/lib/ratio.cc:51
 msgid "1.90 (Full frame)"
 msgstr "Full(全幅/1.90)"
 
-#: src/lib/ratio.cc:45
+#: src/lib/ratio.cc:49
 msgid "2.35 (35mm Scope)"
 msgstr "2.35 (35mm Scope)"
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:50
 msgid "2.39 (Scope)"
 msgstr "2.39 (Scope)"
 
-#: src/lib/filter.cc:77
+#: src/lib/filter.cc:87
 msgid "3D denoiser"
 msgstr "3D 降噪"
 
+#: src/lib/hints.cc:212
+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 ""
+
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:132
+#: src/lib/transcode_job.cc:155
 #, c-format
 msgid "; %.1f fps"
 msgstr "; %.1f fps"
 
-#: src/lib/job.cc:452
+#: src/lib/job.cc:496
 msgid "; %1 remaining; finishing at %2%3"
 msgstr "; 剩余 %1 ; 完成于 %2%3"
 
-#: src/lib/hints.cc:161
+#: 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:169
 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 "
@@ -186,164 +212,231 @@ msgstr ""
 "有些放映设备不支持高码率DCP,我们推荐使用200Mbit/s以内的码率来进行打包，这种细"
 "微的调整是肉眼很难分辨的。"
 
-#: src/lib/ffmpeg_content.cc:590
+#: src/lib/ffmpeg_content.cc:635
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr "ARIB STD-B67 (HDR-HLG)"
 
-#: src/lib/dcp_content_type.cc:55
+#: src/lib/dcp_content_type.cc:60
 msgid "Advertisement"
 msgstr "广告片"
 
-#: src/lib/hints.cc:153
-msgid ""
-"All of your content is at 1.85:1 or narrower but your DCP's container is "
-"Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
-"frame.  You may prefer to set your DCP's container to Flat (1.85:1) in the "
-"\"DCP\" tab."
-msgstr "遮幅(1.85：1)左右黑边。"
-
-#: src/lib/hints.cc:149
+#: src/lib/hints.cc:146
 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.  "
 "You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" "
 "tab."
-msgstr "宽幅(2.39：1)上下黑边。"
+msgstr ""
+"您添加的媒体画面宽高比为2.39:1，但是DCP容器设置为1.85:1的模式。这将会使您的画"
+"面在放映时存在上下黑边。建议把DCP容器设置为2.39:1的模式。"
+
+#: src/lib/hints.cc:150
+#, fuzzy
+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 ""
+"您添加的媒体画面宽高比为2.35:1，但是DCP容器设置为2.39:1的模式。这将会使您的画"
+"面在放映时存在上下黑边。建议把DCP容器设置为与素材相同宽高比的模式。"
 
-#: src/lib/job.cc:105
+#: src/lib/job.cc:106
 msgid "An error occurred whilst handling the file %1."
 msgstr "执行错误 %1."
 
-#: src/lib/analyse_audio_job.cc:95
-msgid "Analyse audio"
-msgstr "分析音频"
+#: src/lib/analyse_audio_job.cc:70
+msgid "Analysing audio"
+msgstr "分析音频中"
+
+#: src/lib/analyse_subtitles_job.cc:55
+#, fuzzy
+msgid "Analysing subtitles"
+msgstr "定位字幕中"
+
+#: src/lib/hints.cc:368
+msgid ""
+"At least one marker comes after the end of the project and will be ignored."
+msgstr ""
+
+#: src/lib/hints.cc:473
+msgid "At least one of your closed caption files is larger than "
+msgstr ""
+
+#: src/lib/hints.cc:466
+msgid "At least one of your closed caption files' XML part is larger than "
+msgstr ""
+
+#: src/lib/hints.cc:481
+msgid "At least one of your subtitle files is larger than "
+msgstr ""
+
+#: src/lib/hints.cc:445
+msgid ""
+"At least one of your subtitle lines has more than 52 characters.  It is "
+"recommended to make each line 52 characters at most in length."
+msgstr ""
+
+#: src/lib/hints.cc:447
+msgid ""
+"At least one of your subtitle lines has more than 79 characters.  You should "
+"make each line 79 characters at most in length."
+msgstr ""
+
+#: src/lib/hints.cc:590
+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:580
+msgid ""
+"At least one of your subtitles lasts less than 15 frames.  It is advisable "
+"to make each subtitle at least 15 frames long."
+msgstr ""
+
+#: src/lib/hints.cc:585
+msgid ""
+"At least one of your subtitles starts less than 2 frames after the previous "
+"one.  It is advisable to make the gap between subtitles at least 2 frames."
+msgstr ""
+
+#: src/lib/hints.cc:633
+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:258
+#: src/lib/audio_content.cc:271
 msgid "Audio will be resampled from %1Hz to %2Hz"
 msgstr "音频重新采样频率设置为 %1Hz 到 %2Hz"
 
-#: src/lib/audio_content.cc:260
+#: src/lib/audio_content.cc:273
 msgid "Audio will be resampled to %1Hz"
 msgstr "音频将被重新采样至 %1Hz"
 
-#: src/lib/audio_content.cc:249
+#: src/lib/audio_content.cc:262
 msgid "Audio will not be resampled"
 msgstr "音频不能被重新采样"
 
-#: src/lib/ffmpeg_content.cc:584
+#: src/lib/ffmpeg_content.cc:629
 msgid "BT1361 extended colour gamut"
 msgstr "BT1361扩展色域"
 
-#: src/lib/ffmpeg_content.cc:552
+#: src/lib/ffmpeg_content.cc:597
 msgid "BT2020"
 msgstr "BT2020"
 
-#: src/lib/ffmpeg_content.cc:607
+#: src/lib/ffmpeg_content.cc:652
 msgid "BT2020 constant luminance"
 msgstr "BT2020 恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:586
+#: src/lib/ffmpeg_content.cc:631
 msgid "BT2020 for a 10-bit system"
 msgstr "BT2020 采样深度为 10-bit"
 
-#: src/lib/ffmpeg_content.cc:587
+#: src/lib/ffmpeg_content.cc:632
 msgid "BT2020 for a 12-bit system"
 msgstr "BT2020 采样深度为 12 bits"
 
-#: src/lib/ffmpeg_content.cc:606
+#: src/lib/ffmpeg_content.cc:651
 msgid "BT2020 non-constant luminance"
 msgstr "BT2020 非恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:611
+#: src/lib/ffmpeg_content.cc:656
 msgid "BT2100"
-msgstr ""
+msgstr "BT2100"
 
-#: src/lib/ffmpeg_content.cc:548
+#: src/lib/ffmpeg_content.cc:593
 msgid "BT470BG"
 msgstr "BT470BG"
 
-#: src/lib/ffmpeg_content.cc:602
+#: src/lib/ffmpeg_content.cc:647
 msgid "BT470BG (BT601-6)"
 msgstr "BT470BG (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:547
+#: src/lib/ffmpeg_content.cc:592
 msgid "BT470M"
 msgstr "BT470M"
 
-#: src/lib/ffmpeg_content.cc:544 src/lib/ffmpeg_content.cc:573
-#: src/lib/ffmpeg_content.cc:598
+#: 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:618
+#: src/lib/ffmpeg_content.cc:663
 msgid "Bits per pixel"
 msgstr "像素位"
 
-#: src/lib/util.cc:549
+#: src/lib/filter.cc:83
+#, fuzzy
+msgid "Bob Weaver Deinterlacing Filter"
+msgstr "反隔行扫描滤镜"
+
+#: src/lib/util.cc:598
 msgid "BsL"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:550
+#: src/lib/util.cc:599
 msgid "BsR"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:541
+#: src/lib/util.cc:590
 msgid "C"
 msgstr "中置"
 
-#: src/lib/job.cc:461
+#: src/lib/job.cc:505
 msgid "Cancelled"
 msgstr "取消"
 
-#: src/lib/film.cc:301
-#, fuzzy
+#: src/lib/film.cc:363
 msgid "Cannot contain slashes"
-msgstr "不能包含斜线"
+msgstr "不能包含斜杠"
 
-#: src/lib/exceptions.cc:61
+#: src/lib/exceptions.cc:78
 msgid "Cannot handle pixel format %1 during %2"
-msgstr "在 %2不能处理图片格式 %1"
+msgstr "在 %2 不能处理图片格式 %1"
 
-#: src/lib/film.cc:1267
+#: src/lib/film.cc:1648
 msgid "Cannot make a KDM as this project is not encrypted."
 msgstr "不能生成KDM，因为项目没有被加密."
 
-#: src/lib/util.cc:510
+#: src/lib/util.cc:559
 msgid "Centre"
 msgstr "居中对齐"
 
-#: src/lib/audio_content.cc:306
+#: src/lib/audio_content.cc:309
 msgid "Channels"
 msgstr "声音通道"
 
-#: src/lib/check_content_change_job.cc:46
-msgid "Check content for changes"
-msgstr ""
+#: src/lib/check_content_change_job.cc:52
+msgid "Checking content for changes"
+msgstr "检查媒体内容是否有改变"
 
-#: src/lib/reel_writer.cc:104
+#: src/lib/reel_writer.cc:250
 msgid "Checking existing image data"
 msgstr "检查现有的图像数据"
 
-#: src/lib/check_content_change_job.cc:90
+#: src/lib/check_content_change_job.cc:93
 msgid "Choose 'Make DCP' again when you have done this."
-msgstr ""
+msgstr "请在做完更改之后再次执行“制作DCP”命令"
 
-#: src/lib/ffmpeg_content.cc:610
+#: src/lib/ffmpeg_content.cc:655
 #, fuzzy
 msgid "Chroma-derived constant luminance"
 msgstr "BT2020 恒定亮度"
 
-#: src/lib/ffmpeg_content.cc:609
+#: src/lib/ffmpeg_content.cc:654
 #, fuzzy
 msgid "Chroma-derived non-constant luminance"
 msgstr "BT2020 非恒定亮度"
 
-#: src/lib/types.cc:134
-#, fuzzy
+#: src/lib/types.cc:143
 msgid "Closed captions"
-msgstr "降噪"
+msgstr "隐藏式字幕"
 
-#: src/lib/ffmpeg_content.cc:569
+#: src/lib/ffmpeg_content.cc:614
 msgid "Colour primaries"
 msgstr "原色"
 
@@ -357,49 +450,67 @@ 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:501 src/lib/ffmpeg_content.cc:508
-#: src/lib/ffmpeg_content.cc:515 src/lib/ffmpeg_content.cc:525
-#: src/lib/ffmpeg_content.cc:530 src/lib/ffmpeg_content.cc:535
+#: 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:594
+#: src/lib/ffmpeg_content.cc:639
 msgid "Colour transfer characteristic"
 msgstr "彩色传输特性"
 
-#: src/lib/ffmpeg_content.cc:615
+#: src/lib/ffmpeg_content.cc:660
 msgid "Colourspace"
 msgstr "色彩空间"
 
+#: src/lib/combine_dcp_job.cc:49
+msgid "Combine DCPs"
+msgstr ""
+
 #: src/lib/content.cc:190
 msgid "Computing digest"
 msgstr "计算Hash值中"
 
-#: src/lib/writer.cc:526
+#: src/lib/writer.cc:535
 msgid "Computing digests"
 msgstr "计算Hash值中"
 
-#: src/lib/frame_rate_change.cc:67
+#: src/lib/analytics.cc:62
+msgid "Congratulations!"
+msgstr ""
+
+#: src/lib/frame_rate_change.cc:90
 msgid "Content and DCP have the same rate.\n"
 msgstr "源内容和DCP设定帧率需要一致。\n"
 
-#: src/lib/audio_content.cc:307
+#: src/lib/audio_content.cc:310
 msgid "Content audio sample rate"
 msgstr "源音频采样率"
 
-#: src/lib/ffmpeg_content.cc:151
+#: src/lib/ffmpeg_content.cc:155
 msgid "Content to be joined must all have or not have audio"
 msgstr "要加入的内容必须都有或都没有音频"
 
-#: src/lib/ffmpeg_content.cc:154
-#, fuzzy
+#: src/lib/ffmpeg_content.cc:158
 msgid "Content to be joined must all have or not have subtitles or captions"
-msgstr "要加入的内容必须都有或都没有字幕"
+msgstr "要加入的内容必须都有或都没有隐藏式字幕"
 
-#: src/lib/ffmpeg_content.cc:148
+#: src/lib/ffmpeg_content.cc:152
 msgid "Content to be joined must all have or not have video"
 msgstr "要加入的内容必须都有或都没有视频"
 
+#: src/lib/text_content.cc:305
+#, fuzzy
+msgid ""
+"Content to be joined must both be main subtitle languages or both additional."
+msgstr "字幕行距必须相同."
+
+#: src/lib/video_content.cc:207
+#, fuzzy
+msgid "Content to be joined must have all its video used or not used."
+msgstr "内容帧率必须相同"
+
 #: src/lib/text_content.cc:260
 msgid "Content to be joined must have the same 'burn subtitles' setting."
 msgstr "所有要添加“刻录字幕”设置必须具有相同。"
@@ -408,23 +519,38 @@ msgstr "所有要添加“刻录字幕”设置必须具有相同。"
 msgid "Content to be joined must have the same 'use subtitles' setting."
 msgstr "所有要添加“use 字幕”设置必须具有相同。"
 
-#: src/lib/audio_content.cc:106
+#: src/lib/audio_content.cc:113
 msgid "Content to be joined must have the same audio delay."
 msgstr "视频和音频的延迟必须相同。"
 
-#: src/lib/audio_content.cc:102
+#: src/lib/audio_content.cc:109
 msgid "Content to be joined must have the same audio gain."
 msgstr "视频和音频增益必须相同。"
 
-#: src/lib/video_content.cc:184
+#: src/lib/video_content.cc:239
+#, fuzzy
+msgid "Content to be joined must have the same burnt subtitle language."
+msgstr "所有要添加“刻录字幕”设置必须具有相同。"
+
+#: src/lib/video_content.cc:231
 msgid "Content to be joined must have the same colour conversion."
 msgstr "视频颜色转换必须相同。"
 
-#: src/lib/video_content.cc:176
+#: src/lib/video_content.cc:219
 msgid "Content to be joined must have the same crop."
 msgstr "视频裁剪设置必须相同。"
 
-#: src/lib/video_content.cc:188
+#: src/lib/video_content.cc:223
+#, fuzzy
+msgid "Content to be joined must have the same custom ratio setting."
+msgstr "视频比例设置必须相同。"
+
+#: src/lib/video_content.cc:227
+#, fuzzy
+msgid "Content to be joined must have the same custom size setting."
+msgstr "视频比例设置必须相同。"
+
+#: src/lib/video_content.cc:235
 msgid "Content to be joined must have the same fades."
 msgstr "视频淡入淡出效果必须相同。"
 
@@ -432,14 +558,10 @@ msgstr "视频淡入淡出效果必须相同。"
 msgid "Content to be joined must have the same outline width."
 msgstr "字幕宽度尺寸必须相同。"
 
-#: src/lib/video_content.cc:168
+#: src/lib/video_content.cc:211
 msgid "Content to be joined must have the same picture size."
 msgstr "视频图像尺寸必须相同。"
 
-#: src/lib/video_content.cc:180
-msgid "Content to be joined must have the same scale setting."
-msgstr "视频比例设置必须相同。"
-
 #: src/lib/text_content.cc:264
 msgid "Content to be joined must have the same subtitle X offset."
 msgstr "字幕X轴偏移必须相同。"
@@ -464,147 +586,190 @@ msgstr "字幕淡入淡出效果必须相同。"
 msgid "Content to be joined must have the same subtitle line spacing."
 msgstr "字幕行距必须相同."
 
-#: src/lib/content.cc:137 src/lib/content.cc:141
+#: src/lib/content.cc:134 src/lib/content.cc:138
 msgid "Content to be joined must have the same video frame rate"
 msgstr "内容帧率必须相同"
 
-#: src/lib/video_content.cc:172
+#: src/lib/video_content.cc:215
 msgid "Content to be joined must have the same video frame type."
 msgstr "视频帧率必须相同。"
 
 #: src/lib/text_content.cc:297
-#, fuzzy
 msgid "Content to be joined must use the same DCP track."
-msgstr "字幕字体必须相同。"
+msgstr "DCP轨道必须相同。"
 
-#: src/lib/text_content.cc:293 src/lib/text_content.cc:305
+#: src/lib/text_content.cc:293 src/lib/text_content.cc:313
 msgid "Content to be joined must use the same fonts."
 msgstr "字幕字体必须相同。"
 
-#: src/lib/ffmpeg_content.cc:175
+#: src/lib/ffmpeg_content.cc:179
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "字幕流必须相同。"
 
-#: src/lib/video_content.cc:391
+#: src/lib/text_content.cc:301
+#, fuzzy
+msgid "Content to be joined must use the same text language."
+msgstr "字幕字体必须相同。"
+
+#: src/lib/video_content.cc:430
 msgid "Content video is %1x%2"
 msgstr "源视频分辨率是 %1x%2"
 
-#: src/lib/upload_job.cc:53
+#: src/lib/upload_job.cc:66
 msgid "Copy DCP to TMS"
 msgstr "复制DCP到TMS（影院内容管理系统）"
 
-#: src/lib/scp_uploader.cc:51
+#: src/lib/reel_writer.cc:134
+msgid "Copying old video file"
+msgstr ""
+
+#: src/lib/reel_writer.cc:389
+#, fuzzy
+msgid "Copying video file into DCP"
+msgstr "DCP中的视频分辨率不匹配"
+
+#: src/lib/scp_uploader.cc:55
 msgid "Could not connect to server %1 (%2)"
 msgstr "无法连接到服务器 %1 (%2)"
 
-#: src/lib/scp_uploader.cc:88
+#: src/lib/scp_uploader.cc:96
 msgid "Could not create remote directory %1 (%2)"
 msgstr "无法创建远程目录 %1 (%2)"
 
-#: src/lib/image_examiner.cc:62
+#: src/lib/image_examiner.cc:65
 msgid "Could not decode JPEG2000 file %1 (%2)"
 msgstr "无法解码JPEG2000文件%1 (%2)"
 
-#: src/lib/encode_server_finder.cc:193
+#: src/lib/ffmpeg_image_proxy.cc:163
+msgid "Could not decode image (%1)"
+msgstr "无法解码图像媒体(%1)"
+
+#: 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程序进程正在运行。"
 
-#: src/lib/job.cc:124 src/lib/job.cc:139
+#: src/lib/job.cc:161 src/lib/job.cc:176
 msgid "Could not open %1"
 msgstr "无法打开%1"
 
-#: src/lib/curl_uploader.cc:86 src/lib/scp_uploader.cc:101
+#: src/lib/curl_uploader.cc:90 src/lib/scp_uploader.cc:110
 msgid "Could not open %1 to send"
 msgstr "无法打开%1并发送"
 
-#: src/lib/internet.cc:114 src/lib/internet.cc:119
+#: src/lib/internet.cc:164 src/lib/internet.cc:169
 msgid "Could not open downloaded ZIP file"
 msgstr "无法打开下载的zip文件"
 
-#: src/lib/internet.cc:126
-#, fuzzy
+#: src/lib/internet.cc:176
 msgid "Could not open downloaded ZIP file (%1:%2: %3)"
-msgstr "无法打开下载的zip文件"
+msgstr "无法打开下载的zip文件 (%1:%2: %3)"
 
-#: src/lib/dcp_subtitle.cc:55
+#: src/lib/config.cc:992
+msgid "Could not open file for writing"
+msgstr "无法执行写入，目标文件无法打开"
+
+#: src/lib/ffmpeg_file_encoder.cc:269
+#, fuzzy
+msgid "Could not open output file %1 (%2)"
+msgstr "不能写入文件 %1 (%2)"
+
+#: src/lib/dcp_subtitle.cc:59
 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:50
 msgid "Could not start transfer"
 msgstr "无法开始传输"
 
-#: src/lib/curl_uploader.cc:93 src/lib/scp_uploader.cc:118
+#: src/lib/curl_uploader.cc:97 src/lib/scp_uploader.cc:127
 msgid "Could not write to remote file (%1)"
 msgstr "写入远程文件 (%1)失败！"
 
-#: src/lib/util.cc:520
+#: src/lib/util.cc:569
 msgid "D-BOX primary"
 msgstr "一级D-BOX"
 
-#: src/lib/util.cc:521
+#: src/lib/util.cc:570
 msgid "D-BOX secondary"
 msgstr "二级D-BOX"
 
-#: src/lib/util.cc:551
+#: src/lib/util.cc:600
 msgid "DBP"
 msgstr "一级D-BOX通道"
 
-#: src/lib/util.cc:552
+#: src/lib/util.cc:601
 msgid "DBS"
 msgstr "DBS"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:48
 msgid "DCI Flat"
 msgstr "DCI Flat(遮幅/1.77/1.78/1.85) "
 
-#: src/lib/ratio.cc:46
+#: src/lib/ratio.cc:50
 msgid "DCI Scope"
 msgstr "DCI Scope(宽银幕/2.35/2.39) "
 
-#: src/lib/dcp_subtitle_content.cc:100
+#: src/lib/dcp_subtitle_content.cc:103
 msgid "DCP XML subtitles"
 msgstr "DCP XML字幕"
 
-#: src/lib/audio_content.cc:327
+#: src/lib/audio_content.cc:330
 msgid "DCP sample rate"
 msgstr "DCP 采样率"
 
-#: src/lib/frame_rate_change.cc:79
-msgid "DCP will run at %1%% of the content speed.\n"
-msgstr "DCP列队将在速度为 %1%% 下运行.\n"
+#: src/lib/frame_rate_change.cc:103
+#, c-format
+msgid "DCP will run at %.1f%% of the content speed.\n"
+msgstr "DCP列队将在速度为 %.1f%% 下运行.\n"
 
-#: src/lib/frame_rate_change.cc:70
+#: src/lib/frame_rate_change.cc:93
 msgid "DCP will use every other frame of the content.\n"
 msgstr "将使用隔帧打包DCP.\n"
 
-#: src/lib/job.cc:126 src/lib/job.cc:141
+#: src/lib/job.cc:163 src/lib/job.cc:178
 msgid ""
 "DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
 "is in an unexpected format."
-msgstr "无法打开文件%1。文件不存在或格式无法识别。"
+msgstr "无法打开文件%1 (%2)。文件不存在或格式无法识别。"
+
+#: src/lib/film.cc:1551
+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（原创）。请重新检查设置确认设置内容是否"
+"为您的期望值。"
 
-#: src/lib/ffmpeg_content.cc:114
+#: src/lib/film.cc:1519
+#, fuzzy
+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的设置更改为OV（原创）。请重新检查设置确认设置内容是否"
+"为您的期望值。"
+
+#: src/lib/ffmpeg_content.cc:118
 msgid ""
 "DCP-o-matic no longer supports the `%1' filter, so it has been turned off."
 msgstr "不支持的格式`%1'。"
 
-#: src/lib/config.cc:358 src/lib/config.cc:1030
+#: src/lib/config.cc:353 src/lib/config.cc:1103
 msgid "DCP-o-matic notification"
+msgstr "DCP-o-matic提醒"
+
+#: src/lib/datasat_ap2x.cc:28
+msgid "Datasat AP20 or AP25"
 msgstr ""
 
-#: src/lib/filter.cc:71 src/lib/filter.cc:72 src/lib/filter.cc:73
-#: src/lib/filter.cc:74
+#: src/lib/filter.cc:80 src/lib/filter.cc:81 src/lib/filter.cc:82
+#: src/lib/filter.cc:83 src/lib/filter.cc:84
 msgid "De-interlacing"
 msgstr "去除隔行"
 
-#: src/lib/config.cc:1018
+#: src/lib/config.cc:1091
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -629,600 +794,664 @@ msgstr ""
 "\n"
 "DCP-o-matic"
 
-#: src/lib/dolby_cp750.cc:28
-msgid "Dolby CP650 and CP750"
+#: src/lib/dolby_cp750.cc:31
+#, fuzzy
+msgid "Dolby CP650 or CP750"
 msgstr "杜比 CP 650和CP 750"
 
-#: src/lib/internet.cc:72
-#, fuzzy
+#: src/lib/internet.cc:121
 msgid "Download failed (%1 error %2)"
-msgstr "下载失败 (%1/%2 error %3)"
+msgstr "下载失败 (%1 error %2)"
 
-#: src/lib/frame_rate_change.cc:72
+#: src/lib/frame_rate_change.cc:95
 msgid "Each content frame will be doubled in the DCP.\n"
 msgstr "该DCP中将每一帧复制为两帧。\n"
 
-#: src/lib/frame_rate_change.cc:74
+#: src/lib/frame_rate_change.cc:97
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
-msgstr "每个内容帧将在DCP中重复％1次。\n"
+msgstr "每个内容帧将在DCP中重复%1次。\n"
 
-#: src/lib/send_kdm_email_job.cc:64
+#: src/lib/send_kdm_email_job.cc:89
 msgid "Email KDMs"
 msgstr "邮件发送 KDMs"
 
-#: src/lib/send_kdm_email_job.cc:67
-msgid "Email KDMs for %1"
+#: src/lib/send_kdm_email_job.cc:92
+#, fuzzy
+msgid "Email KDMs for %2"
 msgstr "邮件发送KDMs给 %1"
 
-#: src/lib/send_notification_email_job.cc:46
+#: src/lib/send_notification_email_job.cc:55
 msgid "Email notification"
-msgstr ""
+msgstr "Email提醒"
 
-#: src/lib/send_problem_report_job.cc:59
+#: src/lib/send_problem_report_job.cc:68
 msgid "Email problem report"
 msgstr "通过邮件发送BUG"
 
-#: src/lib/send_problem_report_job.cc:62
+#: src/lib/send_problem_report_job.cc:71
 msgid "Email problem report for %1"
 msgstr "通过邮件发送BUG给 %1"
 
-#: src/lib/dcp_encoder.cc:96 src/lib/ffmpeg_encoder.cc:119
+#: src/lib/dcp_encoder.cc:103 src/lib/ffmpeg_encoder.cc:122
 msgid "Encoding"
 msgstr "编码中"
 
-#: src/lib/exceptions.cc:67
+#: src/lib/dcp_content_type.cc:61
+msgid "Episode"
+msgstr ""
+
+#: src/lib/exceptions.cc:85
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr "字幕文件错误: 执行为 %1 实际要求为%2"
 
-#: src/lib/job.cc:459
+#: src/lib/job.cc:503
 msgid "Error: %1"
 msgstr "错误: (%1)"
 
-#: src/lib/examine_content_job.cc:44
-msgid "Examine content"
-msgstr "检查内容"
+#: src/lib/hints.cc:408
+#, fuzzy
+msgid "Examining audio, subtitles and closed captions"
+msgstr "检查隐藏式字幕中"
+
+#: src/lib/examine_content_job.cc:54
+msgid "Examining content"
+msgstr "检查媒体内容中"
+
+#: src/lib/examine_ffmpeg_subtitles_job.cc:54
+msgid "Examining subtitles"
+msgstr "定位字幕中"
 
-#: src/lib/hints.cc:264
+#: src/lib/hints.cc:406
 #, fuzzy
-msgid "Examining closed captions"
-msgstr "Examinar contenido"
+msgid "Examining subtitles and closed captions"
+msgstr "检查隐藏式字幕中"
 
-#: src/lib/ffmpeg_content.cc:601
+#: src/lib/subtitle_encoder.cc:98
+#, fuzzy
+msgid "Extracting"
+msgstr "分级"
+
+#: src/lib/ffmpeg_content.cc:646
 msgid "FCC"
 msgstr "FCC"
 
-#: src/lib/scp_uploader.cc:61
+#: src/lib/scp_uploader.cc:67
 msgid "Failed to authenticate with server (%1)"
 msgstr "无法与服务器进行身份验证 (%1)"
 
-#: src/lib/emailer.cc:222
+#: src/lib/job.cc:130 src/lib/job.cc:140
 #, fuzzy
+msgid "Failed to encode the DCP."
+msgstr "电子邮件发送失败"
+
+#: src/lib/emailer.cc:234
 msgid "Failed to send email"
-msgstr "发送电子邮件失败"
+msgstr "电子邮件发送失败"
 
-#: src/lib/dcp_content_type.cc:46
+#: src/lib/dcp_content_type.cc:51
 msgid "Feature"
 msgstr "正片"
 
-#: src/lib/content.cc:445
+#: src/lib/content.cc:464
 msgid "Filename"
 msgstr "文件名"
 
-#: src/lib/ffmpeg_content.cc:551
+#: src/lib/ffmpeg_content.cc:596
 msgid "Film"
 msgstr "电影"
 
-#: src/lib/ffmpeg_examiner.cc:97
+#: src/lib/ffmpeg_examiner.cc:112
 msgid "Finding length"
 msgstr "定位长度"
 
-#: src/lib/content.cc:452
+#: src/lib/content.cc:471
 msgid "Frame rate"
 msgstr "帧率"
 
-#: src/lib/ffmpeg_content.cc:535
+#: src/lib/util.cc:943
+msgid "Friday"
+msgstr "星期五"
+
+#: src/lib/ffmpeg_content.cc:580
 msgid "Full"
 msgstr "Full(全幅/1.90)"
 
-#: src/lib/ffmpeg_content.cc:515
+#: src/lib/ffmpeg_content.cc:560
 msgid "Full (0-%1)"
 msgstr "全幅 (0-%1)"
 
-#: src/lib/ratio.cc:47
+#: src/lib/ratio.cc:51
 msgid "Full frame"
 msgstr "Full(全幅/1.90)"
 
-#: src/lib/audio_content.cc:334
+#: src/lib/audio_content.cc:337
 msgid "Full length in audio samples at DCP rate"
 msgstr "DCP中音频采样率总时长"
 
-#: src/lib/audio_content.cc:321
+#: src/lib/audio_content.cc:324
 msgid "Full length in audio samples at content rate"
 msgstr "源音频内容采样总时长"
 
-#: src/lib/audio_content.cc:328
+#: src/lib/audio_content.cc:331
 msgid "Full length in video frames at DCP rate"
 msgstr "DCP中视频总时长"
 
-#: src/lib/audio_content.cc:314
+#: src/lib/audio_content.cc:317
 msgid "Full length in video frames at content rate"
 msgstr "源视频时长"
 
-#: src/lib/ffmpeg_content.cc:576
+#: src/lib/ffmpeg_content.cc:621
 msgid "Gamma 22 (BT470M)"
 msgstr "伽玛 2.2 (BT470M)"
 
-#: src/lib/ffmpeg_content.cc:577
+#: src/lib/ffmpeg_content.cc:622
 msgid "Gamma 28 (BT470BG)"
 msgstr "伽玛 2.8 (BT470BG)"
 
-#: src/lib/filter.cc:75
+#: src/lib/filter.cc:85
 msgid "Gradient debander"
 msgstr "梯度"
 
-#: src/lib/util.cc:545
+#: src/lib/util.cc:594
 msgid "HI"
 msgstr "听力障碍"
 
-#: src/lib/util.cc:514
+#: src/lib/util.cc:563
 msgid "Hearing impaired"
 msgstr "听力障碍"
 
-#: src/lib/filter.cc:78
+#: src/lib/filter.cc:88
 msgid "High quality 3D denoiser"
 msgstr "高品质的3D降噪"
 
-#: src/lib/filter.cc:68
-#, fuzzy
+#: src/lib/filter.cc:77
 msgid "Horizontal flip"
-msgstr "Horizontal deblocking filter"
-
-#: src/lib/hints.cc:176
-msgid ""
-"However, setting your DCP frame rate to 24 or 48 will cause a significant "
-"slowdown of your content, and SMPTE DCPs are not supported by all projectors."
-msgstr ""
-"然而，将帧速率设置在24-48fps会在DCP包中声明高帧率，这不是每个放映机都能支持的"
-"格式。"
-
-#: src/lib/hints.cc:173
-msgid ""
-"However, setting your DCP frame rate to 24 or 48 will cause a significant "
-"speed-up of your content, and SMPTE DCPs are not supported by all projectors."
-msgstr ""
-"然而，将帧速率设置在24-48fps会在DCP包中声明高帧率，这不是每个放映机都能支持的"
-"格式。"
+msgstr "水平翻转"
 
-#: src/lib/audio_content.cc:307 src/lib/audio_content.cc:327
+#: src/lib/audio_content.cc:310 src/lib/audio_content.cc:330
 msgid "Hz"
 msgstr "Hz（赫兹）"
 
-#: src/lib/ffmpeg_content.cc:585
+#: src/lib/ffmpeg_content.cc:630
 msgid "IEC61966-2-1 (sRGB or sYCC)"
 msgstr "IEC61966-2-1 (sRGB或sYCC)"
 
-#: src/lib/ffmpeg_content.cc:583
+#: src/lib/ffmpeg_content.cc:628
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
-#: src/lib/job.cc:149 src/lib/job.cc:193 src/lib/job.cc:203
+#: src/lib/hints.cc:188
+msgid "If you do use 25fps you should change your DCP standard to SMPTE."
+msgstr "如果您选择使用25fps，那就必须把DCP标准选线设置为SMPTE"
+
+#: src/lib/hints.cc:251
+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:573
+msgid ""
+"It is advisable to put your first subtitle at least 4 seconds after the "
+"start of the DCP to make sure it is seen."
+msgstr ""
+
+#: src/lib/job.cc:151 src/lib/job.cc:186 src/lib/job.cc:236 src/lib/job.cc:246
 msgid "It is not known what caused this error."
 msgstr "未知错误."
 
-#: src/lib/ffmpeg_content.cc:565
+#: src/lib/ffmpeg_content.cc:610
 msgid "JEDEC P22"
-msgstr ""
+msgstr "JEDEC P22"
 
-#: src/lib/config.cc:348 src/lib/config.cc:1015
+#: src/lib/config.cc:343 src/lib/config.cc:1088
 msgid "KDM delivery: $CPL_NAME"
 msgstr "发行KDM: $CPL_NAME"
 
-#: src/lib/dcp.cc:76
-msgid "KDM was made for DCP-o-matic but not for its leaf certificate."
-msgstr ""
-
-#: src/lib/dcp.cc:74
-msgid "KDM was not made for DCP-o-matic's decryption certificate."
-msgstr ""
-
-#: src/lib/filter.cc:72
+#: src/lib/filter.cc:81
 msgid "Kernel deinterlacer"
 msgstr "隔行扫描"
 
-#: src/lib/util.cc:539
+#: src/lib/ffmpeg_encoder.cc:251 src/lib/util.cc:588
 msgid "L"
 msgstr "左声道"
 
-#: src/lib/util.cc:547
+#: src/lib/util.cc:596
 msgid "Lc"
 msgstr "左中"
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:508
+#: src/lib/mid_side_decoder.cc:107 src/lib/util.cc:557
 msgid "Left"
 msgstr "左声道"
 
-#: src/lib/util.cc:516
+#: src/lib/util.cc:565
 msgid "Left centre"
 msgstr "左中"
 
-#: src/lib/util.cc:518
+#: src/lib/util.cc:567
 msgid "Left rear surround"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:512
+#: src/lib/util.cc:561
 msgid "Left surround"
 msgstr "左环绕"
 
-#: src/lib/video_content.cc:461
+#: src/lib/video_content.cc:499
 msgid "Length"
 msgstr "长度"
 
-#: src/lib/util.cc:542
+#: src/lib/util.cc:591
 msgid "Lfe"
 msgstr "次低"
 
-#: src/lib/util.cc:511
+#: src/lib/util.cc:560
 msgid "Lfe (sub)"
 msgstr "次低（重低音）"
 
-#: src/lib/ffmpeg_content.cc:530
+#: src/lib/ffmpeg_content.cc:575
 msgid "Limited"
 msgstr "限制"
 
-#: src/lib/ffmpeg_content.cc:508
+#: src/lib/ffmpeg_content.cc:553
 msgid "Limited (%1-%2)"
 msgstr "限制 (%1-%2)"
 
-#: src/lib/ffmpeg_content.cc:580
+#: src/lib/ffmpeg_content.cc:625
 msgid "Linear"
 msgstr "线性"
 
-#: src/lib/ffmpeg_content.cc:581
+#: src/lib/ffmpeg_content.cc:626
 msgid "Logarithmic (100:1 range)"
 msgstr "对数 (范围 100:1)"
 
-#: src/lib/ffmpeg_content.cc:582
+#: src/lib/ffmpeg_content.cc:627
 msgid "Logarithmic (316:1 range)"
 msgstr "对数 (范围 316:1)"
 
-#: src/lib/util.cc:543
+#: src/lib/exceptions.cc:145
+msgid "Lost communication between main and writer processes"
+msgstr ""
+
+#: src/lib/util.cc:592
 msgid "Ls"
 msgstr "左环绕"
 
-#: src/lib/mid_side_decoder.cc:35
+#: src/lib/mid_side_decoder.cc:39
 msgid "Mid-side decoder"
 msgstr "中置解码"
 
-#: src/lib/filter.cc:75 src/lib/filter.cc:76 src/lib/filter.cc:79
+#: src/lib/filter.cc:85 src/lib/filter.cc:86 src/lib/filter.cc:89
 msgid "Misc"
 msgstr "其他"
 
-#: src/lib/dcp_examiner.cc:154
+#: src/lib/dcp_examiner.cc:164
 msgid "Mismatched audio channel counts in DCP"
 msgstr "DCP中的音频通道数不匹配"
 
-#: src/lib/dcp_examiner.cc:160
+#: src/lib/dcp_examiner.cc:170
 msgid "Mismatched audio sample rates in DCP"
 msgstr "DCP中的音频采样率不符合"
 
-#: src/lib/dcp_examiner.cc:127
+#: src/lib/dcp_examiner.cc:137
 msgid "Mismatched frame rates in DCP"
 msgstr "DCP中的帧率不匹配"
 
-#: src/lib/dcp_examiner.cc:135
+#: src/lib/dcp_examiner.cc:145
 msgid "Mismatched video sizes in DCP"
 msgstr "DCP中的视频分辨率不匹配"
 
-#: src/lib/exceptions.cc:55
-#, fuzzy
+#: src/lib/exceptions.cc:71
 msgid "Missing required setting %1"
-msgstr "缺少必需的设置%1"
+msgstr "缺少必需的设置 %1"
+
+#: src/lib/util.cc:935
+msgid "Monday"
+msgstr "星期一"
 
-#: src/lib/writer.cc:625
+#: src/lib/writer.cc:763
 msgid "Mono"
 msgstr "单声道"
 
-#: src/lib/filter.cc:71
+#: src/lib/filter.cc:80
 msgid "Motion compensating deinterlacer"
 msgstr "动态隔行补偿"
 
-#: src/lib/dcp_decoder.cc:76
+#: src/lib/dcp_decoder.cc:104
 msgid "No CPLs found in DCP."
-msgstr ""
+msgstr "DCP中没有找到CPL文件"
 
-#: src/lib/cinema_kdms.cc:202 src/lib/send_notification_email_job.cc:61
+#: src/lib/kdm_with_metadata.cc:208 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:121
 msgid "No valid image files were found in the folder."
 msgstr "未发现有效的图片序列文件。"
 
-#: src/lib/filter.cc:77 src/lib/filter.cc:78 src/lib/filter.cc:80
+#: src/lib/filter.cc:87 src/lib/filter.cc:88 src/lib/filter.cc:90
 msgid "Noise reduction"
 msgstr "降噪"
 
-#: src/lib/writer.cc:623
+#: src/lib/writer.cc:731 src/lib/writer.cc:738 src/lib/writer.cc:761
 msgid "None"
 msgstr "无"
 
-#: src/lib/job.cc:457
+#: src/lib/job.cc:501
 msgid "OK (ran for %1)"
 msgstr "确认 (运行 %1)"
 
-#: src/lib/content.cc:126
+#: src/lib/content.cc:123
 msgid "Only the first piece of content to be joined can have a start trim."
 msgstr "只有第一段才可以进行开始裁剪。"
 
-#: src/lib/content.cc:130
+#: src/lib/content.cc:127
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "只有最后一段才可以进行结束裁剪。"
 
-#: src/lib/types.cc:132
-#, fuzzy
+#: src/lib/types.cc:141
 msgid "Open subtitles"
-msgstr "文本字幕"
+msgstr "开放式字幕"
 
-#: src/lib/filter.cc:67 src/lib/filter.cc:68 src/lib/filter.cc:69
-#: src/lib/filter.cc:70
+#: src/lib/filter.cc:76 src/lib/filter.cc:77 src/lib/filter.cc:78
+#: src/lib/filter.cc:79
 msgid "Orientation"
-msgstr ""
+msgstr "方向"
 
-#: src/lib/job.cc:173
+#: src/lib/job.cc:210
 msgid "Out of memory"
 msgstr "内存不足"
 
-#: src/lib/filter.cc:80
+#: src/lib/filter.cc:90
 msgid "Overcomplete wavelet denoiser"
 msgstr "小波降噪"
 
-#: src/lib/colour_conversion.cc:284
+#: src/lib/colour_conversion.cc:287
 msgid "P3"
 msgstr "P3"
 
-#: src/lib/util.h:56
+#: src/lib/util.h:59
 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:58
 msgid "Policy"
 msgstr "政策相关"
 
-#: src/lib/content.cc:461
+#: src/lib/content.cc:480
 msgid "Prepared for video frame rate"
 msgstr "准备视频帧率"
 
-#: src/lib/exceptions.cc:85
+#: src/lib/exceptions.cc:106
 msgid "Programming error at %1:%2 %3"
 msgstr "程序内部错误 %1:%2 %3"
 
-#: src/lib/dcp_content_type.cc:54
+#: src/lib/dcp_content_type.cc:62
+msgid "Promo"
+msgstr ""
+
+#: src/lib/dcp_content_type.cc:59
 msgid "Public Service Announcement"
 msgstr "公共服务或公告"
 
-#: src/lib/util.cc:540
+#: src/lib/ffmpeg_encoder.cc:256 src/lib/util.cc:589
 msgid "R"
 msgstr "右声道"
 
-#: src/lib/ffmpeg_content.cc:597
+#: src/lib/ffmpeg_content.cc:642
 msgid "RGB / sRGB (IEC61966-2-1)"
 msgstr "RGB / sRGB (IEC61966-2-1)"
 
-#: src/lib/dcp_content_type.cc:51
+#: src/lib/dcp_content_type.cc:56
 msgid "Rating"
 msgstr "分级"
 
-#: src/lib/util.cc:548
+#: src/lib/util.cc:597
 msgid "Rc"
 msgstr "右中"
 
-#: src/lib/colour_conversion.cc:285
+#: src/lib/colour_conversion.cc:288
 msgid "Rec. 1886"
 msgstr "Rec. 1886"
 
-#: src/lib/colour_conversion.cc:286
+#: src/lib/colour_conversion.cc:289
 msgid "Rec. 2020"
 msgstr "Rec. 2020"
 
-#: src/lib/colour_conversion.cc:282
+#: src/lib/colour_conversion.cc:285
 msgid "Rec. 601"
 msgstr "Rec. 601"
 
-#: src/lib/colour_conversion.cc:283
+#: src/lib/colour_conversion.cc:286
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:509
+#: src/lib/mid_side_decoder.cc:108 src/lib/util.cc:558
 msgid "Right"
 msgstr "右声道"
 
-#: src/lib/util.cc:517
+#: src/lib/util.cc:566
 msgid "Right centre"
 msgstr "右中"
 
-#: src/lib/util.cc:519
+#: src/lib/util.cc:568
 msgid "Right rear surround"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:513
+#: src/lib/util.cc:562
 msgid "Right surround"
 msgstr "右环绕"
 
-#: src/lib/filter.cc:70
+#: src/lib/filter.cc:79
 msgid "Rotate 90 degrees anti-clockwise"
-msgstr ""
+msgstr "逆时针旋转90°"
 
-#: src/lib/filter.cc:69
+#: src/lib/filter.cc:78
 msgid "Rotate 90 degrees clockwise"
-msgstr ""
+msgstr "顺时针旋转90°"
 
-#: src/lib/util.cc:544
+#: src/lib/util.cc:593
 msgid "Rs"
 msgstr "右环绕"
 
-#: src/lib/colour_conversion.cc:287
+#: src/lib/colour_conversion.cc:290
 msgid "S-Gamut3/S-Log3"
 msgstr "索尼S-Gamut3/S-Log3"
 
-#: src/lib/ffmpeg_content.cc:549 src/lib/ffmpeg_content.cc:578
+#: 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:603
+#: src/lib/ffmpeg_content.cc:648
 msgid "SMPTE 170M (BT601-6)"
 msgstr "SMPTE 170M (BT601-6)"
 
-#: src/lib/ffmpeg_content.cc:608
+#: 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:550 src/lib/ffmpeg_content.cc:579
-#: src/lib/ffmpeg_content.cc:604
+#: 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/ffmpeg_content.cc:588
+#: src/lib/hints.cc:615
+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: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:589
+#: src/lib/ffmpeg_content.cc:634
 msgid "SMPTE ST 428-1"
 msgstr "SMPTE ST 428-1"
 
-#: src/lib/ffmpeg_content.cc:553
+#: 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:554
+#: src/lib/ffmpeg_content.cc:599
 msgid "SMPTE ST 431-2 (2011)"
 msgstr "SMPTE ST 431-2 (2011)"
 
-#: src/lib/ffmpeg_content.cc:555
+#: src/lib/ffmpeg_content.cc:600
 msgid "SMPTE ST 432-1 D65 (2010)"
 msgstr "SMPTE ST 432-1 D65 (2010)"
 
-#: src/lib/scp_uploader.cc:56
-msgid "SSH error (%1)"
+#: src/lib/scp_uploader.cc:45
+#, fuzzy
+msgid "SSH error [%1]"
+msgstr "SSH错误 (%1)"
+
+#: src/lib/scp_uploader.cc:61 src/lib/scp_uploader.cc:72
+#: src/lib/scp_uploader.cc:77
+#, fuzzy
+msgid "SSH error [%1] (%2)"
 msgstr "SSH错误 (%1)"
 
-#: src/lib/image_content.cc:108
+#: src/lib/util.cc:945
+msgid "Saturday"
+msgstr "星期六"
+
+#: src/lib/image_content.cc:107
 msgid "Scanning image files"
 msgstr "正在扫描图像"
 
-#: src/lib/send_problem_report_job.cc:74
+#: 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:52
 msgid "Short"
 msgstr "短片"
 
-#: src/lib/video_content.cc:462
+#: src/lib/util.cc:602
+msgid "Sign"
+msgstr ""
+
+#: src/lib/video_content.cc:500
 msgid "Size"
 msgstr "大小"
 
-#: src/lib/audio_content.cc:253
+#: src/lib/audio_content.cc:266
 msgid "Some audio will be resampled to %1Hz"
 msgstr "部分音频将被重新采样到%1Hz"
 
-#: src/lib/check_content_change_job.cc:86
+#: src/lib/check_content_change_job.cc:89
 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/hints.cc:296
+#: src/lib/check_content_change_job.cc:100
 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.  Open the "
+"project in DCP-o-matic, check the settings, then save it before trying again."
 msgstr ""
 
-#: src/lib/hints.cc:302
+#: src/lib/hints.cc:554
 msgid ""
 "Some of your closed captions span more than %1 lines, so they will be "
 "truncated."
 msgstr ""
 
-#: src/lib/film.cc:326
-#, fuzzy
+#: src/lib/hints.cc:653
+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 ""
+
+#: src/lib/film.cc:392
 msgid "Some of your content needs a KDM"
-msgstr "内容需要KDM密匙"
+msgstr "一些内容需要KDM密匙"
 
-#: src/lib/film.cc:329
-#, fuzzy
+#: src/lib/film.cc:395
 msgid "Some of your content needs an OV"
-msgstr "内容需要声明原创OV"
+msgstr "一些内容需要OV（声明原创）"
 
-#: src/lib/writer.cc:627
+#: src/lib/writer.cc:765
 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"
 
-#: 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/dcp_content_type.cc:52
+#: src/lib/util.cc:933
+msgid "Sunday"
+msgstr "星期日/天"
+
+#: src/lib/dcp_content_type.cc:57
 msgid "Teaser"
 msgstr "传情片"
 
-#: src/lib/filter.cc:79
+#: src/lib/filter.cc:89
 msgid "Telecine filter"
 msgstr "胶转磁滤镜"
 
-#: src/lib/dcp_content_type.cc:49
+#: src/lib/dcp_content_type.cc:54
 msgid "Test"
 msgstr "测试片"
 
-#: src/lib/string_text_file_content.cc:75
+#: src/lib/string_text_file_content.cc:85
 msgid "Text subtitles"
 msgstr "文本字幕"
 
-#: src/lib/exceptions.cc:73
+#: src/lib/film.cc:375
+msgid "The DCP is empty, perhaps because all the content has zero length."
+msgstr ""
+
+#: src/lib/exceptions.cc:92
 msgid "The certificate chain for signing is invalid"
 msgstr "证书签名无效"
 
-#: src/lib/exceptions.cc:79
+#: src/lib/exceptions.cc:99
 msgid "The certificate chain for signing is invalid (%1)"
 msgstr "证书签名无效(%1)"
 
-#: src/lib/job.cc:111
+#: src/lib/video_decoder.cc:86
+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 ""
+
+#: src/lib/job.cc:112
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
 msgstr "磁盘空间不足，清理磁盘空间以继续."
 
-#: src/lib/content_factory.cc:115
+#: src/lib/playlist.cc:228
 msgid "The file %1 has been moved %2 milliseconds earlier."
-msgstr "文件 1% 被向前移动了 2% 毫秒."
+msgstr "文件 %1 被向前移动了 %2 毫秒."
 
-#: src/lib/content_factory.cc:110
+#: src/lib/playlist.cc:223
 msgid "The file %1 has been moved %2 milliseconds later."
-msgstr "文件 1% 被向后移动了 2% 毫秒."
+msgstr "文件 %1 被向后移动了 %2 毫秒."
 
-#: src/lib/content_factory.cc:135
+#: src/lib/playlist.cc:248
 msgid "The file %1 has been trimmed by %2 milliseconds less."
-msgstr "文件 1% 被缩短了 2% 毫秒."
+msgstr "文件 %1 被缩短了 %2 毫秒."
 
-#: src/lib/content_factory.cc:130
+#: src/lib/playlist.cc:243
 msgid "The file %1 has been trimmed by %2 milliseconds more."
-msgstr "文件 1% 被延长了 2% 毫秒."
+msgstr "文件 %1 被延长了 %2 毫秒."
 
-#: src/lib/hints.cc:205
+#: src/lib/hints.cc:241
 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 "
@@ -1231,18 +1460,43 @@ msgid ""
 "systems support your chosen DCP rate."
 msgstr ""
 
-#: src/lib/dcp_content.cc:558
+#: src/lib/dcp_content.cc:657
 msgid "There is no video in this DCP"
-msgstr ""
+msgstr "DCP中不包含画面"
 
-#: src/lib/job.cc:173
+#: src/lib/job.cc:210
 msgid ""
 "There was not enough memory to do this.  If you are running a 32-bit "
 "operating system try reducing the number of encoding threads in the General "
 "tab of Preferences."
 msgstr "内存不足，如您是32位系统，请重新设置运行线程数量来达到稳定运行。"
 
-#: src/lib/exceptions.cc:91
+#: src/lib/util.cc:1146
+#, fuzzy
+msgid "This KDM was made for DCP-o-matic but not for its leaf certificate."
+msgstr "KDM是为DCP-o-matic生成，但是与上级证书不匹配。"
+
+#: src/lib/util.cc:1144
+#, fuzzy
+msgid "This KDM was not made for DCP-o-matic's decryption certificate."
+msgstr "KDM不是为DCP-o-matic解密证书而生成"
+
+#: src/lib/job.cc:131
+msgid ""
+"This error has probably occurred because you are running the 32-bit version "
+"of DCP-o-matic and trying to use too many encoding threads.  Please reduce "
+"the 'number of threads DCP-o-matic should use' in the General tab of "
+"Preferences and try again."
+msgstr ""
+
+#: src/lib/job.cc:141
+msgid ""
+"This error has probably occurred because you are running the 32-bit version "
+"of DCP-o-matic.  Please re-install DCP-o-matic with the 64-bit installer and "
+"try again."
+msgstr ""
+
+#: src/lib/exceptions.cc:113
 msgid ""
 "This file is a KDM.  KDMs should be added to DCP content by right-clicking "
 "the content and choosing \"Add KDM\"."
@@ -1250,138 +1504,169 @@ msgstr ""
 "这是一个KDM密匙文件。KDM密匙文件可以通过在你的DCP包上右键，点击添加KDM文件添"
 "加到DCP中。"
 
-#: src/lib/film.cc:445
+#: src/lib/film.cc:567
 msgid ""
 "This film was created with a newer version of DCP-o-matic, and it cannot be "
 "loaded into this version.  Sorry!"
 msgstr "不支持新版本创建的工程文件!"
 
-#: src/lib/film.cc:434
+#: src/lib/film.cc:552
 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 "不支持老版本创建的工程文件!"
 
-#: src/lib/types.cc:130
+#: src/lib/util.cc:941
+msgid "Thursday"
+msgstr "星期四"
+
+#: src/lib/types.cc:139
 msgid "Timed text"
-msgstr ""
+msgstr "时控文本"
 
-#: src/lib/dcp_content_type.cc:48
+#: src/lib/dcp_content_type.cc:53
 msgid "Trailer"
 msgstr "预告片"
 
-#: src/lib/transcode_job.cc:58
-msgid "Transcode %1"
-msgstr "转码 %1"
+#: src/lib/transcode_job.cc:71
+msgid "Transcoding %1"
+msgstr "转码中 %1"
 
-#: src/lib/dcp_content_type.cc:50
+#: src/lib/dcp_content_type.cc:55
 msgid "Transitional"
 msgstr "过渡片"
 
-#: src/lib/internet.cc:135
+#: src/lib/util.cc:937
+msgid "Tuesday"
+msgstr "星期二"
+
+#: src/lib/usl.cc:28
+msgid "USL"
+msgstr ""
+
+#: src/lib/internet.cc:185
 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/job.cc:202
+#: src/lib/cross_common.cc:91 src/lib/dcp_text_track.cc:53
+#, fuzzy
+msgid "Unknown"
+msgstr "未知"
+
+#: src/lib/job.cc:245
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/lib/ffmpeg_decoder.cc:325
+#: src/lib/ffmpeg_decoder.cc:343
 msgid "Unrecognised audio sample format (%1)"
 msgstr "无法识别的音频采样格式 (%1)"
 
-#: src/lib/filter.cc:76
+#: src/lib/filter.cc:86
 msgid "Unsharp mask and Gaussian blur"
 msgstr "USM锐化和高斯模糊"
 
-#: src/lib/ffmpeg_content.cc:501 src/lib/ffmpeg_content.cc:525
-#: src/lib/ffmpeg_content.cc:543 src/lib/ffmpeg_content.cc:545
-#: src/lib/ffmpeg_content.cc:546 src/lib/ffmpeg_content.cc:572
-#: src/lib/ffmpeg_content.cc:574 src/lib/ffmpeg_content.cc:575
-#: src/lib/ffmpeg_content.cc:599 src/lib/ffmpeg_content.cc:600
+#: 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 "未指定"
 
-#: src/lib/colour_conversion.cc:240
+#: src/lib/colour_conversion.cc:243
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/lib/util.cc:522 src/lib/util.cc:523
+#: src/lib/util.cc:571 src/lib/util.cc:572
 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 "左混"
 
-#: 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 "右混"
 
-#: src/lib/util.cc:546
+#: src/lib/util.cc:595
 msgid "VI"
 msgstr "视力障碍"
 
-#: src/lib/verify_dcp_job.cc:41
+#: src/lib/verify_dcp_job.cc:55
 msgid "Verify DCP"
-msgstr ""
+msgstr "验证DCP中"
 
-#: src/lib/filter.cc:67
+#: src/lib/filter.cc:76
 msgid "Vertical flip"
-msgstr ""
+msgstr "垂直翻转"
 
-#: src/lib/util.cc:515
+#: src/lib/util.cc:564
 msgid "Visually impaired"
 msgstr "视力障碍"
 
-#: src/lib/upload_job.cc:45
+#: src/lib/upload_job.cc:51
 msgid "Waiting"
 msgstr "请稍候"
 
-#: src/lib/filter.cc:74
+#: src/lib/filter.cc:84
 #, fuzzy
 msgid "Weave filter"
 msgstr "胶转磁滤镜"
 
-#: src/lib/ffmpeg_content.cc:605
+#: src/lib/util.cc:939
+msgid "Wednesday"
+msgstr "星期三"
+
+#: src/lib/ffmpeg_content.cc:650
 msgid "YCOCG"
 msgstr "YCOCG"
 
-#: src/lib/filter.cc:73
+#: src/lib/filter.cc:82
 msgid "Yet Another Deinterlacing Filter"
 msgstr "反隔行扫描滤镜"
 
-#: src/lib/hints.cc:178
+#: src/lib/hints.cc:201
+#, fuzzy
+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。"
+
+#: src/lib/hints.cc:185
+#, fuzzy
 msgid ""
-"You are set up for an Interop DCP at a frame rate which is not officially "
-"supported.  You are advised either to change the frame rate of your DCP or "
-"to make a SMPTE DCP instead (although SMPTE DCPs are not supported by all "
-"projectors)."
+"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 ""
-"你所设定的视频帧率不是SMPTE标准支持的，我们建议您制作SMPTE标准的DCP。（虽然"
-"SMPTE标准的DCP也不是每个放映机都能放映）"
+"你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准（SMPTE）"
+"的DCP。"
 
-#: src/lib/hints.cc:165
+#: src/lib/hints.cc:195
+#, fuzzy
 msgid ""
-"You are set up for an Interop DCP at a frame rate which is not officially "
-"supported.  You are advised either to change the frame rate of your DCP or "
-"to make a SMPTE DCP instead."
+"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。"
 
-#: src/lib/hints.cc:227
+#: src/lib/hints.cc:306
 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:130
+#: src/lib/hints.cc:122
 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 "
@@ -1390,7 +1675,7 @@ msgstr ""
 "你用的是dcp-o-matic双声道转5.1立体声的混频器。这是实验性的功能，可能导致音频"
 "质量差。如果你继续，你应该检查完成的DCP声音."
 
-#: src/lib/hints.cc:216
+#: src/lib/hints.cc:290
 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."
@@ -1398,217 +1683,237 @@ msgstr ""
 "您已经添加了 %1 个VOB文件，如果他们来自一张DVD，请确保您已经导入了所有文件，"
 "否则可能无法正常播放。"
 
-#: src/lib/hints.cc:308
-msgid "You have overlapping closed captions, which are not allowed."
+#: src/lib/film.cc:1515
+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:561
+msgid ""
+"You have overlapping closed captions, which are not allowed in Interop "
+"DCPs.  Change your DCP standard to SMPTE."
 msgstr ""
 
-#: src/lib/hints.cc:121
+#: src/lib/hints.cc:274
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
 msgstr "您添加的字体文件超过了640KB，部分服务器不支持超过640KB大小的字体。"
 
-#: src/lib/film.cc:309
+#: src/lib/film.cc:371
 #, fuzzy
 msgid "You must add some content to the DCP before creating it"
 msgstr "您必须在创建DCP之前添加一些内容"
 
-#: src/lib/hints.cc:125
+#: src/lib/hints.cc:112
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
-"projectors."
-msgstr "您的DCP声道数小于6个，在部分电影服务器上可能不能正常播放。"
+"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 ""
 
-#: src/lib/hints.cc:157
+#: src/lib/hints.cc:160
+#, fuzzy
 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) 比例"
 
-#: src/lib/hints.cc:252
+#: src/lib/hints.cc:340
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
 msgstr "您的音频增益过大 (在%1)，请降低音频增益。"
 
-#: src/lib/config.cc:307
+#: src/lib/config.cc:288
 msgid ""
 "Your default container is not valid and has been changed to Flat (1.85:1)"
 msgstr "默认设置的容器不可用，已被替换为Flat (1.85:1)"
 
-#: src/lib/content_factory.cc:106
+#: src/lib/playlist.cc:219
 msgid ""
 "Your project contains video content that was not aligned to a frame boundary."
 msgstr "您的项目包含不与帧边界对齐的视频内容."
 
-#: src/lib/content_factory.cc:126
+#: 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:71
 msgid "[moving images]"
 msgstr "[动态图像]"
 
-#: src/lib/image_content.cc:70
+#: src/lib/image_content.cc:69
 msgid "[still]"
 msgstr "[静态图像]"
 
-#: src/lib/dcp_subtitle_content.cc:94 src/lib/string_text_file_content.cc:69
+#: src/lib/dcp_subtitle_content.cc:97 src/lib/string_text_file_content.cc:78
 msgid "[subtitles]"
 msgstr "[字幕]"
 
-#. / TRANSLATORS: _reel%1.%2 here is to be added to an export filename to indicate
-#. / which reel it is.  Preserve the %1 and %2; %1 will be replaced with the reel number
-#. / and %2 with the file extension.
-#: src/lib/ffmpeg_encoder.cc:66
-msgid "_reel%1%2"
-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:139
+msgid "_reel%1"
+msgstr "_卷号%1"
 
-#: src/lib/dcpomatic_socket.cc:69
+#: src/lib/dcpomatic_socket.cc:73
 msgid "connect timed out"
 msgstr "连接超时"
 
-#: src/lib/uploader.cc:35
+#: src/lib/uploader.cc:38
 msgid "connecting"
 msgstr "连接"
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:367
 msgid "container"
 msgstr "打包类型"
 
-#: src/lib/film.cc:313
+#: src/lib/film.cc:379
 msgid "content type"
 msgstr "打包类型"
 
-#: src/lib/uploader.cc:73
+#: src/lib/uploader.cc:79
 msgid "copying %1"
 msgstr "复制中... %1"
 
-#: src/lib/ffmpeg.cc:141 src/lib/ffmpeg_image_proxy.cc:139
+#: src/lib/ffmpeg.cc:137
 msgid "could not find stream information"
 msgstr "找不到流信息"
 
-#: src/lib/reel_writer.cc:329
+#: src/lib/reel_writer.cc:435
+#, fuzzy
+msgid "could not move atmos asset into the DCP (%1)"
+msgstr "无法移动的音频文件 (%1)"
+
+#: src/lib/reel_writer.cc:418
 msgid "could not move audio asset into the DCP (%1)"
 msgstr "无法移动的音频文件 (%1)"
 
-#: src/lib/exceptions.cc:33
-msgid "could not open file %1 for reading (%2)"
-msgstr "读取 %1文件失败"
+#: src/lib/exceptions.cc:38
+#, fuzzy
+msgid "could not open file %1 for read (%2)"
+msgstr "读取 %1文件失败(%2)"
+
+#: src/lib/exceptions.cc:37
+#, fuzzy
+msgid "could not open file %1 for read/write (%2)"
+msgstr "读取 %1文件失败(%2)"
 
-#: src/lib/exceptions.cc:33
-msgid "could not open file %1 for writing (%2)"
-msgstr "写入 %1文件失败"
+#: src/lib/exceptions.cc:38
+#, fuzzy
+msgid "could not open file %1 for write (%2)"
+msgstr "写入 %1文件失败(%2)"
 
-#: src/lib/exceptions.cc:43
+#: src/lib/exceptions.cc:57
 msgid "could not read from file %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:49
+#: src/lib/exceptions.cc:64
 msgid "could not write to file %1 (%2)"
-msgstr "不能写入文件 (%1)"
+msgstr "不能写入文件 %1 (%2)"
 
-#: src/lib/dcpomatic_socket.cc:65
+#: src/lib/dcpomatic_socket.cc:69
 msgid "error during async_connect (%1)"
 msgstr "异步连接错误 (%1)"
 
-#: src/lib/dcpomatic_socket.cc:118
+#: src/lib/dcpomatic_socket.cc:126
 msgid "error during async_read (%1)"
 msgstr "异步读取错误 (%1)"
 
-#: src/lib/dcpomatic_socket.cc:90
+#: src/lib/dcpomatic_socket.cc:94
 msgid "error during async_write (%1)"
 msgstr "异步写入错误 (%1)"
 
-#: src/lib/content.cc:454 src/lib/content.cc:463
+#: src/lib/content.cc:473 src/lib/content.cc:482
 msgid "frames per second"
 msgstr "每秒帧数"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:177
+#: src/lib/util.cc:200
 msgid "h"
-msgstr "时"
+msgstr "小时"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:649
+#: src/lib/dcp_content.cc:750
 #, 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:644
+#: src/lib/dcp_content.cc:739
 #, 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:612
+#: src/lib/dcp_content.cc:706
 #, 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:511
+#: src/lib/dcp_content.cc:610
 #, 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:573
+#: src/lib/dcp_content.cc:765
+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:667
 #, 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:570
+#: src/lib/dcp_content.cc:664
 #, 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:499
+#: src/lib/dcp_content.cc:598
 #, 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:503
+#: src/lib/dcp_content.cc:602
 #, 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:618
+#: src/lib/dcp_content.cc:712
 #, 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:655
+#: src/lib/dcp_content.cc:770
 #, 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:583
+#: src/lib/dcp_content.cc:677
 #, 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:534
+#: src/lib/dcp_content.cc:633
 #, fuzzy
 msgid ""
 "its reel lengths differ from those in the film; set the reel mode to 'split "
@@ -1616,71 +1921,132 @@ msgid ""
 msgstr "影片时长与DCP中的分卷时长不一致，请设置 【 分卷模式 】 来分割该内容。"
 
 #. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
-#: src/lib/dcp_content.cc:578
+#: src/lib/dcp_content.cc:672
 #, fuzzy
 msgid "its video frame size differs from the film's."
 msgstr "视频帧大小与DCP不一致。"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:186
+#: src/lib/util.cc:209
 msgid "m"
 msgstr "分"
 
-#: src/lib/image_content.cc:87
+#: src/lib/image_content.cc:86
 msgid "moving"
 msgstr "移动"
 
-#: src/lib/film.cc:301
+#: src/lib/film.cc:363
 msgid "name"
 msgstr "名字"
 
+#. / TRANSLATORS: this string will follow "Cannot reference this DCP: "
+#: src/lib/dcp_content.cc:756
+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:743
+msgid ""
+"one if 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:196
+#: src/lib/util.cc:219
 msgid "s"
 msgstr "秒"
 
-#: src/lib/colour_conversion.cc:281
+#: src/lib/colour_conversion.cc:284
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/film.cc:322
+#: src/lib/film.cc:388
 msgid "some of your content is missing"
 msgstr "内容不完整"
 
-#: src/lib/image_content.cc:85
+#: src/lib/image_content.cc:84
 msgid "still"
 msgstr "静止图像"
 
-#: src/lib/ffmpeg_examiner.cc:256
+#: src/lib/ffmpeg_examiner.cc:338
 msgid "unknown"
 msgstr "未知"
 
-#: src/lib/video_content.cc:461
+#: src/lib/video_content.cc:499
 msgid "video frames"
 msgstr "视频帧"
 
 #, fuzzy
-#~ msgid "Could not decode image file %1 (%2)"
-#~ msgstr "无法解码图像文件(%1)"
+#~ 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."
+#~ msgstr "您的DCP声道数小于6个，在部分电影服务器上可能不能正常播放。"
+
+#~ msgid ""
+#~ "However, setting your DCP frame rate to 24 or 48 will cause a significant "
+#~ "slowdown of your content, and SMPTE DCPs are not supported by all "
+#~ "projectors."
+#~ msgstr ""
+#~ "然而，将帧速率设置在24-48fps会在DCP包中声明高帧率，这不是每个放映机都能支"
+#~ "持的格式。"
 
-#~ msgid "Could not decode image file (%1)"
+#~ msgid ""
+#~ "However, setting your DCP frame rate to 24 or 48 will cause a significant "
+#~ "speed-up of your content, and SMPTE DCPs are not supported by all "
+#~ "projectors."
+#~ msgstr ""
+#~ "然而，将帧速率设置在24-48fps会在DCP包中声明高帧率，这不是每个放映机都能支"
+#~ "持的格式。"
+
+#~ msgid ""
+#~ "You are set up for an Interop DCP at a frame rate which is not officially "
+#~ "supported.  You are advised either to change the frame rate of your DCP "
+#~ "or to make a SMPTE DCP instead (although SMPTE DCPs are not supported by "
+#~ "all projectors)."
+#~ msgstr ""
+#~ "你所设定的视频帧率不是SMPTE标准支持的，我们建议您制作SMPTE标准的DCP。（虽"
+#~ "然SMPTE标准的DCP也不是每个放映机都能放映）"
+
+#~ msgid ""
+#~ "You are set up for an Interop DCP at a frame rate which is not officially "
+#~ "supported.  You are advised either to change the frame rate of your DCP "
+#~ "or to make a SMPTE DCP instead."
+#~ msgstr ""
+#~ "你所设定的视频帧率不是DCI标准（SMPTE）支持的，我们建议您制作DCI标准"
+#~ "（SMPTE）的DCP。"
+
+#, fuzzy
+#~ msgid "Could not write whole file"
+#~ msgstr "写入远程文件 (%1)失败！"
+
+#, fuzzy
+#~ msgid "Could not decode image file %1 (%2)"
 #~ msgstr "无法解码图像文件(%1)"
 
 #, fuzzy
 #~ msgid "it overlaps other subtitle content; remove the other content."
 #~ msgstr "字幕文件重复，请删除重复项."
 
-#~ msgid ""
-#~ "The DCP %1 was being referred to by this film.  This not now possible "
-#~ "because the reel sizes in the film no longer agree with those in the "
-#~ "imported DCP.\n"
-#~ "\n"
-#~ "Setting the 'Reel type' to 'split by video content' will probably help.\n"
-#~ "\n"
-#~ "After doing that you would need to re-tick the appropriate 'refer to "
-#~ "existing DCP' checkboxes."
-#~ msgstr "DCP中的电影内容太大，请使用 【 分卷模式 】后再试一次。"
-
 #~ msgid "Could not find pixel format for video."
 #~ msgstr "找不到视频格式"
 
@@ -1703,9 +2069,6 @@ msgstr "视频帧"
 #~ msgid "Finding length and subtitles"
 #~ msgstr "定位长度和字幕"
 
-#~ msgid "Finding subtitles"
-#~ msgstr "定位字幕"
-
 #~ msgid "Encoding picture and sound"
 #~ msgstr "编码图像序列和音频中……"
 
@@ -1761,9 +2124,6 @@ msgstr "视频帧"
 #~ msgid "Video size"
 #~ msgstr "视频大小"
 
-#~ msgid "could not read from file"
-#~ msgstr "无法从文件中读取 %1 (%2)"
-
 #~ msgid "KDM delivery"
 #~ msgstr "Envío de KDM"
 
@@ -1776,9 +2136,6 @@ msgstr "视频帧"
 #~ msgid "could not run sample-rate converter"
 #~ msgstr "no se pudo ejecutar el conversor de velocidad"
 
-#~ msgid "could not run sample-rate converter for %1 samples (%2) (%3)"
-#~ msgstr "no se pudo ejecutar el conversor de velocidad"
-
 #~ msgid "1.375"
 #~ msgstr "1.375"