X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpo%2Fzh_CN.po;h=c17bcd380c2b2e08e1ddacbb25169cdd8c58854e;hb=f484570d7fe219ec68aa48c9830d7bd2c76e9144;hp=83141b4b6d9f422aef8adebce8b5b5a3473c75d0;hpb=65bfd0eb79f4b80d836808dc6e6879e8e9b2f941;p=dcpomatic.git

diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 83141b4b6..c17bcd380 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: 2017-02-15 11:18+0000\n"
-"PO-Revision-Date: 2017-02-24 06:37+0800\n"
+"POT-Creation-Date: 2018-01-10 09:55+0000\n"
+"PO-Revision-Date: 2017-07-23 09:54+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 1.8.12\n"
+"X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/lib/video_content.cc:444
+#: src/lib/video_content.cc:448
 #, c-format
 msgid ""
 "\n"
@@ -28,7 +28,7 @@ msgstr ""
 "\n"
 "源视频帧率 %.4f\n"
 
-#: src/lib/video_content.cc:408
+#: src/lib/video_content.cc:412
 msgid ""
 "\n"
 "Cropped to %1x%2"
@@ -36,7 +36,7 @@ msgstr ""
 "\n"
 "裁剪为%1x%2"
 
-#: src/lib/video_content.cc:401
+#: src/lib/video_content.cc:405
 #, c-format
 msgid ""
 "\n"
@@ -45,7 +45,7 @@ msgstr ""
 "\n"
 "显示宽高比 %.2f:1"
 
-#: src/lib/video_content.cc:432
+#: src/lib/video_content.cc:436
 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:422
+#: src/lib/video_content.cc:426
 msgid ""
 "\n"
 "Scaled to %1x%2"
@@ -61,73 +61,115 @@ msgstr ""
 "\n"
 "缩放到 %1x%2"
 
-#: src/lib/video_content.cc:426 src/lib/video_content.cc:437
+#: src/lib/video_content.cc:430 src/lib/video_content.cc:441
 #, 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:430
+#: src/lib/job.cc:434
 msgid " on %1"
 msgstr " on %1"
 
+#: src/lib/config.cc:785
+msgid ""
+"$CPL_NAME\n"
+"\n"
+"Type: $TYPE\n"
+"Format: $CONTAINER\n"
+"Audio: $AUDIO\n"
+"Audio Language: $AUDIO_LANGUAGE\n"
+"Subtitle Language: $SUBTITLE_LANGUAGE\n"
+"Length: $LENGTH\n"
+"Size: $SIZE\n"
+msgstr ""
+"$CPL_NAME\n"
+"\n"
+"类型: $TYPE\n"
+"格式: $CONTAINER\n"
+"音轨: $AUDIO\n"
+"对白语言: $AUDIO_LANGUAGE\n"
+"字幕语言: $SUBTITLE_LANGUAGE\n"
+"长度: $LENGTH\n"
+"大小: $SIZE\n"
+
 #: src/lib/atmos_mxf_content.cc:78
 msgid "%1 [Atmos]"
 msgstr "%1 [全景声]"
 
-#: src/lib/dcp_content.cc:210
+#: src/lib/dcp_content.cc:212
 msgid "%1 [DCP]"
 msgstr "%1 [DCP]"
 
-#: src/lib/ffmpeg_content.cc:296
+#: src/lib/ffmpeg_content.cc:299
 msgid "%1 [audio]"
 msgstr "%1 [音频]"
 
-#: src/lib/ffmpeg_content.cc:292
+#: src/lib/ffmpeg_content.cc:295
 msgid "%1 [movie]"
 msgstr "%1 [影片]"
 
-#: src/lib/ffmpeg_content.cc:294 src/lib/video_mxf_content.cc:89
+#: src/lib/ffmpeg_content.cc:297 src/lib/video_mxf_content.cc:90
 msgid "%1 [video]"
 msgstr "%1 [视频]"
 
-#: src/lib/video_content.cc:396
+#: src/lib/video_content.cc:400
 #, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ", 像素宽高比 %.2f:1"
 
-#: src/lib/ratio.cc:36
+#: src/lib/ratio.cc:37
 msgid "1.19"
 msgstr "1.19"
 
+#: src/lib/ratio.cc:38
+msgid "1.33 (4:3)"
+msgstr "1.33 (4:3)"
+
 #: src/lib/ratio.cc:39
-msgid "1.66"
-msgstr "1.66"
+msgid "1.38 (Academy)"
+msgstr "1.38 (Academy学院)"
 
 #: src/lib/ratio.cc:40
-msgid "16:9"
-msgstr "16:9"
+msgid "1.43 (IMAX)"
+msgstr "1.43 (IMAX)"
+
+#: src/lib/ratio.cc:41
+msgid "1.66"
+msgstr "1.66"
 
 #: src/lib/ratio.cc:42
-msgid "2.35"
-msgstr "2.35"
+msgid "1.78 (16:9 or HD)"
+msgstr "1.78 (16:9 or HD)"
+
+#: src/lib/ratio.cc:43
+msgid "1.85 (Flat)"
+msgstr "1.85 (Flat)"
+
+#: src/lib/ratio.cc:46
+msgid "1.90 (Full frame)"
+msgstr "Full(全幅/1.90)"
+
+#: src/lib/ratio.cc:44
+msgid "2.35 (35mm Scope)"
+msgstr "2.35 (35mm Scope)"
+
+#: src/lib/ratio.cc:45
+msgid "2.39 (Scope)"
+msgstr "2.39 (Scope)"
 
 #: src/lib/filter.cc:71
 msgid "3D denoiser"
 msgstr "3D 降噪"
 
-#: src/lib/ratio.cc:37
-msgid "4:3"
-msgstr "4:3"
-
 #. / TRANSLATORS: fps here is an abbreviation for frames per second
-#: src/lib/transcode_job.cc:125
+#: src/lib/transcode_job.cc:132
 #, c-format
 msgid "; %.1f fps"
 msgstr "; %.1f fps"
 
-#: src/lib/job.cc:435
+#: src/lib/job.cc:439
 msgid "; %1 remaining; finishing at %2%3"
 msgstr "; 剩余 %1 ; 完成于 %2%3"
 
@@ -138,21 +180,17 @@ msgid ""
 "unlikely to have any visible effect on the image."
 msgstr ""
 "有些放映设备不支持高码率DCP,我们推荐使用200Mbit/s以内的码率来进行打包，这种细"
-"微的调整是肉眼很难分辨的！"
+"微的调整是肉眼很难分辨的。"
 
 #: src/lib/ffmpeg_content.cc:547
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
 msgstr "ARIB STD-B67 (HDR-HLG)"
 
-#: src/lib/ratio.cc:38
-msgid "Academy"
-msgstr "学院模式"
-
 #: src/lib/dcp_content_type.cc:55
 msgid "Advertisement"
 msgstr "广告片"
 
-#: src/lib/hints.cc:95
+#: src/lib/hints.cc:99
 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) "
@@ -160,7 +198,7 @@ msgid ""
 "\"DCP\" tab."
 msgstr "遮幅(1.85：1)左右黑边。"
 
-#: src/lib/hints.cc:91
+#: src/lib/hints.cc:95
 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.  "
@@ -178,7 +216,7 @@ msgstr "分析音频"
 
 #: src/lib/audio_content.cc:258
 msgid "Audio will be resampled from %1kHz to %2kHz"
-msgstr "重新采样音频从 %1kHz 到 %2kHz."
+msgstr "音频重新采样频率设置为 %1kHz 到 %2kHz"
 
 #: src/lib/audio_content.cc:260
 msgid "Audio will be resampled to %1kHz"
@@ -233,19 +271,19 @@ msgstr "BT709"
 msgid "Bits per pixel"
 msgstr "像素位"
 
-#: src/lib/util.cc:532
+#: src/lib/util.cc:552
 msgid "BsL"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:533
+#: src/lib/util.cc:553
 msgid "BsR"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:524
+#: src/lib/util.cc:544
 msgid "C"
 msgstr "中置"
 
-#: src/lib/job.cc:444
+#: src/lib/job.cc:448
 msgid "Cancelled"
 msgstr "取消"
 
@@ -253,7 +291,7 @@ msgstr "取消"
 msgid "Cannot handle pixel format %1 during %2"
 msgstr "在 %2不能处理图片格式 %1"
 
-#: src/lib/util.cc:493
+#: src/lib/util.cc:513
 msgid "Centre"
 msgstr "中置音"
 
@@ -297,7 +335,7 @@ msgstr "色彩空间"
 msgid "Computing digest"
 msgstr "计算Hash值中..."
 
-#: src/lib/writer.cc:470
+#: src/lib/writer.cc:509
 msgid "Computing digests"
 msgstr "计算Hash值中..."
 
@@ -401,7 +439,7 @@ msgstr "字幕字体必须相同。"
 msgid "Content to be joined must use the same subtitle stream."
 msgstr "字幕流必须相同。"
 
-#: src/lib/video_content.cc:387
+#: src/lib/video_content.cc:391
 msgid "Content video is %1x%2"
 msgstr "源视频分辨率是 %1x%2"
 
@@ -425,7 +463,7 @@ msgstr "无法解码JPEG2000文件%1 (%2)"
 msgid "Could not decode image file (%1)"
 msgstr "无法解码图像文件(%1)"
 
-#: src/lib/ffmpeg_examiner.cc:370
+#: src/lib/ffmpeg_examiner.cc:267
 msgid "Could not find pixel format for video."
 msgstr "找不到视频格式"
 
@@ -435,7 +473,7 @@ msgid ""
 "o-matic is running."
 msgstr "无法监测远程编码服务器。可能是另一个DCP-O-MATIC程序进程正在运行。"
 
-#: src/lib/job.cc:121 src/lib/job.cc:135
+#: src/lib/job.cc:121 src/lib/job.cc:136
 msgid "Could not open %1"
 msgstr "无法打开%1"
 
@@ -443,7 +481,7 @@ msgstr "无法打开%1"
 msgid "Could not open %1 to send"
 msgstr "无法打开%1并发送"
 
-#: src/lib/internet.cc:83
+#: src/lib/internet.cc:90 src/lib/internet.cc:95 src/lib/internet.cc:100
 msgid "Could not open downloaded ZIP file"
 msgstr "无法打开下载的zip文件"
 
@@ -463,22 +501,30 @@ msgstr "传输失败！"
 msgid "Could not write to remote file (%1)"
 msgstr "写入远程文件 (%1)失败！"
 
-#: src/lib/util.cc:503
+#: src/lib/util.cc:523
 msgid "D-BOX primary"
 msgstr "一级D-BOX"
 
-#: src/lib/util.cc:504
+#: src/lib/util.cc:524
 msgid "D-BOX secondary"
 msgstr "二级D-BOX"
 
-#: src/lib/util.cc:534
+#: src/lib/util.cc:554
 msgid "DBP"
 msgstr "一级D-BOX通道"
 
-#: src/lib/util.cc:535
+#: src/lib/util.cc:555
 msgid "DBS"
 msgstr "DBS"
 
+#: src/lib/ratio.cc:43
+msgid "DCI Flat"
+msgstr "DCI Flat(遮幅/1.77/1.78/1.85) "
+
+#: src/lib/ratio.cc:45
+msgid "DCI Scope"
+msgstr "DCI Scope(宽银幕/2.35/2.39) "
+
 #: src/lib/dcp_subtitle_content.cc:100
 msgid "DCP XML subtitles"
 msgstr "DCP XML字幕"
@@ -495,10 +541,11 @@ msgstr "DCP列队将在速度为 %1%% 下运行.\n"
 msgid "DCP will use every other frame of the content.\n"
 msgstr "将使用隔帧打包DCP.\n"
 
-#: src/lib/job.cc:123 src/lib/job.cc:137
+#: src/lib/job.cc:123 src/lib/job.cc:138
+#, fuzzy
 msgid ""
-"DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in "
-"an unexpected format."
+"DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or "
+"is in an unexpected format."
 msgstr "无法打开文件%1。文件不存在或格式无法识别。"
 
 #: src/lib/ffmpeg_content.cc:103
@@ -510,7 +557,7 @@ msgstr "不支持的格式`%1'。"
 msgid "De-interlacing"
 msgstr "去除隔行"
 
-#: src/lib/config.cc:551
+#: src/lib/config.cc:765
 msgid ""
 "Dear Projectionist\n"
 "\n"
@@ -541,7 +588,7 @@ msgstr ""
 msgid "Dolby CP650 and CP750"
 msgstr "杜比 CP 650和CP 750"
 
-#: src/lib/internet.cc:76
+#: src/lib/internet.cc:77
 msgid "Download failed (%1/%2 error %3)"
 msgstr "下载失败 (%1/%2 error %3)"
 
@@ -553,23 +600,23 @@ msgstr "该DCP中将每一帧复制为两帧。\n"
 msgid "Each content frame will be repeated %1 more times in the DCP.\n"
 msgstr "每个内容帧将在DCP中重复％1次。\n"
 
-#: src/lib/send_kdm_email_job.cc:56
+#: src/lib/send_kdm_email_job.cc:64
 msgid "Email KDMs"
 msgstr "邮件发送 KDMs"
 
-#: src/lib/send_kdm_email_job.cc:59
+#: src/lib/send_kdm_email_job.cc:67
 msgid "Email KDMs for %1"
 msgstr "邮件发送KDMs给 %1"
 
-#: src/lib/send_problem_report_job.cc:55
+#: src/lib/send_problem_report_job.cc:59
 msgid "Email problem report"
 msgstr "通过邮件发送BUG"
 
-#: src/lib/send_problem_report_job.cc:58
+#: src/lib/send_problem_report_job.cc:62
 msgid "Email problem report for %1"
 msgstr "通过邮件发送BUG给 %1"
 
-#: src/lib/transcoder.cc:77
+#: src/lib/dcp_encoder.cc:95 src/lib/ffmpeg_encoder.cc:201
 msgid "Encoding"
 msgstr "编码中"
 
@@ -577,7 +624,7 @@ msgstr "编码中"
 msgid "Error in subtitle file: saw %1 while expecting %2"
 msgstr "字幕文件错误: 执行为 %1 实际要求为%2"
 
-#: src/lib/job.cc:442
+#: src/lib/job.cc:446
 msgid "Error: %1"
 msgstr "错误: (%1)"
 
@@ -601,7 +648,7 @@ msgstr "发送电子邮件失败"
 msgid "Feature"
 msgstr "正片"
 
-#: src/lib/content.cc:367
+#: src/lib/content.cc:386
 msgid "Filename"
 msgstr "文件名"
 
@@ -609,23 +656,11 @@ msgstr "文件名"
 msgid "Film"
 msgstr "电影"
 
-#: src/lib/ffmpeg_examiner.cc:100
+#: src/lib/ffmpeg_examiner.cc:95
 msgid "Finding length"
 msgstr "定位长度"
 
-#: src/lib/ffmpeg_examiner.cc:96
-msgid "Finding length and subtitles"
-msgstr "定位长度和字幕"
-
-#: src/lib/ffmpeg_examiner.cc:98
-msgid "Finding subtitles"
-msgstr "定位字幕"
-
-#: src/lib/ratio.cc:41
-msgid "Flat"
-msgstr "Flat(遮幅/1.77/1.78/1.85)"
-
-#: src/lib/content.cc:374
+#: src/lib/content.cc:393
 msgid "Frame rate"
 msgstr "帧率"
 
@@ -637,7 +672,7 @@ msgstr "Full(全幅/1.90)"
 msgid "Full (0-%1)"
 msgstr "全幅 (0-%1)"
 
-#: src/lib/ratio.cc:44
+#: src/lib/ratio.cc:46
 msgid "Full frame"
 msgstr "Full(全幅/1.90)"
 
@@ -669,11 +704,11 @@ msgstr "伽玛 2.8 (BT470BG)"
 msgid "Gradient debander"
 msgstr "梯度"
 
-#: src/lib/util.cc:528
+#: src/lib/util.cc:548
 msgid "HI"
 msgstr "听力障碍"
 
-#: src/lib/util.cc:497
+#: src/lib/util.cc:517
 msgid "Hearing impaired"
 msgstr "听力障碍"
 
@@ -681,6 +716,22 @@ msgstr "听力障碍"
 msgid "High quality 3D denoiser"
 msgstr "高品质的3D降噪"
 
+#: src/lib/hints.cc:122
+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:119
+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包中声明高帧率，这不是每个放映机都能支持的"
+"格式。"
+
 #: src/lib/audio_content.cc:307 src/lib/audio_content.cc:327
 msgid "Hz"
 msgstr "Hz（赫兹）"
@@ -693,11 +744,11 @@ msgstr "IEC61966-2-1 (sRGB或sYCC)"
 msgid "IEC61966-2-4"
 msgstr "IEC61966-2-4"
 
-#: src/lib/job.cc:144 src/lib/job.cc:176 src/lib/job.cc:186
+#: src/lib/job.cc:146 src/lib/job.cc:178 src/lib/job.cc:188
 msgid "It is not known what caused this error."
 msgstr "未知错误！"
 
-#: src/lib/config.cc:243 src/lib/config.cc:548
+#: src/lib/config.cc:287 src/lib/config.cc:762
 msgid "KDM delivery: $CPL_NAME"
 msgstr "发行KDM: $CPL_NAME"
 
@@ -705,39 +756,39 @@ msgstr "发行KDM: $CPL_NAME"
 msgid "Kernel deinterlacer"
 msgstr "隔行扫描"
 
-#: src/lib/util.cc:522
+#: src/lib/util.cc:542
 msgid "L"
 msgstr "左声道"
 
-#: src/lib/util.cc:530
+#: src/lib/util.cc:550
 msgid "Lc"
 msgstr "左中"
 
-#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:491
+#: src/lib/mid_side_decoder.cc:98 src/lib/util.cc:511
 msgid "Left"
 msgstr "左声道"
 
-#: src/lib/util.cc:499
+#: src/lib/util.cc:519
 msgid "Left centre"
 msgstr "左中"
 
-#: src/lib/util.cc:501
+#: src/lib/util.cc:521
 msgid "Left rear surround"
 msgstr "左后环绕"
 
-#: src/lib/util.cc:495
+#: src/lib/util.cc:515
 msgid "Left surround"
 msgstr "左环绕"
 
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:461
 msgid "Length"
 msgstr "长度"
 
-#: src/lib/util.cc:525
+#: src/lib/util.cc:545
 msgid "Lfe"
 msgstr "次低"
 
-#: src/lib/util.cc:494
+#: src/lib/util.cc:514
 msgid "Lfe (sub)"
 msgstr "次低（重低音）"
 
@@ -761,7 +812,7 @@ msgstr "对数 (范围 100:1)"
 msgid "Logarithmic (316:1 range)"
 msgstr "对数 (范围 316:1)"
 
-#: src/lib/util.cc:526
+#: src/lib/util.cc:546
 msgid "Ls"
 msgstr "左环绕"
 
@@ -789,11 +840,15 @@ msgstr "DCP中的帧率不匹配。"
 msgid "Mismatched video sizes in DCP"
 msgstr "DCP中的视频分辨率不匹配。"
 
+#: src/lib/writer.cc:608
+msgid "Mono"
+msgstr "单声道"
+
 #: src/lib/filter.cc:66
 msgid "Motion compensating deinterlacer"
 msgstr "动态隔行补偿。"
 
-#: src/lib/cinema_kdms.cc:151
+#: src/lib/cinema_kdms.cc:201
 msgid "No mail server configured in preferences"
 msgstr "没有配置偏好的邮件服务！"
 
@@ -805,7 +860,7 @@ msgstr "不缩放"
 msgid "No stretch"
 msgstr "不拉伸"
 
-#: src/lib/image_content.cc:57
+#: src/lib/image_content.cc:120
 msgid "No valid image files were found in the folder."
 msgstr "未发现有效的图片序列文件。"
 
@@ -813,7 +868,11 @@ msgstr "未发现有效的图片序列文件。"
 msgid "Noise reduction"
 msgstr "降噪"
 
-#: src/lib/job.cc:440
+#: src/lib/writer.cc:606
+msgid "None"
+msgstr "无"
+
+#: src/lib/job.cc:444
 msgid "OK (ran for %1)"
 msgstr "确认 (运行 %1)"
 
@@ -825,7 +884,7 @@ msgstr "只有第一段才可以进行开始裁剪。"
 msgid "Only the last piece of content to be joined can have an end trim."
 msgstr "只有最后一段才可以进行结束裁剪。"
 
-#: src/lib/job.cc:168
+#: src/lib/job.cc:170
 msgid "Out of memory"
 msgstr "内存不足"
 
@@ -841,19 +900,19 @@ msgstr "P3"
 msgid "Policy"
 msgstr "政策相关"
 
-#: src/lib/content.cc:383
+#: src/lib/content.cc:402
 msgid "Prepared for video frame rate"
 msgstr "准备视频帧率"
 
-#: src/lib/exceptions.cc:79
-msgid "Programming error at %1:%2"
-msgstr "程序内部错误%1:%2"
+#: src/lib/exceptions.cc:85
+msgid "Programming error at %1:%2 %3"
+msgstr "程序内部错误 %1:%2 %3"
 
 #: src/lib/dcp_content_type.cc:54
 msgid "Public Service Announcement"
 msgstr "公共服务或公告"
 
-#: src/lib/util.cc:523
+#: src/lib/util.cc:543
 msgid "R"
 msgstr "右声道"
 
@@ -865,7 +924,7 @@ msgstr "RGB / sRGB (IEC61966-2-1)"
 msgid "Rating"
 msgstr "分级"
 
-#: src/lib/util.cc:531
+#: src/lib/util.cc:551
 msgid "Rc"
 msgstr "右中"
 
@@ -885,23 +944,23 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:492
+#: src/lib/mid_side_decoder.cc:99 src/lib/util.cc:512
 msgid "Right"
 msgstr "右声道"
 
-#: src/lib/util.cc:500
+#: src/lib/util.cc:520
 msgid "Right centre"
 msgstr "右中"
 
-#: src/lib/util.cc:502
+#: src/lib/util.cc:522
 msgid "Right rear surround"
 msgstr "右后环绕"
 
-#: src/lib/util.cc:496
+#: src/lib/util.cc:516
 msgid "Right surround"
 msgstr "右环绕"
 
-#: src/lib/util.cc:527
+#: src/lib/util.cc:547
 msgid "Rs"
 msgstr "右环绕"
 
@@ -950,11 +1009,12 @@ msgstr "SMPTE ST 432-1 D65 (2010)"
 msgid "SSH error (%1)"
 msgstr "SSH错误 (%1)"
 
-#: src/lib/ratio.cc:43
-msgid "Scope"
-msgstr "Scope(宽银幕/2.35/2.39)"
+#: src/lib/image_content.cc:107
+#, fuzzy
+msgid "Scanning image files"
+msgstr "计算图像Hash"
 
-#: src/lib/send_problem_report_job.cc:70
+#: src/lib/send_problem_report_job.cc:74
 msgid "Sending email"
 msgstr "发送电子邮件"
 
@@ -962,7 +1022,7 @@ msgstr "发送电子邮件"
 msgid "Short"
 msgstr "短片"
 
-#: src/lib/video_content.cc:458
+#: src/lib/video_content.cc:462
 msgid "Size"
 msgstr "大小"
 
@@ -970,6 +1030,10 @@ msgstr "大小"
 msgid "Some audio will be resampled to %1kHz"
 msgstr "部分音频将被重新采样到%1kHz"
 
+#: src/lib/writer.cc:610
+msgid "Stereo"
+msgstr "双声道"
+
 #: src/lib/upmixer_a.cc:46
 msgid "Stereo to 5.1 up-mixer A"
 msgstr "立体声到5.1，混音器A"
@@ -994,7 +1058,7 @@ msgstr "测试片"
 msgid "Text subtitles"
 msgstr "文本字幕"
 
-#: src/lib/film.cc:1560
+#: src/lib/film.cc:1553
 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 "
@@ -1006,11 +1070,11 @@ msgid ""
 "existing DCP' checkboxes."
 msgstr "DCP中的电影内容太大，请使用 【 分卷模式 】后再试一次。"
 
-#: src/lib/dcp_content.cc:502
+#: src/lib/dcp_content.cc:510
 msgid "The DCP does not have sound in all reels."
 msgstr "该DCP的所有分卷无声音。"
 
-#: src/lib/dcp_content.cc:523
+#: src/lib/dcp_content.cc:534
 msgid "The DCP does not have subtitles in all reels."
 msgstr "该DCP的所有分卷无字幕。"
 
@@ -1018,60 +1082,88 @@ msgstr "该DCP的所有分卷无字幕。"
 msgid "The certificate chain for signing is invalid"
 msgstr "证书签名无效！"
 
+#: src/lib/exceptions.cc:79
+msgid "The certificate chain for signing is invalid (%1)"
+msgstr "证书签名无效(%1)"
+
 #: src/lib/job.cc:108
 msgid ""
 "The drive that the film is stored on is low in disc space.  Free some more "
 "space and try again."
 msgstr "磁盘空间不足！"
 
-#: src/lib/dcp_content.cc:445
+#: src/lib/content_factory.cc:115
+msgid "The file %1 has been moved %2 milliseconds earlier."
+msgstr ""
+
+#: src/lib/content_factory.cc:110
+msgid "The file %1 has been moved %2 milliseconds later."
+msgstr ""
+
+#: src/lib/content_factory.cc:135
+msgid "The file %1 has been trimmed by %2 milliseconds less."
+msgstr ""
+
+#: src/lib/content_factory.cc:130
+msgid "The file %1 has been trimmed by %2 milliseconds more."
+msgstr ""
+
+#: src/lib/dcp_content.cc:447
 msgid "The film has a different frame rate to this DCP."
 msgstr "影片与DCP的帧速率不一致"
 
-#: src/lib/dcp_content.cc:438
+#: src/lib/dcp_content.cc:440
 msgid "The film is set to Interop and this DCP is SMPTE."
 msgstr "打包内容被设置为Interop类型，而实际打包类型是 SMPTE。"
 
-#: src/lib/dcp_content.cc:435
+#: src/lib/dcp_content.cc:437
 msgid "The film is set to SMPTE and this DCP is Interop."
 msgstr "打包内容被设置为SMPTE类型，而实际打包类型是 Interop。"
 
-#: src/lib/dcp_content.cc:464
+#: src/lib/dcp_content.cc:469
 msgid ""
 "The reel lengths in the film differ from those in the DCP; set the reel mode "
 "to 'split by video content'."
 msgstr "影片时长与DCP中的分卷时长不一致，请设置 【 分卷模式 】 来分割该内容。"
 
-#: src/lib/dcp_content.cc:482
+#: src/lib/dcp_content.cc:487
 msgid "The video frame size in the film differs from that in the DCP."
 msgstr "视频帧大小与DCP不一致。"
 
-#: src/lib/dcp_content.cc:507
+#: src/lib/dcp_content.cc:515
 msgid "There is other audio content overlapping this DCP; remove it."
 msgstr "音频文件重复，请删除重复项"
 
-#: src/lib/dcp_content.cc:528
+#: src/lib/dcp_content.cc:539
 msgid "There is other subtitle content overlapping this DCP; remove it."
 msgstr "字幕文件重复，请删除重复项"
 
-#: src/lib/dcp_content.cc:486
+#: src/lib/dcp_content.cc:491
 msgid "There is other video content overlapping this DCP; remove it."
 msgstr "视频文件重复，请删除重复项"
 
-#: src/lib/job.cc:168
+#: src/lib/job.cc:170
 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/film.cc:434
+#: src/lib/exceptions.cc:91
+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中。"
+
+#: src/lib/film.cc:439
 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:423
+#: src/lib/film.cc:428
 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 "
@@ -1090,7 +1182,7 @@ msgstr "转码 %1"
 msgid "Transitional"
 msgstr "过渡片"
 
-#: src/lib/internet.cc:88
+#: src/lib/internet.cc:109
 msgid "Unexpected ZIP file contents"
 msgstr "意外的ZIP文件的内容"
 
@@ -1098,11 +1190,11 @@ msgstr "意外的ZIP文件的内容"
 msgid "Unexpected image type received by server"
 msgstr "服务器接收到意外的图像类型！"
 
-#: src/lib/job.cc:185
+#: src/lib/job.cc:187
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: src/lib/ffmpeg_decoder.cc:289
+#: src/lib/ffmpeg_decoder.cc:319
 msgid "Unrecognised audio sample format (%1)"
 msgstr "无法识别的音频采样格式 (%1)"
 
@@ -1122,7 +1214,7 @@ msgstr "未指定"
 msgid "Untitled"
 msgstr "无标题"
 
-#: src/lib/util.cc:505 src/lib/util.cc:506
+#: src/lib/util.cc:525 src/lib/util.cc:526
 msgid "Unused"
 msgstr "未使用"
 
@@ -1134,11 +1226,11 @@ msgstr "左混"
 msgid "Upmix R"
 msgstr "右混"
 
-#: src/lib/util.cc:529
+#: src/lib/util.cc:549
 msgid "VI"
 msgstr "视力障碍"
 
-#: src/lib/util.cc:498
+#: src/lib/util.cc:518
 msgid "Visually impaired"
 msgstr "视力障碍"
 
@@ -1154,21 +1246,32 @@ msgstr "YCOCG"
 msgid "Yet Another Deinterlacing Filter"
 msgstr "反隔行扫描滤镜"
 
+#: src/lib/hints.cc:124
+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也不是每个放映机都能放映）"
+
 #: src/lib/hints.cc:111
 msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
-"supported.  You are advised to make a SMPTE DCP instead."
+"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。"
 
-#: src/lib/hints.cc:133
+#: src/lib/hints.cc:149
 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:122
+#: src/lib/hints.cc:138
 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."
@@ -1176,27 +1279,19 @@ msgstr ""
 "您已经添加了 %1 个VOB文件，如果他们来自一张DVD，请确保您已经导入了所有文件，"
 "否则可能无法正常播放。"
 
-#: src/lib/hints.cc:68
+#: src/lib/hints.cc:72
 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/hints.cc:103
-msgid ""
-"Your DCP frame rate (%1 fps) may cause problems in a few (mostly older) "
-"projectors.  Use 24 or 48 frames per second to be on the safe side."
-msgstr ""
-"您的DCP帧速率（%1 fps）会使一部分电影放映机出现错误，请使用24 fps、48 fps、"
-"60 fps、96 fps 和 120 fps 等来保证能够正常放映。"
-
-#: src/lib/hints.cc:72
+#: src/lib/hints.cc:76
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
 msgstr "您的DCP声道数小于6个，在部分电影服务器上可能不能正常播放。"
 
-#: src/lib/hints.cc:99
+#: src/lib/hints.cc:103
 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"
@@ -1204,17 +1299,33 @@ msgstr ""
 "DCP使用了不常见的画幅比例，可能导致部分电影放映机无法正常播放，建议改成Flat "
 "(1.77/1.78/1.85) 或者Scope (2.35/2.39) 比例。"
 
-#: src/lib/hints.cc:159
+#: src/lib/hints.cc:175
 msgid ""
 "Your audio level is very high (on %1).  You should reduce the gain of your "
 "audio content."
 msgstr "您的音频增益过大 (在%1)，请降低音频增益。"
 
-#: src/lib/image_content.cc:81
+#: src/lib/config.cc:244
+msgid ""
+"Your default container is not valid and has been changed to Flat (1.85:1)"
+msgstr ""
+
+#: src/lib/content_factory.cc:106
+msgid ""
+"Your project contains video content that was not aligned to a frame boundary."
+msgstr ""
+
+#: src/lib/content_factory.cc:126
+msgid ""
+"Your project contains video content whose trim was not aligned to a frame "
+"boundary."
+msgstr ""
+
+#: src/lib/image_content.cc:71
 msgid "[moving images]"
 msgstr "[动态图像]"
 
-#: src/lib/image_content.cc:79
+#: src/lib/image_content.cc:69
 msgid "[still]"
 msgstr "[静态图像]"
 
@@ -1222,11 +1333,11 @@ msgstr "[静态图像]"
 msgid "[subtitles]"
 msgstr "[字幕]"
 
-#: src/lib/film.cc:293
+#: src/lib/film.cc:296
 msgid "cannot contain slashes"
 msgstr "不能包含斜线"
 
-#: src/lib/dcpomatic_socket.cc:68
+#: src/lib/dcpomatic_socket.cc:69
 msgid "connect timed out"
 msgstr "连接超时"
 
@@ -1234,11 +1345,11 @@ msgstr "连接超时"
 msgid "connecting"
 msgstr "连接"
 
-#: src/lib/film.cc:297
+#: src/lib/film.cc:300
 msgid "container"
 msgstr "打包类型"
 
-#: src/lib/film.cc:305
+#: src/lib/film.cc:308
 msgid "content type"
 msgstr "打包类型"
 
@@ -1246,11 +1357,11 @@ msgstr "打包类型"
 msgid "copying %1"
 msgstr "复制中... %1"
 
-#: src/lib/ffmpeg.cc:140
+#: src/lib/ffmpeg.cc:138
 msgid "could not find stream information"
 msgstr "找不到流信息"
 
-#: src/lib/reel_writer.cc:321
+#: src/lib/reel_writer.cc:336
 msgid "could not move audio asset into the DCP (%1)"
 msgstr "无法移动的音频文件 (%1)"
 
@@ -1278,29 +1389,29 @@ msgstr "无法启动SSH"
 msgid "could not write to file %1 (%2)"
 msgstr "不能写入文件 (%1)"
 
-#: src/lib/dcpomatic_socket.cc:64
+#: src/lib/dcpomatic_socket.cc:65
 msgid "error during async_connect (%1)"
 msgstr "异步连接错误 (%1)"
 
-#: src/lib/dcpomatic_socket.cc:117
+#: src/lib/dcpomatic_socket.cc:118
 msgid "error during async_read (%1)"
 msgstr "异步读取错误 (%1)"
 
-#: src/lib/dcpomatic_socket.cc:89
+#: src/lib/dcpomatic_socket.cc:90
 msgid "error during async_write (%1)"
 msgstr "异步写入错误 (%1)"
 
-#: src/lib/content.cc:376 src/lib/content.cc:385
+#: src/lib/content.cc:395 src/lib/content.cc:404
 msgid "frames per second"
 msgstr "每秒帧数"
 
 #. / TRANSLATORS: h here is an abbreviation for hours
-#: src/lib/util.cc:147 src/lib/util.cc:150
+#: src/lib/util.cc:166 src/lib/util.cc:169
 msgid "h"
 msgstr "时"
 
 #. / TRANSLATORS: m here is an abbreviation for minutes
-#: src/lib/util.cc:162 src/lib/util.cc:165
+#: src/lib/util.cc:181 src/lib/util.cc:184
 msgid "m"
 msgstr "分"
 
@@ -1308,16 +1419,16 @@ msgstr "分"
 msgid "missing required setting %1"
 msgstr "缺少必需的设置%1"
 
-#: src/lib/image_content.cc:96
+#: src/lib/image_content.cc:86
 msgid "moving"
 msgstr "移动"
 
-#: src/lib/film.cc:293 src/lib/film.cc:309
+#: src/lib/film.cc:296
 msgid "name"
 msgstr "名字"
 
 #. / TRANSLATORS: s here is an abbreviation for seconds
-#: src/lib/util.cc:176
+#: src/lib/util.cc:195
 msgid "s"
 msgstr "秒"
 
@@ -1325,35 +1436,56 @@ msgstr "秒"
 msgid "sRGB"
 msgstr "sRGB"
 
-#: src/lib/film.cc:314
+#: src/lib/film.cc:317
 msgid "some of your content is missing"
 msgstr "内容不完整"
 
-#: src/lib/film.cc:318
+#: src/lib/film.cc:321
 msgid "some of your content needs a KDM"
 msgstr "内容需要KDM密匙"
 
-#: src/lib/film.cc:321
-#, fuzzy
+#: src/lib/film.cc:324
 msgid "some of your content needs an OV"
-msgstr "内容需要OV"
+msgstr "内容需要声明原创OV"
 
-#: src/lib/image_content.cc:94
+#: src/lib/image_content.cc:84
 msgid "still"
 msgstr "静止图像"
 
-#: src/lib/ffmpeg_examiner.cc:337
+#: src/lib/ffmpeg_examiner.cc:234
 msgid "unknown"
 msgstr "未知"
 
-#: src/lib/video_content.cc:457
+#: src/lib/video_content.cc:461
 msgid "video frames"
 msgstr "视频帧"
 
-#: src/lib/film.cc:301
+#: src/lib/film.cc:304
 msgid "you must add some content to the DCP before creating it"
 msgstr "您必须在创建DCP之前添加一些内容。"
 
+#~ msgid "2.35"
+#~ msgstr "2.35"
+
+#~ msgid "16:9"
+#~ msgstr "16:9"
+
+#~ msgid "4:3"
+#~ msgstr "4:3"
+
+#~ msgid ""
+#~ "Your DCP frame rate (%1 fps) may cause problems in a few (mostly older) "
+#~ "projectors.  Use 24 or 48 frames per second to be on the safe side."
+#~ msgstr ""
+#~ "您的DCP帧速率（%1 fps）会使一部分电影放映机出现错误，请使用24 fps、48 "
+#~ "fps、60 fps、96 fps 和 120 fps 等来保证能够正常放映。"
+
+#~ msgid "Finding length and subtitles"
+#~ msgstr "定位长度和字幕"
+
+#~ msgid "Finding subtitles"
+#~ msgstr "定位字幕"
+
 #~ msgid "Encoding picture and sound"
 #~ msgstr "编码图像序列和音频中……"
 
@@ -1382,9 +1514,6 @@ msgstr "您必须在创建DCP之前添加一些内容。"
 #~ msgid "Computing audio digest"
 #~ msgstr "计算音频Hash"
 
-#~ msgid "Computing image digest"
-#~ msgstr "计算图像Hash"
-
 #~ msgid "fps"
 #~ msgstr "fps"