X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fpo%2Fzh_CN.po;h=647fb20e75075a5ffb6cceb700e242f0fdc9cc2d;hb=e8485a82f099e8c1cac35af6cabb4130fff40e50;hp=0cafb48577e3e1e83fa5efe99e74a42981619af9;hpb=689ee64ce54ca9290db1659b5ea3e902d7d3a6e7;p=dcpomatic.git

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 0cafb4857..647fb20e7 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -1,21 +1,23 @@
-# SOME DESCRIPTIVE TITLE.
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+#: src/wx/audio_panel.cc:56 src/wx/subtitle_panel.cc:56
+#: src/wx/video_panel.cc:82
 msgid ""
 msgstr ""
 "Project-Id-Version: DCP-O-MATIC_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-17 14:44+0100\n"
-"PO-Revision-Date: 2016-08-19 02:40+0800\n"
+"POT-Creation-Date: 2018-04-20 00:58+0100\n"
+"PO-Revision-Date: 2018-04-05 20:48+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.8\n"
+"X-Generator: Poedit 2.0.6\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
@@ -25,37 +27,51 @@ msgstr ""
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#: src/wx/subtitle_panel.cc:73 src/wx/subtitle_panel.cc:83
-#: src/wx/subtitle_panel.cc:93 src/wx/subtitle_panel.cc:103
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:83 src/wx/subtitle_panel.cc:93
+#: src/wx/subtitle_panel.cc:103 src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "%"
 msgstr "%"
 
+#: src/wx/film_name_location_dialog.cc:130
+msgid "%1 already exists as a file, so you cannot use it for a film."
+msgstr "%1 文件已经存在，所以不能创建工程."
+
+#: src/wx/kdm_dialog.cc:153
+#, c-format
+msgid "%d KDM written to %s"
+msgstr "%d KDM 保存到 %s"
+
+#: src/wx/kdm_dialog.cc:153
+#, c-format
+msgid "%d KDMs written to %s"
+msgstr "%d KDMs 保存到 %s"
+
 #: src/wx/about_dialog.cc:83
 msgid ""
-"(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n"
+"(C) 2012-2018 Carl Hetherington, Terrence Meiczinger\n"
 " Ole Laursen, Brecht Sanders"
 msgstr ""
-"(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n"
+"(C) 2012-2017 Carl Hetherington, Terrence Meiczinger\n"
 " Ole Laursen, Brecht Sanders"
 
-#: src/wx/file_picker_ctrl.cc:42 src/wx/file_picker_ctrl.cc:58
+#: src/wx/file_picker_ctrl.cc:43 src/wx/file_picker_ctrl.cc:58
 msgid "(None)"
-msgstr "无"
+msgstr "(无)"
 
-#: src/wx/config_dialog.cc:188
+#: src/wx/config_dialog.cc:140
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(重启DCP-O-MATIC查看语言变化)"
 
-#: src/wx/audio_mapping_view.cc:167
+#: src/wx/audio_mapping_view.cc:168
 msgid "-6dB"
 msgstr "-6db"
 
-#: src/wx/wx_util.cc:377
+#: src/wx/wx_util.cc:383
 msgid "12 - 7.1/HI/VI"
 msgstr "12声道—7.1+听力障碍声道/视力障碍声道"
 
-#: src/wx/wx_util.cc:369
+#: src/wx/wx_util.cc:375
 msgid "2 - stereo"
 msgstr "2声道—立体声"
 
@@ -63,69 +79,69 @@ msgstr "2声道—立体声"
 msgid "255"
 msgstr "255"
 
-#: src/wx/video_panel.cc:234
+#: src/wx/video_panel.cc:242
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/isdcf_metadata_dialog.cc:67
+#: src/wx/isdcf_metadata_dialog.cc:70
 msgid "2D version of content available in 3D"
 msgstr "伪3D"
 
-#: src/wx/dcp_panel.cc:712
+#: src/wx/dcp_panel.cc:720
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:670 src/wx/video_panel.cc:235
+#: src/wx/dcp_panel.cc:685 src/wx/video_panel.cc:243
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:238
+#: src/wx/video_panel.cc:246
 msgid "3D alternate"
 msgstr "左右交叉(3D)"
 
-#: src/wx/video_panel.cc:239
+#: src/wx/video_panel.cc:247
 msgid "3D left only"
 msgstr "仅左眼(3D)"
 
-#: src/wx/video_panel.cc:236
+#: src/wx/video_panel.cc:244
 msgid "3D left/right"
 msgstr "左右眼(3D)"
 
-#: src/wx/video_panel.cc:240
+#: src/wx/video_panel.cc:248
 msgid "3D right only"
 msgstr "仅右眼(3D)"
 
-#: src/wx/video_panel.cc:237
+#: src/wx/video_panel.cc:245
 msgid "3D top/bottom"
 msgstr "上下眼(3D)"
 
-#: src/wx/wx_util.cc:371
+#: src/wx/wx_util.cc:377
 msgid "4 - L/C/R/Lfe"
 msgstr "4声道—左/中/右/低音"
 
-#: src/wx/dcp_panel.cc:713
+#: src/wx/dcp_panel.cc:721
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/wx_util.cc:373
+#: src/wx/wx_util.cc:379
 msgid "6 - 5.1"
 msgstr "6声道—5.1声道"
 
-#: src/wx/wx_util.cc:375
+#: src/wx/wx_util.cc:381
 msgid "8 - 5.1/HI/VI"
 msgstr "8声道—5.1+听力障碍声道/视力障碍声道"
 
-#: src/wx/image_subtitle_colour_dialog.cc:41
+#: src/wx/subtitle_appearance_dialog.cc:95
 msgid "<b>New colour</b>"
 msgstr "<b>新色彩空间</b>"
 
-#: src/wx/image_subtitle_colour_dialog.cc:38
+#: src/wx/subtitle_appearance_dialog.cc:92
 msgid "<b>Original colour</b>"
 msgstr "<b>原色彩空间</b>"
 
 #. //trac.wxwidgets.org/ticket/13389
 #.
-#: src/wx/report_problem_dialog.cc:75
+#: src/wx/report_problem_dialog.cc:77
 msgid ""
 "<i>It is important that you enter a valid email address here, otherwise I "
 "can't ask you for more details on your problem.</i>"
@@ -137,15 +153,15 @@ msgstr "<i>请输入一个有效的邮箱地址，否则我们将无法解决您
 msgid ""
 "<i>Only change this if the content's frame rate has been read incorrectly.</"
 "i>"
-msgstr "<i>检测到帧率错误。</i>"
+msgstr "<i>当帧率错误是进行此项设置。</i>"
 
-#: src/wx/colour_conversion_editor.cc:68
+#: src/wx/colour_conversion_editor.cc:79
 msgid "A"
 msgstr "A"
 
 #: src/wx/update_dialog.cc:36
 msgid "A new version of DCP-o-matic is available."
-msgstr "DCP-O-MATIC 有新版本"
+msgstr "发现新版本的DCP-o-matic可用."
 
 #: src/wx/about_dialog.cc:35
 msgid "About DCP-o-matic"
@@ -159,29 +175,45 @@ msgstr "添加影院"
 msgid "Add Cinema..."
 msgstr "添加影院..."
 
-#: src/wx/content_menu.cc:68
+#: src/wx/content_panel.cc:96
+msgid "Add DCP..."
+msgstr "添加 DCP…"
+
+#: src/wx/new_dkdm_folder_dialog.cc:24
+msgid "Add DKDM folder"
+msgstr "添加KDMs文件夹"
+
+#: src/wx/content_menu.cc:77
 msgid "Add KDM..."
 msgstr "添加 KDM..."
 
+#: src/wx/content_menu.cc:78
+msgid "Add OV..."
+msgstr "添加 OV..."
+
 #: src/wx/screens_panel.cc:206
 msgid "Add Screen"
-msgstr "添加荧幕（放映服务器）"
+msgstr "添加银幕（放映服务器）"
 
 #: src/wx/screens_panel.cc:63
 msgid "Add Screen..."
-msgstr "添加荧幕（放映服务器）..."
+msgstr "添加银幕（放映服务器）..."
+
+#: src/wx/content_panel.cc:97
+msgid "Add a DCP."
+msgstr "添加 DCP..."
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:93
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
-"or a DCP."
-msgstr "添加序列帧文件夹或DCP包文件夹"
+"or a folder of sound files."
+msgstr "添加包含序列帧文件或音频的媒体文件夹."
 
-#: src/wx/content_panel.cc:81
+#: src/wx/content_panel.cc:88
 msgid "Add file(s)..."
 msgstr "添加文件..."
 
-#: src/wx/content_panel.cc:85
+#: src/wx/content_panel.cc:92
 msgid "Add folder..."
 msgstr "添加文件夹..."
 
@@ -189,23 +221,35 @@ msgstr "添加文件夹..."
 msgid "Add image sequence"
 msgstr "添加图像序列"
 
-#: src/wx/content_panel.cc:82
-msgid "Add video, image or sound files to the film."
-msgstr "添加视频、图片或音频文件"
+#: src/wx/content_panel.cc:89
+msgid "Add video, image, sound or subtitle files to the film."
+msgstr "添加视频、图片、音频或字幕文件。"
 
-#: src/wx/config_dialog.cc:711 src/wx/editable_list.h:78
+#: src/wx/config_dialog.cc:380 src/wx/editable_list.h:74
 msgid "Add..."
 msgstr "添加..."
 
-#: src/wx/cinema_dialog.cc:71 src/wx/config_dialog.cc:1271
+#: src/wx/config_dialog.cc:475
+msgid ""
+"Adding this certificate would make the chain inconsistent, so it will not be "
+"added. Add certificates in order from root to intermediate to leaf."
+msgstr ""
+"添加此证书将使链不一致，因此不会添加。 请按照root到intermediate到leaf顺序添加"
+"证书。"
+
+#: src/wx/cinema_dialog.cc:71 src/wx/full_config_dialog.cc:749
 msgid "Address"
 msgstr "地址"
 
-#: src/wx/colour_conversion_editor.cc:166
+#: src/wx/colour_conversion_editor.cc:177
 msgid "Adjust white point to"
 msgstr "调整白点"
 
-#: src/wx/config_dialog.cc:1431
+#: src/wx/config_dialog.cc:741 src/wx/config_dialog.cc:756
+msgid "Advanced..."
+msgstr "高级…"
+
+#: src/wx/full_config_dialog.cc:973
 msgid "Allow any DCP frame rate"
 msgstr "允许任何DCP帧速率"
 
@@ -213,54 +257,71 @@ msgstr "允许任何DCP帧速率"
 msgid "Alpha   0"
 msgstr "透明度 0"
 
-#: src/wx/kdm_dialog.cc:166
+#: src/wx/kdm_output_panel.cc:293
 msgid "An unknown exception occurred."
 msgstr "出现未知错误。"
 
-#: src/wx/subtitle_panel.cc:135
+#: src/wx/subtitle_panel.cc:145
 msgid "Appearance..."
 msgstr "显示..."
 
+#: src/wx/job_view.cc:134
+msgid "Are you sure you want to cancel this job?"
+msgstr "确定要取消当前任务吗？"
+
+#: src/wx/confirm_kdm_email_dialog.cc:33
+msgid ""
+"Are you sure you want to send emails to the following addresses?\n"
+"\n"
+msgstr ""
+"你确定要发送邮件到以下地址？\n"
+"\n"
+
 #: src/wx/timeline_labels_view.cc:41 src/wx/timeline_labels_view.cc:80
 msgid "Atmos"
 msgstr "全景声"
 
-#: src/wx/audio_dialog.cc:47 src/wx/audio_panel.cc:48
+#: src/wx/audio_dialog.cc:52 src/wx/audio_panel.cc:48
 #: src/wx/content_properties_dialog.cc:76 src/wx/dcp_panel.cc:115
 #: src/wx/timeline_labels_view.cc:39 src/wx/timeline_labels_view.cc:85
 msgid "Audio"
 msgstr "音频"
 
-#: src/wx/isdcf_metadata_dialog.cc:37
+#: src/wx/isdcf_metadata_dialog.cc:40
 msgid "Audio Language (e.g. EN)"
 msgstr "音频语言 (例如 CMN)"
 
-#: src/wx/audio_mapping_view.cc:342
+#: src/wx/player_information.cc:132
+#, c-format
+msgid "Audio channels: %d"
+msgstr "音频通道: %d"
+
+#: src/wx/audio_mapping_view.cc:345
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d unaltered."
 msgstr "音频将从 %d 传递到 DCP 通道 %d ，其值不变."
 
-#: src/wx/audio_mapping_view.cc:345
+#: src/wx/audio_mapping_view.cc:348
 #, c-format
 msgid ""
 "Audio will be passed from content channel %d to DCP channel %d with gain "
 "%.1fdB."
 msgstr "音频将从 %d 传递到 DCP 通道 %d ，增益 %.1fdB."
 
-#: src/wx/config_dialog.cc:212
+#: src/wx/full_config_dialog.cc:116
 msgid "Automatically analyse content audio"
 msgstr "自动解析源内容中的音频"
 
-#: src/wx/colour_conversion_editor.cc:71
+#: src/wx/colour_conversion_editor.cc:82
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1283
+#: src/wx/full_config_dialog.cc:760
 msgid "BCC address"
 msgstr "抄送地址"
 
-#: src/wx/colour_conversion_editor.cc:133
+#: src/wx/colour_conversion_editor.cc:144
 msgid "Blue chromaticity"
 msgstr "蓝色色度"
 
@@ -272,7 +333,7 @@ msgstr "字体文件"
 msgid "Bold font"
 msgstr "粗体"
 
-#: src/wx/video_panel.cc:140
+#: src/wx/video_panel.cc:151
 msgid "Bottom"
 msgstr "底部"
 
@@ -280,7 +341,7 @@ msgstr "底部"
 msgid "Browse..."
 msgstr "浏览..."
 
-#: src/wx/subtitle_panel.cc:64
+#: src/wx/subtitle_panel.cc:74
 msgid "Burn subtitles into image"
 msgstr "字幕以图像输出"
 
@@ -288,12 +349,12 @@ msgstr "字幕以图像输出"
 msgid "But I have to use fader"
 msgstr "使用推子"
 
-#: src/wx/config_dialog.cc:1272
+#: src/wx/full_config_dialog.cc:750
 msgid "CC addresses"
-msgstr "抄送地址 "
+msgstr "抄送地址"
 
-#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:81
-#: src/wx/self_dkdm_dialog.cc:59
+#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:85
+#: src/wx/self_dkdm_dialog.cc:60
 msgid "CPL"
 msgstr "CPL"
 
@@ -305,27 +366,37 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL注释文本"
 
-#: src/wx/kdm_dialog.cc:162
+#: src/wx/kdm_output_panel.cc:289
 msgid "CPL's content is not encrypted."
-msgstr "该内容没有加密"
+msgstr "该CPL内容没有加密."
 
-#: src/wx/audio_panel.cc:78
+#: src/wx/audio_panel.cc:89
 msgid "Calculate..."
 msgstr "计算..."
 
-#: src/wx/job_view.cc:47
+#: src/wx/job_view.cc:58
 msgid "Cancel"
 msgstr "取消"
 
-#: src/wx/content_sub_panel.cc:49
-msgid "Cannot reference this DCP.  "
-msgstr "不能引用该DCP"
+#: src/wx/content_sub_panel.cc:52
+#, fuzzy
+msgid "Cannot reference this DCP."
+msgstr "不能引用该DCP. "
+
+#: src/wx/content_sub_panel.cc:54
+#, fuzzy
+msgid "Cannot reference this DCP: "
+msgstr "不能引用该DCP. "
+
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Certificate chain"
+msgstr "证书秘钥"
 
 #: src/wx/dolby_doremi_certificate_panel.cc:204
 msgid "Certificate downloaded"
 msgstr "证书下载"
 
-#: src/wx/isdcf_metadata_dialog.cc:64
+#: src/wx/isdcf_metadata_dialog.cc:67
 msgid "Chain"
 msgstr "链接"
 
@@ -333,27 +404,35 @@ msgstr "链接"
 msgid "Channel gain"
 msgstr "信道增益"
 
-#: src/wx/audio_dialog.cc:81 src/wx/dcp_panel.cc:744
+#: src/wx/audio_dialog.cc:95 src/wx/dcp_panel.cc:752
 msgid "Channels"
 msgstr "通道"
 
-#: src/wx/config_dialog.cc:220
+#: src/wx/config_dialog.cc:180
 msgid "Check for testing updates on startup"
-msgstr "启动时检查更新（包括测试版）"
+msgstr "启动时检查软件更新"
 
-#: src/wx/config_dialog.cc:216
+#: src/wx/config_dialog.cc:176
 msgid "Check for updates on startup"
-msgstr "启动时检查更新"
+msgstr "启动时检查软件更新"
+
+#: src/wx/content_menu.cc:80
+msgid "Choose CPL..."
+msgstr "选择CPL…"
 
-#: src/wx/content_menu.cc:251
+#: src/wx/content_panel.cc:374
+msgid "Choose a DCP folder"
+msgstr "选择一个DCP文件夹"
+
+#: src/wx/content_menu.cc:296
 msgid "Choose a file"
 msgstr "选择一个文件"
 
-#: src/wx/content_panel.cc:276
+#: src/wx/content_panel.cc:301
 msgid "Choose a file or files"
 msgstr "选择一个或多个文件"
 
-#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:291 src/wx/content_panel.cc:329
 msgid "Choose a folder"
 msgstr "选择一个文件夹"
 
@@ -365,46 +444,50 @@ msgstr "选择字体"
 msgid "Choose a font file"
 msgstr "选择一个字体文件"
 
-#: src/wx/config_dialog.cc:201
+#: src/wx/full_config_dialog.cc:103
 msgid "Cinema and screen database file"
-msgstr "放映厅和荧幕数据库文件"
+msgstr "放映厅和银幕数据库文件"
 
-#: src/wx/content_widget.h:76
+#: src/wx/content_widget.h:79
 msgid "Click the button to set all selected content to the same value."
 msgstr "单击该按钮可将所有选定的内容为相同的值。"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:33
+#: src/wx/subtitle_appearance_dialog.cc:60
 msgid "Colour"
 msgstr "色彩空间"
 
-#: src/wx/content_colour_conversion_dialog.cc:37 src/wx/video_panel.cc:195
+#: src/wx/content_colour_conversion_dialog.cc:37 src/wx/video_panel.cc:206
 msgid "Colour conversion"
 msgstr "色彩转换"
 
 #. / TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
-#: src/wx/video_panel.cc:206
+#: src/wx/video_panel.cc:217
 msgid "Colour|Custom"
 msgstr "自定义"
 
-#: src/wx/video_waveform_dialog.cc:51
+#: src/wx/video_waveform_dialog.cc:58
 msgid "Component"
 msgstr "结构"
 
+#: src/wx/full_config_dialog.cc:98
+msgid "Configuration file"
+msgstr "配置文件"
+
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
-#: src/wx/config_dialog.cc:1479
+#: src/wx/full_config_dialog.cc:1029
 msgid "Config|Timing"
 msgstr "时间设置"
 
-#: src/wx/report_problem_dialog.cc:66
-msgid "Contact email"
-msgstr "邮箱地址"
+#: src/wx/confirm_kdm_email_dialog.cc:31
+msgid "Confirm KDM email"
+msgstr "确认接收KDM的电子邮件地址"
 
-#: src/wx/dcp_panel.cc:645
+#: src/wx/dcp_panel.cc:655
 msgid "Container"
-msgstr "格式"
+msgstr "封装格式"
 
-#: src/wx/audio_mapping_view.cc:437 src/wx/audio_mapping_view.cc:439
-#: src/wx/film_editor.cc:52
+#: src/wx/audio_mapping_view.cc:440 src/wx/audio_mapping_view.cc:442
+#: src/wx/film_editor.cc:53
 msgid "Content"
 msgstr "内容"
 
@@ -416,11 +499,11 @@ msgstr "内容属性"
 msgid "Content Type"
 msgstr "内容类型"
 
-#: src/wx/isdcf_metadata_dialog.cc:34
+#: src/wx/isdcf_metadata_dialog.cc:37
 msgid "Content version"
 msgstr "内容版本"
 
-#: src/wx/video_waveform_dialog.cc:54
+#: src/wx/video_waveform_dialog.cc:61
 msgid "Contrast"
 msgstr "对比度"
 
@@ -428,49 +511,66 @@ msgstr "对比度"
 msgid "Copy as name"
 msgstr "复制名称"
 
-#: src/wx/audio_dialog.cc:234
+#: src/wx/audio_dialog.cc:264
 msgid "Could not analyse audio."
 msgstr "无法分析音频。"
 
-#: src/wx/film_viewer.cc:203
+#: src/wx/config_dialog.cc:458
 #, c-format
-msgid "Could not get video for view (%s)"
-msgstr "无法获取视频 (%s)"
+msgid "Could not import certificate (%s)"
+msgstr "无法导入证书文件 (%s)"
 
-#: src/wx/content_menu.cc:327
-#, c-format
-msgid "Could not load KDM (%s)"
-msgstr "无法加载 KDM (%s)"
+#: src/wx/content_menu.cc:380
+msgid "Could not load KDM."
+msgstr "无法加载 KDM."
 
-#: src/wx/config_dialog.cc:788 src/wx/config_dialog.cc:956
-#: src/wx/download_certificate_panel.cc:56 src/wx/screen_dialog.cc:156
-#, c-format
-msgid "Could not read certificate file (%s)"
-msgstr "无法读取证书文件 (%s)"
+#: src/wx/config_dialog.cc:484 src/wx/config_dialog.cc:678
+#: src/wx/download_certificate_panel.cc:56 src/wx/screen_dialog.cc:157
+#: src/wx/screen_dialog.cc:162
+msgid "Could not read certificate file."
+msgstr "无法读取证书文件."
 
-#: src/wx/config_dialog.cc:947
+#: src/wx/config_dialog.cc:668
 #, c-format
 msgid "Could not read key file; file is too long (%s)"
 msgstr "无法读取Key文件，因为文件过长 (%s)"
 
-#: src/wx/new_film_dialog.cc:41
+#: src/wx/film_viewer.cc:853
+msgid ""
+"Could not set up audio output.  There will be no audio during the preview."
+msgstr "不能设置音频输出 (%s)。因此预览时将没有音频输出."
+
+#: src/wx/full_config_dialog.cc:876
+msgid "Cover Sheet"
+msgstr "封面"
+
+#: src/wx/film_name_location_dialog.cc:43
 msgid "Create in folder"
 msgstr "创建文件夹"
 
-#: src/wx/config_dialog.cc:231
+#: src/wx/full_config_dialog.cc:129
 msgid "Creator"
 msgstr "创建者"
 
-#: src/wx/video_panel.cc:100
+#: src/wx/video_panel.cc:111
 msgid "Crop"
 msgstr "裁剪"
 
-#: src/wx/audio_mapping_view.cc:472 src/wx/audio_mapping_view.cc:474
-#: src/wx/film_editor.cc:54
+#: src/wx/audio_dialog.cc:402
+#, c-format
+msgid "Cursor: %.1fdB at %s"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:396
+msgid "Cursor: none"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:475 src/wx/audio_mapping_view.cc:477
+#: src/wx/film_editor.cc:55 src/wx/player_information.cc:53
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/config_dialog.cc:1452
+#: src/wx/full_config_dialog.cc:1002
 msgid "DCP asset filename format"
 msgstr "DCP内容的文件名格式"
 
@@ -478,94 +578,133 @@ msgstr "DCP内容的文件名格式"
 msgid "DCP directory"
 msgstr "DCP目录"
 
-#: src/wx/config_dialog.cc:1440
+#: src/wx/full_config_dialog.cc:990
 msgid "DCP metadata filename format"
 msgstr "DCP元数据的文件名格式"
 
-#: src/wx/about_dialog.cc:50 src/wx/wx_util.cc:90 src/wx/wx_util.cc:102
-#: src/wx/wx_util.cc:110
+#: src/wx/verify_dcp_dialog.cc:51
+msgid "DCP validates OK."
+msgstr ""
+
+#: src/wx/verify_dcp_dialog.cc:32
+#, fuzzy
+msgid "DCP verification"
+msgstr "证书秘钥"
+
+#: src/wx/about_dialog.cc:50 src/wx/wx_util.cc:93 src/wx/wx_util.cc:108
+#: src/wx/wx_util.cc:116
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:139
-msgid "DCP-o-matic audio"
+#: src/wx/audio_dialog.cc:155
+#, fuzzy, c-format
+msgid "DCP-o-matic audio - %s"
 msgstr "DCP-o-matic音频"
 
-#: src/wx/config_dialog.cc:1481
+#: src/wx/full_config_dialog.cc:1031
 msgid "Debug: decode"
 msgstr "解码"
 
-#: src/wx/config_dialog.cc:1485
+#: src/wx/full_config_dialog.cc:1035
 msgid "Debug: email sending"
 msgstr "发送到邮箱"
 
-#: src/wx/config_dialog.cc:1483
+#: src/wx/full_config_dialog.cc:1033
 msgid "Debug: encode"
 msgstr "编码"
 
-#: src/wx/config_dialog.cc:1037
-msgid "Decrypting DCPs"
-msgstr "解密DCP"
+#: src/wx/player_information.cc:159
+#, c-format
+msgid "Decode resolution: %dx%d"
+msgstr "解码分辨率: %dx%d"
+
+#: src/wx/config_dialog.cc:728 src/wx/config_dialog.cc:765
+msgid "Decrypting KDMs"
+msgstr "解密KDMs中"
 
-#: src/wx/config_dialog.cc:437
+#: src/wx/full_config_dialog.cc:306
 msgid "Default DCP audio channels"
 msgstr "默认DCP音频通道"
 
-#: src/wx/config_dialog.cc:425
+#: src/wx/full_config_dialog.cc:290
 msgid "Default ISDCF name details"
 msgstr "默认ISDCF名称的详细信息"
 
-#: src/wx/config_dialog.cc:442
+#: src/wx/full_config_dialog.cc:311
 msgid "Default JPEG2000 bandwidth"
 msgstr "默认JPEG2000码率"
 
-#: src/wx/config_dialog.cc:451
+#: src/wx/full_config_dialog.cc:332
+msgid "Default KDM directory"
+msgstr "默认KDM目录"
+
+#: src/wx/full_config_dialog.cc:320
 msgid "Default audio delay"
 msgstr "默认音频延迟"
 
-#: src/wx/config_dialog.cc:429
+#: src/wx/full_config_dialog.cc:294
 msgid "Default container"
 msgstr "默认显示比例"
 
-#: src/wx/config_dialog.cc:433
+#: src/wx/full_config_dialog.cc:302
 msgid "Default content type"
 msgstr "默认类型"
 
-#: src/wx/config_dialog.cc:417
+#: src/wx/full_config_dialog.cc:282
 msgid "Default directory for new films"
 msgstr "新工程默认目录"
 
-#: src/wx/config_dialog.cc:409
+#: src/wx/full_config_dialog.cc:274
 msgid "Default duration of still images"
-msgstr "默认持续时间"
+msgstr "默认持续时间(黑场)"
 
-#: src/wx/config_dialog.cc:459
+#: src/wx/full_config_dialog.cc:298
+msgid "Default scale-to"
+msgstr "默认缩放比例"
+
+#: src/wx/full_config_dialog.cc:328
 msgid "Default standard"
-msgstr "默认打包类型"
+msgstr "默认打包标准类型"
+
+#: src/wx/full_config_dialog.cc:341
+msgid "Default to enabling upload of DCP to TMS"
+msgstr "默认开启DCP自动上传到TMS"
 
-#: src/wx/config_dialog.cc:391
+#: src/wx/full_config_dialog.cc:256
 msgid "Defaults"
 msgstr "默认"
 
-#: src/wx/audio_panel.cc:82
+#: src/wx/audio_panel.cc:93
 msgid "Delay"
 msgstr "延迟"
 
-#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:57
+#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:62
 msgid "Details..."
 msgstr "详细..."
 
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Do nothing"
+msgstr "不做更改"
+
 #: src/wx/download_certificate_dialog.cc:37
 msgid "Dolby / Doremi"
 msgstr "杜比 / 哆来咪"
 
+#: src/wx/confirm_kdm_email_dialog.cc:40 src/wx/recreate_chain_dialog.cc:39
+msgid "Don't ask this again"
+msgstr "不再询问"
+
+#: src/wx/confirm_kdm_email_dialog.cc:31
+msgid "Don't send emails"
+msgstr "不发送电子邮件"
+
 #: src/wx/hints_dialog.cc:45
 msgid "Don't show hints again"
 msgstr "不再显示小提示"
 
-#: src/wx/content_panel.cc:97
-msgid "Down"
-msgstr "下移"
+#: src/wx/nag_dialog.cc:36
+msgid "Don't show this message again"
+msgstr "不再显示小提示"
 
 #: src/wx/download_certificate_dialog.cc:39
 msgid "Download"
@@ -575,7 +714,7 @@ msgstr "下载"
 msgid "Download certificate"
 msgstr "下载证书"
 
-#: src/wx/screen_dialog.cc:90
+#: src/wx/screen_dialog.cc:91
 msgid "Download..."
 msgstr "下载..."
 
@@ -583,35 +722,53 @@ msgstr "下载..."
 msgid "Downloading certificate"
 msgstr "下载证书"
 
+#: src/wx/player_information.cc:89
+#, c-format
+msgid "Dropped frames: %d"
+msgstr "丢帧: %d"
+
+#: src/wx/content_panel.cc:104
+msgid "Earlier"
+msgstr "上移"
+
 #: src/wx/screens_panel.cc:59
 msgid "Edit Cinema..."
-msgstr "编辑影城..."
+msgstr "编辑影院…"
 
 #: src/wx/screens_panel.cc:65
 msgid "Edit Screen..."
-msgstr "编辑荧幕（放映服务器）..."
+msgstr "编辑放映厅服务器（证书）"
 
 #: src/wx/screens_panel.cc:170
 msgid "Edit cinema"
-msgstr "编辑影城"
+msgstr "编辑影院"
 
-#: src/wx/screens_panel.cc:232
+#: src/wx/screens_panel.cc:246
 msgid "Edit screen"
-msgstr "编辑荧幕（放映服务器）"
+msgstr "编辑放映厅服务器（证书）"
 
-#: src/wx/audio_mapping_view.cc:168 src/wx/config_dialog.cc:426
-#: src/wx/dcp_panel.cc:134 src/wx/fonts_dialog.cc:78 src/wx/video_panel.cc:188
-#: src/wx/video_panel.cc:209 src/wx/editable_list.h:81
+#: src/wx/audio_mapping_view.cc:169 src/wx/dcp_panel.cc:134
+#: src/wx/fonts_dialog.cc:78 src/wx/full_config_dialog.cc:291
+#: src/wx/video_panel.cc:199 src/wx/video_panel.cc:220
+#: src/wx/editable_list.h:77
 msgid "Edit..."
 msgstr "编辑..."
 
-#: src/wx/email_dialog.cc:28 src/wx/email_dialog.cc:30
+#: src/wx/subtitle_appearance_dialog.cc:63
+msgid "Effect"
+msgstr "效果"
+
+#: src/wx/subtitle_appearance_dialog.cc:66
+msgid "Effect colour"
+msgstr "效果颜色"
+
+#: src/wx/email_dialog.cc:29 src/wx/email_dialog.cc:31
 msgid "Email address"
-msgstr "发件人地址 "
+msgstr "发件人地址"
 
 #: src/wx/cinema_dialog.cc:65
 msgid "Email addresses for KDM delivery"
-msgstr "发送KDM到邮箱 "
+msgstr "发送KDM到邮箱"
 
 #: src/wx/servers_list_dialog.cc:33
 msgid "Encoding Servers"
@@ -621,109 +778,144 @@ msgstr "编码服务器"
 msgid "Encrypted"
 msgstr "加密"
 
-#: src/wx/subtitle_view.cc:48
+#: src/wx/subtitle_view.cc:51
 msgid "End"
 msgstr "结束"
 
-#: src/wx/config_dialog.cc:1476
+#: src/wx/report_problem_dialog.cc:109
+#, c-format
+msgid "Enter your email address for the contact, not %s"
+msgstr "请输入您的电子邮件地址，不是 %s"
+
+#: src/wx/full_config_dialog.cc:1026
 msgid "Errors"
 msgstr "错误"
 
-#: src/wx/config_dialog.cc:715
+#: src/wx/config_dialog.cc:384
 msgid "Export"
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1044
-msgid ""
-"Export DCP decryption\n"
-"certificate..."
-msgstr "导出DCP证书"
+#: src/wx/config_dialog.cc:733
+msgid "Export KDM decryption certificate..."
+msgstr "导出KDM解密证书…"
 
-#: src/wx/config_dialog.cc:1046
-msgid ""
-"Export DCP decryption\n"
-"chain..."
-msgstr "导出DCP密匙"
+#: src/wx/config_dialog.cc:735
+msgid "Export KDM decryption chain..."
+msgstr "导出KDM解密密匙…"
 
-#: src/wx/config_dialog.cc:732
+#: src/wx/config_dialog.cc:737
+msgid "Export all KDM decryption settings..."
+msgstr "导出所有KDM加密设置…"
+
+#: src/wx/export_dialog.cc:47
+msgid "Export film"
+msgstr "导出工程"
+
+#: src/wx/config_dialog.cc:401
 msgid "Export..."
-msgstr "导出"
+msgstr "导出…"
 
-#: src/wx/config_dialog.cc:1152
+#: src/wx/full_config_dialog.cc:630
 msgid "FTP (for Dolby)"
 msgstr "FTP (Dolby)"
 
-#: src/wx/isdcf_metadata_dialog.cc:52
+#: src/wx/isdcf_metadata_dialog.cc:55
 msgid "Facility (e.g. DLA)"
 msgstr "设备(例如:DLA)"
 
-#: src/wx/video_panel.cc:154
+#: src/wx/video_panel.cc:165
 msgid "Fade in"
 msgstr "淡入"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:53
+#: src/wx/subtitle_appearance_dialog.cc:74
 msgid "Fade in time"
 msgstr "淡入时间"
 
-#: src/wx/video_panel.cc:159
+#: src/wx/video_panel.cc:170
 msgid "Fade out"
 msgstr "淡出"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:57
+#: src/wx/subtitle_appearance_dialog.cc:77
 msgid "Fade out time"
 msgstr "淡出时间"
 
-#: src/wx/kdm_output_panel.cc:50
+#: src/wx/kdm_dialog.cc:132
+#, c-format
+msgid "File %s already exists.  Do you want to overwrite it?"
+msgstr "已存在文件 %s ，是否覆盖？"
+
+#: src/wx/kdm_output_panel.cc:80
 msgid "Filename format"
 msgstr "文件名格式"
 
-#: src/wx/new_film_dialog.cc:38
+#: src/wx/film_name_location_dialog.cc:40
 msgid "Film name"
 msgstr "工程名称"
 
-#: src/wx/filter_dialog.cc:33 src/wx/video_panel.cc:182
+#: src/wx/filter_dialog.cc:33 src/wx/video_panel.cc:193
 msgid "Filters"
 msgstr "过滤器"
 
-#: src/wx/config_dialog.cc:207
+#: src/wx/full_config_dialog.cc:111
 msgid ""
 "Find integrated loudness, true peak and loudness range when analysing audio"
-msgstr "分析音频时，发现综合响度，真实峰值和响度范围！"
+msgstr "发现响度，峰值和响度范围不合标准"
 
-#: src/wx/content_menu.cc:65
+#: src/wx/content_menu.cc:73
 msgid "Find missing..."
-msgstr "寻找丢失..."
+msgstr "查询失败..."
+
+#: src/wx/kdm_output_panel.cc:66
+msgid "Folder / ZIP name format"
+msgstr "文件夹/ZIP名称格式"
+
+#: src/wx/new_dkdm_folder_dialog.cc:26
+msgid "Folder name"
+msgstr "文件夹名称"
 
 #: src/wx/fonts_dialog.cc:38 src/wx/font_files_dialog.cc:28
 #: src/wx/font_files_dialog.cc:30
 msgid "Fonts"
-msgstr "字体..."
+msgstr "字体"
 
-#: src/wx/subtitle_panel.cc:133
+#: src/wx/subtitle_panel.cc:143
 msgid "Fonts..."
 msgstr "字体..."
 
-#: src/wx/dcp_panel.cc:656
+#: src/wx/export_dialog.cc:49
+msgid "Format"
+msgstr "格式"
+
+#: src/wx/dcp_panel.cc:671
 msgid "Frame Rate"
-msgstr "帧速率"
+msgstr "帧率"
 
 #: src/wx/image_sequence_dialog.cc:30
 msgid "Frame rate"
-msgstr "帧速率"
+msgstr "帧率"
+
+#: src/wx/player_information.cc:129
+#, c-format
+msgid "Frame rate: %d"
+msgstr "帧速率: %d"
 
 #: src/wx/about_dialog.cc:66
 msgid "Free, open-source DCP creation from almost anything."
-msgstr "免费的DCP打包软件。 -汉化：汉源"
+msgstr "免费的DCP打包软件."
 
 #: src/wx/kdm_timing_panel.cc:36
 msgid "From"
 msgstr "起始"
 
-#: src/wx/config_dialog.cc:1266
+#: src/wx/full_config_dialog.cc:744
 msgid "From address"
 msgstr "发件人地址"
 
-#: src/wx/audio_mapping_view.cc:166
+#: src/wx/film_name_location_dialog.cc:59
+msgid "From template"
+msgstr "从模板"
+
+#: src/wx/audio_mapping_view.cc:167
 msgid "Full"
 msgstr "总"
 
@@ -735,7 +927,7 @@ msgstr "总长度"
 msgid "GB"
 msgstr "GB"
 
-#: src/wx/audio_panel.cc:66
+#: src/wx/audio_panel.cc:77
 msgid "Gain"
 msgstr "增益(+/-)"
 
@@ -748,13 +940,13 @@ msgstr "增益计算"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "从内容通道  %d 到DCP %d 通道进行增益调整"
 
-#: src/wx/config_dialog.cc:1472 src/wx/content_properties_dialog.cc:70
+#: src/wx/content_properties_dialog.cc:70 src/wx/full_config_dialog.cc:1022
 msgid "General"
 msgstr "普通"
 
-#: src/wx/screen_dialog.cc:89
+#: src/wx/screen_dialog.cc:90
 msgid "Get from file..."
-msgstr "外置字体 "
+msgstr "从文件获取…"
 
 #: src/wx/hints_dialog.cc:56
 msgid "Go back"
@@ -773,10 +965,22 @@ msgstr "跳转到帧"
 msgid "Go to timecode"
 msgstr "跳转到时间码"
 
-#: src/wx/colour_conversion_editor.cc:126
+#: src/wx/colour_conversion_editor.cc:137
 msgid "Green chromaticity"
 msgstr "绿色色度"
 
+#: src/wx/full_config_dialog.cc:358
+msgid "Guess from content"
+msgstr "匹配源"
+
+#: src/wx/export_dialog.cc:33
+msgid "H.264"
+msgstr "H.264"
+
+#: src/wx/batch_job_view.cc:44
+msgid "Higher priority"
+msgstr "高场优先"
+
 #: src/wx/hints_dialog.cc:37
 msgid "Hints"
 msgstr "温馨提示"
@@ -785,52 +989,82 @@ msgstr "温馨提示"
 msgid "Host"
 msgstr "服务器"
 
-#: src/wx/server_dialog.cc:39
+#: src/wx/server_dialog.cc:40
 msgid "Host name or IP address"
-msgstr "服务器名称或IP地址"
+msgstr "服务器地址或IP地址"
 
 #: src/wx/gain_calculator_dialog.cc:28
 msgid "I want to play this back at fader"
-msgstr "主机名或IP地址"
+msgstr "使用推子"
 
 #: src/wx/fonts_dialog.cc:46
 msgid "ID"
 msgstr "ID"
 
-#: src/wx/config_dialog.cc:1135
+#: src/wx/full_config_dialog.cc:613
 msgid "IP address"
 msgstr "IP地址"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/full_config_dialog.cc:549
 msgid "IP address / host name"
-msgstr "IP地址/服务器名称"
+msgstr "IP地址/服务器地址"
 
-#: src/wx/isdcf_metadata_dialog.cc:32
+#: src/wx/isdcf_metadata_dialog.cc:35
 msgid "ISDCF name"
 msgstr "ISDCF名称"
 
-#: src/wx/video_waveform_dialog.cc:61
+#: src/wx/config_dialog.cc:859
+msgid ""
+"If you continue with this operation you will no longer be able to use any "
+"DKDMs that you have created.  Also, any KDMs that have been sent to you will "
+"become useless.  Proceed with caution!"
+msgstr ""
+"如果继续您将无法使用之前生成的所有数字母版DKDM和KDM。\n"
+"谨慎操作!"
+
+#: src/wx/video_waveform_dialog.cc:68
 msgid "Image X position"
-msgstr "画面X轴位置"
+msgstr "画面 X 轴位置"
+
+#: src/wx/config_dialog.cc:739
+msgid "Import all KDM decryption settings..."
+msgstr "导入所有KDM解密设置…"
+
+#: src/wx/config_dialog.cc:399
+msgid "Import..."
+msgstr "导入…"
 
-#: src/wx/colour_conversion_editor.cc:55
+#: src/wx/nag_dialog.cc:29
+msgid "Important notice"
+msgstr "重要提示"
+
+#: src/wx/servers_list_dialog.cc:89
+#, fuzzy
+msgid "Incorrect version"
+msgstr "内容版本"
+
+#: src/wx/colour_conversion_editor.cc:66
 msgid "Input gamma"
 msgstr "伽马值"
 
-#: src/wx/colour_conversion_editor.cc:49
+#: src/wx/colour_conversion_editor.cc:56
 msgid "Input gamma correction"
 msgstr "伽玛校正"
 
-#: src/wx/colour_conversion_editor.cc:60
+#: src/wx/colour_conversion_editor.cc:71
 msgid "Input power"
 msgstr "功率"
 
-#: src/wx/audio_dialog.cc:339
+#: src/wx/colour_conversion_editor.cc:58
+msgid "Input transfer function"
+msgstr "输入变换功能"
+
+#: src/wx/audio_dialog.cc:368
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "平均响度 %.2f LUFS"
 
-#: src/wx/config_dialog.cc:858
+#: src/wx/config_dialog.cc:558
 msgid "Intermediate"
 msgstr "公钥"
 
@@ -838,13 +1072,21 @@ msgstr "公钥"
 msgid "Intermediate common name"
 msgstr "公钥名称"
 
-#: src/wx/config_dialog.cc:494 src/wx/dcp_panel.cc:191
+#: src/wx/dcp_panel.cc:190 src/wx/full_config_dialog.cc:382
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/config_dialog.cc:227
+#: src/wx/config_dialog.cc:847
+msgid "Invalid DCP-o-matic export file"
+msgstr "DCP-o-matic无法输出此类格式"
+
+#: src/wx/colour_conversion_editor.cc:205
+msgid "Inverse 2.6 gamma correction on output"
+msgstr "输出时添加反转的2.6伽马值"
+
+#: src/wx/full_config_dialog.cc:125
 msgid "Issuer"
-msgstr "发行商"
+msgstr "发行"
 
 #: src/wx/fonts_dialog.cc:62
 msgid "Italic file"
@@ -854,30 +1096,34 @@ msgstr "斜体文件"
 msgid "Italic font"
 msgstr "斜体"
 
-#: src/wx/dcp_panel.cc:680
+#: src/wx/dcp_panel.cc:690
 msgid ""
 "JPEG2000 bandwidth\n"
 "for newly-encoded data"
-msgstr "上次使用的JPEG2000码率"
+msgstr "JPEG2000码率"
 
-#: src/wx/content_menu.cc:64
+#: src/wx/content_menu.cc:72
 msgid "Join"
 msgstr "创建"
 
-#: src/wx/config_dialog.cc:1225
+#: src/wx/film_viewer.cc:118
+msgid "Jump to selected content"
+msgstr "跳转到已选择的内容"
+
+#: src/wx/full_config_dialog.cc:703
 msgid "KDM Email"
-msgstr "Email KDM"
+msgstr "邮件发送 KDM"
 
-#: src/wx/kdm_output_panel.cc:38
+#: src/wx/kdm_output_panel.cc:52
 msgid "KDM type"
 msgstr "KDM类型"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/wx/kdm_dialog.cc:74
+#: src/wx/kdm_dialog.cc:78
 msgid "KDM|Timing"
-msgstr "时间窗口"
+msgstr "KDM有效期"
 
-#: src/wx/timeline_dialog.cc:44
+#: src/wx/timeline_dialog.cc:58
 msgid "Keep video and subtitles in sequence"
 msgstr "保持视频序列和字幕序列"
 
@@ -885,15 +1131,19 @@ msgstr "保持视频序列和字幕序列"
 msgid "Key"
 msgstr "键值"
 
-#: src/wx/config_dialog.cc:1014
+#: src/wx/config_dialog.cc:716
 msgid "Keys"
 msgstr "键值"
 
-#: src/wx/subtitle_panel.cc:118
+#: src/wx/subtitle_panel.cc:128
 msgid "Language"
 msgstr "语言"
 
-#: src/wx/config_dialog.cc:856
+#: src/wx/content_panel.cc:108
+msgid "Later"
+msgstr "下移"
+
+#: src/wx/config_dialog.cc:556
 msgid "Leaf"
 msgstr "私钥"
 
@@ -901,15 +1151,19 @@ msgstr "私钥"
 msgid "Leaf common name"
 msgstr "私钥名称"
 
-#: src/wx/config_dialog.cc:724
+#: src/wx/config_dialog.cc:393
 msgid "Leaf private key"
 msgstr "私钥"
 
-#: src/wx/video_panel.cc:105
+#: src/wx/config_dialog.cc:411
+msgid "Leaf private key does not match leaf certificate!"
+msgstr "私人秘钥private key与提供的证书certificate不匹配!"
+
+#: src/wx/video_panel.cc:116
 msgid "Left"
 msgstr "左边"
 
-#: src/wx/film_viewer.cc:70
+#: src/wx/film_viewer.cc:79
 msgid "Left eye"
 msgstr "左眼"
 
@@ -917,48 +1171,56 @@ msgstr "左眼"
 msgid "Length"
 msgstr "长度"
 
-#: src/wx/subtitle_panel.cc:109
+#: src/wx/player_information.cc:145
+msgid "Length: %1 (%2 frames)"
+msgstr "长度: %1 (%2 帧)"
+
+#: src/wx/subtitle_panel.cc:119
 msgid "Line spacing"
 msgstr "行间距"
 
-#: src/wx/colour_conversion_editor.cc:51
-msgid "Linearise input gamma curve for small values"
-msgstr "对齐低位的伽马值"
-
-#: src/wx/config_dialog.cc:730
-msgid "Load..."
-msgstr "加载..."
-
-#: src/wx/config_dialog.cc:1470
+#: src/wx/full_config_dialog.cc:1020
 msgid "Log"
 msgstr "日志"
 
-#: src/wx/audio_dialog.cc:348
+#: src/wx/audio_dialog.cc:377
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "响度范围 %.2f LU"
 
-#: src/wx/content_panel.cc:506
+#: src/wx/batch_job_view.cc:47
+msgid "Lower priority"
+msgstr "低场优先"
+
+#: src/wx/content_panel.cc:571
 msgid "MISSING: "
-msgstr "丢失:"
+msgstr "丢失: "
 
-#: src/wx/config_dialog.cc:1258
+#: src/wx/export_dialog.cc:37
+msgid "MOV files (*.mov)|*.mov"
+msgstr "MOV 文件 (*.mov)|*.mov"
+
+#: src/wx/export_dialog.cc:38
+msgid "MP4 files (*.mp4)|*.mp4"
+msgstr "MP4 文件 (*.mp4)|*.mp4"
+
+#: src/wx/full_config_dialog.cc:736
 msgid "Mail password"
 msgstr "邮箱登录密码"
 
-#: src/wx/config_dialog.cc:1254
+#: src/wx/full_config_dialog.cc:732
 msgid "Mail user name"
 msgstr "邮箱用户名"
 
 #: src/wx/hints_dialog.cc:55
 msgid "Make DCP anyway"
-msgstr "无论如何制作DCP"
+msgstr "强制制作DCP"
 
-#: src/wx/self_dkdm_dialog.cc:49
+#: src/wx/self_dkdm_dialog.cc:50
 msgid "Make DKDM for DCP-o-matic"
-msgstr "制作DCP-o-matic DKDM"
+msgstr "制作 KDM(DCP-o-matic)"
 
-#: src/wx/kdm_dialog.cc:50 src/wx/kdm_dialog.cc:94
+#: src/wx/kdm_dialog.cc:54 src/wx/kdm_dialog.cc:98
 msgid "Make KDMs"
 msgstr "创建KDM"
 
@@ -966,44 +1228,56 @@ msgstr "创建KDM"
 msgid "Make certificate chain"
 msgstr "创建证书"
 
-#: src/wx/isdcf_metadata_dialog.cc:74
+#: src/wx/isdcf_metadata_dialog.cc:77
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr "要求亮度(例如:14FL)"
 
-#: src/wx/colour_conversion_editor.cc:116
+#: src/wx/colour_conversion_editor.cc:127
 msgid "Matrix"
 msgstr "矩阵"
 
-#: src/wx/config_dialog.cc:1423
+#: src/wx/full_config_dialog.cc:965
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "最大JPEG2000码率"
 
-#: src/wx/config_dialog.cc:446 src/wx/config_dialog.cc:1427
-#: src/wx/dcp_panel.cc:684
+#: src/wx/full_config_dialog.cc:982
+msgid "Maximum number of frames to store per thread"
+msgstr "设置每个线程处理的最大帧数"
+
+#: src/wx/dcp_panel.cc:694 src/wx/full_config_dialog.cc:315
+#: src/wx/full_config_dialog.cc:969
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
+#: src/wx/export_dialog.cc:53
+msgid "Mix audio down to stereo"
+msgstr "将所有音频轨混到一个双声道轨"
+
+#: src/wx/config_move_dialog.cc:28
+msgid "Move configuration"
+msgstr "移动设置"
+
 #: src/wx/move_to_dialog.cc:31
 msgid "Move content"
 msgstr "分卷内容"
 
-#: src/wx/content_panel.cc:94
+#: src/wx/content_panel.cc:105
 msgid "Move the selected piece of content earlier in the film."
-msgstr "移动选择部分之前内容"
+msgstr "前移选择内容."
 
-#: src/wx/content_panel.cc:98
+#: src/wx/content_panel.cc:109
 msgid "Move the selected piece of content later in the film."
-msgstr "移动选择部分之后内容"
+msgstr "后移选择内容."
 
 #: src/wx/timing_panel.cc:93
 msgid "Move to start of reel"
 msgstr "分卷设置"
 
-#: src/wx/video_panel.cc:375
+#: src/wx/video_panel.cc:386
 msgid "Multiple content selected"
 msgstr "选择多个文件"
 
-#: src/wx/content_widget.h:67
+#: src/wx/content_widget.h:70
 msgid "Multiple values"
 msgstr "多值"
 
@@ -1011,45 +1285,55 @@ msgstr "多值"
 msgid "My Documents"
 msgstr "我的文档"
 
-#: src/wx/report_problem_dialog.cc:49
+#: src/wx/report_problem_dialog.cc:51
 msgid "My problem is"
 msgstr "错误内容"
 
-#: src/wx/content_panel.cc:510
+#: src/wx/content_panel.cc:575
 msgid "NEEDS KDM: "
-msgstr "用KDM:"
+msgstr "需要KDM: "
+
+#: src/wx/content_panel.cc:579
+msgid "NEEDS OV: "
+msgstr "需要OV: "
 
-#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:72 src/wx/screen_dialog.cc:67
+#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:72 src/wx/screen_dialog.cc:68
 msgid "Name"
 msgstr "名称"
 
-#: src/wx/new_film_dialog.cc:36
-msgid "New Film"
-msgstr "新建工程"
+#: src/wx/player_information.cc:121
+msgid "Needs KDM"
+msgstr "需要KDM"
+
+#: src/wx/player_information.cc:116
+msgid "Needs OV"
+msgstr "需要OV"
+
+#: src/wx/rename_template_dialog.cc:26
+msgid "New name"
+msgstr "新名称"
 
 #: src/wx/update_dialog.cc:38
 msgid "New versions of DCP-o-matic are available."
-msgstr "DCP-o-Matic有新版本"
+msgstr "有新版本的DCP-o-matic可用."
 
-#: src/wx/content_sub_panel.cc:47
-msgid "No DCP selected."
-msgstr "没有选择DCP"
+#: src/wx/player_information.cc:104
+msgid "No DCP loaded."
+msgstr "没有选择DCP."
 
-#: src/wx/audio_mapping_view.cc:340
+#: src/wx/audio_mapping_view.cc:343
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "视频中没有音频，从 %d 到 %d 通道的DCP."
 
-#: src/wx/content_panel.cc:323
+#: src/wx/content_panel.cc:348
 msgid "No content found in this folder."
-msgstr "没有找到文件！"
+msgstr "文件夹中没有找到文件."
 
-#: src/wx/text_subtitle_appearance_dialog.cc:37
-msgid "No effect"
-msgstr "无效果"
-
-#: src/wx/dcp_panel.cc:752 src/wx/video_panel.cc:186 src/wx/video_panel.cc:200
-#: src/wx/video_panel.cc:304
+#. /OUTLINE/SHADOW variables
+#: src/wx/dcp_panel.cc:760 src/wx/subtitle_appearance_dialog.cc:125
+#: src/wx/video_panel.cc:197 src/wx/video_panel.cc:211
+#: src/wx/video_panel.cc:315
 msgid "None"
 msgstr "无"
 
@@ -1061,25 +1345,33 @@ msgstr "普通文件"
 msgid "Normal font"
 msgstr "普通字体"
 
-#: src/wx/cinema_dialog.cc:60 src/wx/screen_dialog.cc:72
+#: src/wx/cinema_dialog.cc:60 src/wx/screen_dialog.cc:73
 msgid "Notes"
 msgstr "记录"
 
-#: src/wx/audio_mapping_view.cc:165
+#: src/wx/full_config_dialog.cc:93
+msgid "Number of threads DCP-o-matic encode server should use"
+msgstr "多个DCP-o-matic 编码服务器将被使用"
+
+#: src/wx/full_config_dialog.cc:88
+msgid "Number of threads DCP-o-matic should use"
+msgstr "多个DCP-o-matic 将被使用"
+
+#: src/wx/audio_mapping_view.cc:166
 msgid "Off"
 msgstr "关闭"
 
-#: src/wx/config_dialog.cc:1435
+#: src/wx/full_config_dialog.cc:977
 msgid "Only servers encode"
 msgstr "仅在编码服务器编码"
 
-#: src/wx/config_dialog.cc:1491
+#: src/wx/full_config_dialog.cc:1041
 msgid "Open console window"
 msgstr "打开控制台窗口"
 
-#: src/wx/content_panel.cc:102
+#: src/wx/content_panel.cc:113
 msgid "Open the timeline for the film."
-msgstr "打开工程时间表"
+msgstr "打开工程时间线."
 
 #: src/wx/make_chain_dialog.cc:51
 msgid "Organisation"
@@ -1089,52 +1381,88 @@ msgstr "团队"
 msgid "Organisational unit"
 msgstr "组织"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:98
 msgid "Other trusted devices"
-msgstr "其它可信设备"
+msgstr "其它可信设备(服务器设备)"
 
-#: src/wx/config_dialog.cc:1242
+#: src/wx/full_config_dialog.cc:720
 msgid "Outgoing mail server"
-msgstr "发送邮件服务器"
+msgstr "发送邮件服务器地址"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:41
+#: src/wx/subtitle_appearance_dialog.cc:126
 msgid "Outline"
 msgstr "缩略视图"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:49
-msgid "Outline / shadow colour"
-msgstr "缩略视图轮廓颜色"
-
-#: src/wx/film_viewer.cc:69
+#: src/wx/film_viewer.cc:112
 msgid "Outline content"
 msgstr "缩略视图内容"
 
-#: src/wx/kdm_dialog.cc:88 src/wx/self_dkdm_dialog.cc:66
+#: src/wx/subtitle_appearance_dialog.cc:69
+msgid "Outline width"
+msgstr "轮廓线宽度"
+
+#: src/wx/subtitle_appearance_dialog.cc:276
+msgid "Outline width cannot be set unless you are burning in subtitles"
+msgstr "只有选择烧录字幕才能显示轮廓线"
+
+#: src/wx/kdm_dialog.cc:92 src/wx/self_dkdm_dialog.cc:67
 msgid "Output"
 msgstr "输出"
 
-#: src/wx/config_dialog.cc:1147
+#: src/wx/export_dialog.cc:55
+msgid "Output file"
+msgstr "输出文件"
+
+#: src/wx/colour_conversion_editor.cc:203
+msgid "Output gamma correction"
+msgstr "输出伽玛校正"
+
+#: src/wx/config_move_dialog.cc:30
+msgid "Overwrite this file with current configuration"
+msgstr "使用正确的设置改写这个文件"
+
+#: src/wx/full_config_dialog.cc:625
 msgid "Password"
 msgstr "密码"
 
-#: src/wx/job_view.cc:52 src/wx/job_view.cc:132
+#: src/wx/paste_dialog.cc:24
+msgid "Paste"
+msgstr "黏贴"
+
+#: src/wx/paste_dialog.cc:29
+msgid "Paste audio settings"
+msgstr "黏贴音频设置"
+
+#: src/wx/paste_dialog.cc:32
+msgid "Paste subtitle settings"
+msgstr "黏贴字幕设置"
+
+#: src/wx/paste_dialog.cc:26
+msgid "Paste video settings"
+msgstr "黏贴视频设置"
+
+#: src/wx/normal_job_view.cc:37 src/wx/normal_job_view.cc:53
 msgid "Pause"
 msgstr "暂停"
 
-#: src/wx/audio_dialog.cc:103
+#: src/wx/audio_dialog.cc:118
 msgid "Peak"
 msgstr "最佳"
 
-#: src/wx/audio_panel.cc:328
+#: src/wx/audio_panel.cc:332
 #, c-format
 msgid "Peak: %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_panel.cc:330 src/wx/audio_panel.cc:333
+#: src/wx/audio_panel.cc:334
 msgid "Peak: unknown"
 msgstr "最佳值: 未知"
 
-#: src/wx/film_viewer.cc:77
+#: src/wx/player_information.cc:71
+msgid "Performance"
+msgstr "偏好设置"
+
+#: src/wx/film_viewer.cc:88
 msgid "Play"
 msgstr "播放"
 
@@ -1142,13 +1470,17 @@ msgstr "播放"
 msgid "Play length"
 msgstr "播放长度"
 
-#: src/wx/report_problem_dialog.cc:102
+#: src/wx/config_dialog.cc:155
+msgid "Play sound via"
+msgstr "声音播放设备"
+
+#: src/wx/report_problem_dialog.cc:104
 msgid ""
 "Please enter an email address so that we can contact you with any queries "
 "about the problem."
 msgstr "请输入您的电子邮件，以便我们可以与您取得联系。"
 
-#: src/wx/audio_plot.cc:93
+#: src/wx/audio_plot.cc:99
 msgid "Please wait; audio is being analysed..."
 msgstr "请稍等，正在解析音频..."
 
@@ -1156,27 +1488,31 @@ msgstr "请稍等，正在解析音频..."
 msgid "Position"
 msgstr "位置"
 
-#: src/wx/isdcf_metadata_dialog.cc:58
+#: src/wx/isdcf_metadata_dialog.cc:61
 msgid "Pre-release"
 msgstr "预发布(点映版)"
 
-#: src/wx/dcp_panel.cc:750
+#: src/wx/export_dialog.cc:32
+msgid "ProRes"
+msgstr "ProRes"
+
+#: src/wx/dcp_panel.cc:758
 msgid "Processor"
 msgstr "处理类型"
 
-#: src/wx/content_menu.cc:66
+#: src/wx/content_menu.cc:74
 msgid "Properties..."
 msgstr "属性..."
 
-#: src/wx/config_dialog.cc:1131
+#: src/wx/full_config_dialog.cc:609
 msgid "Protocol"
 msgstr "协议"
 
-#: src/wx/colour_conversion_editor.cc:112
+#: src/wx/colour_conversion_editor.cc:123
 msgid "RGB to XYZ conversion"
-msgstr "转换RGB 到 XYZ"
+msgstr "RGB转换到XYZ(色彩空间)"
 
-#: src/wx/audio_dialog.cc:104
+#: src/wx/audio_dialog.cc:119
 msgid "RMS"
 msgstr "RMS"
 
@@ -1184,37 +1520,39 @@ msgstr "RMS"
 msgid "Random"
 msgstr "随机"
 
-#: src/wx/isdcf_metadata_dialog.cc:46
+#: src/wx/isdcf_metadata_dialog.cc:49
 msgid "Rating (e.g. 15)"
 msgstr "评级 (例如:15)"
 
-#: src/wx/content_menu.cc:67
+#: src/wx/content_menu.cc:75
 msgid "Re-examine..."
 msgstr "重新制作..."
 
-#: src/wx/config_dialog.cc:737
-msgid ""
-"Re-make certificates\n"
-"and key..."
-msgstr "重新制作证书和密钥..."
+#: src/wx/config_dialog.cc:406
+msgid "Re-make certificates and key..."
+msgstr "重新创建证书和密钥..."
 
-#: src/wx/colour_conversion_editor.cc:99
+#: src/wx/colour_conversion_editor.cc:110
 msgid "Rec. 601"
 msgstr "Rec. 601"
 
-#: src/wx/colour_conversion_editor.cc:100
+#: src/wx/colour_conversion_editor.cc:111
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:84
+#: src/wx/screen_dialog.cc:85
 msgid "Recipient certificate"
-msgstr "收件人证书"
+msgstr "接受证书(设备)"
 
-#: src/wx/isdcf_metadata_dialog.cc:61
+#: src/wx/recreate_chain_dialog.cc:31
+msgid "Recreate signing certificates"
+msgstr "重新创建登录证书"
+
+#: src/wx/isdcf_metadata_dialog.cc:64
 msgid "Red band"
 msgstr "限制"
 
-#: src/wx/colour_conversion_editor.cc:119
+#: src/wx/colour_conversion_editor.cc:130
 msgid "Red chromaticity"
 msgstr "红色色度"
 
@@ -1232,17 +1570,13 @@ msgid "Reels"
 msgstr "卷"
 
 #. / TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix
-#: src/wx/dcp_panel.cc:186
+#: src/wx/dcp_panel.cc:185
 msgid "Reel|Custom"
 msgstr "分卷|自定义"
 
-#: src/wx/audio_panel.cc:56 src/wx/subtitle_panel.cc:56
-#: src/wx/video_panel.cc:82
-msgid "Refer to existing DCP"
-msgstr "参考现有的DCP"
-
-#: src/wx/config_dialog.cc:713 src/wx/content_menu.cc:70
-#: src/wx/content_panel.cc:89 src/wx/editable_list.h:84
+#: src/wx/config_dialog.cc:382 src/wx/content_menu.cc:82
+#: src/wx/content_panel.cc:100 src/wx/templates_dialog.cc:52
+#: src/wx/editable_list.h:80
 msgid "Remove"
 msgstr "移除"
 
@@ -1252,11 +1586,19 @@ msgstr "移除影院"
 
 #: src/wx/screens_panel.cc:67
 msgid "Remove Screen"
-msgstr "移除荧幕（放映服务器）"
+msgstr "移除厅放映服务器（证书）"
 
-#: src/wx/content_panel.cc:90
+#: src/wx/content_panel.cc:101
 msgid "Remove the selected piece of content from the film."
-msgstr "删除选择工程"
+msgstr "从工程中删除所选项目."
+
+#: src/wx/rename_template_dialog.cc:24
+msgid "Rename template"
+msgstr "重命名模板"
+
+#: src/wx/templates_dialog.cc:50
+msgid "Rename..."
+msgstr "重命名..."
 
 #: src/wx/repeat_dialog.cc:27
 msgid "Repeat"
@@ -1266,39 +1608,47 @@ msgstr "重复"
 msgid "Repeat Content"
 msgstr "重复内容"
 
-#: src/wx/content_menu.cc:63
+#: src/wx/content_menu.cc:71
 msgid "Repeat..."
 msgstr "重复..."
 
-#: src/wx/report_problem_dialog.cc:33
+#: src/wx/report_problem_dialog.cc:35
 msgid "Report A Problem"
 msgstr "报告问题"
 
-#: src/wx/config_dialog.cc:1290
+#: src/wx/full_config_dialog.cc:767
 msgid "Reset to default subject and text"
 msgstr "恢复到默认"
 
-#: src/wx/dcp_panel.cc:674
+#: src/wx/full_config_dialog.cc:892
+msgid "Reset to default text"
+msgstr "恢复到默认"
+
+#: src/wx/dcp_panel.cc:666
 msgid "Resolution"
 msgstr "解析度"
 
-#: src/wx/job_view.cc:135
+#: src/wx/subtitle_appearance_dialog.cc:111
+msgid "Restore to original colours"
+msgstr "恢复为原始色彩"
+
+#: src/wx/normal_job_view.cc:56
 msgid "Resume"
 msgstr "恢复"
 
-#: src/wx/video_panel.cc:116
+#: src/wx/video_panel.cc:127
 msgid "Right"
 msgstr "右边"
 
-#: src/wx/audio_mapping_view.cc:348
+#: src/wx/audio_mapping_view.cc:351
 msgid "Right click to change gain."
 msgstr "右键单击要更改增益。"
 
-#: src/wx/film_viewer.cc:71
+#: src/wx/film_viewer.cc:80
 msgid "Right eye"
 msgstr "右眼"
 
-#: src/wx/config_dialog.cc:854
+#: src/wx/config_dialog.cc:554
 msgid "Root"
 msgstr "æ ¹"
 
@@ -1306,69 +1656,101 @@ msgstr "æ ¹"
 msgid "Root common name"
 msgstr "根名称"
 
-#: src/wx/config_dialog.cc:1151
+#: src/wx/colour_conversion_editor.cc:62
+msgid "S-Gamut3"
+msgstr "索尼S-Gamut3"
+
+#: src/wx/full_config_dialog.cc:629
 msgid "SCP (for AAM and Doremi)"
-msgstr "SCP (AAM-Doremi)"
+msgstr "SCP (用于AAM和Doremi)"
 
-#: src/wx/config_dialog.cc:493 src/wx/dcp_panel.cc:190
+#: src/wx/dcp_panel.cc:189 src/wx/full_config_dialog.cc:381
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:309
+#: src/wx/audio_dialog.cc:337
 #, c-format
-msgid "Sample peak is %.2fdB at %s"
-msgstr "最佳值 %.2fdB 到 %s "
+msgid "Sample peak is %.2fdB at %s on %s"
+msgstr "最佳值 %.2fdB 到 %s 在 %s"
+
+#: src/wx/save_template_dialog.cc:29
+msgid "Save template"
+msgstr "保存模板"
 
-#: src/wx/self_dkdm_dialog.cc:70
+#: src/wx/self_dkdm_dialog.cc:71
 msgid "Save to KDM Creator tool's list"
-msgstr "保存到KDM创建的工具列表"
+msgstr "保存到创建KDM的工具列表"
 
-#: src/wx/video_panel.cc:164
+#: src/wx/video_panel.cc:175
 msgid "Scale to"
 msgstr "缩放"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:70
 msgid "Screens"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/full_config_dialog.cc:545
 msgid "Search network for servers"
-msgstr "搜索网络服务器"
+msgstr "搜索网络服务器（局域网）"
 
 #: src/wx/kdm_cpl_panel.cc:95
 msgid "Select CPL XML file"
 msgstr "选择CPL文件"
 
-#: src/wx/config_dialog.cc:772 src/wx/config_dialog.cc:819
-#: src/wx/config_dialog.cc:1056 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:449 src/wx/config_dialog.cc:518
+#: src/wx/config_dialog.cc:889 src/wx/screen_dialog.cc:169
 msgid "Select Certificate File"
 msgstr "选择证书文件"
 
-#: src/wx/config_dialog.cc:1076
+#: src/wx/config_dialog.cc:868
 msgid "Select Chain File"
-msgstr "选择密钥文件"
+msgstr "选择私钥文件"
+
+#: src/wx/config_dialog.cc:791
+msgid "Select Export File"
+msgstr "选择文件以输出"
 
-#: src/wx/content_menu.cc:321
+#: src/wx/config_dialog.cc:816
+msgid "Select File To Import"
+msgstr "选择文件以导入"
+
+#: src/wx/content_menu.cc:374
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/wx/config_dialog.cc:939 src/wx/config_dialog.cc:973
+#: src/wx/config_dialog.cc:660 src/wx/config_dialog.cc:696
 msgid "Select Key File"
 msgstr "选择密钥文件"
 
-#: src/wx/screen_dialog.cc:48
+#: src/wx/content_menu.cc:400
+msgid "Select OV"
+msgstr "选择OV"
+
+#: src/wx/screen_dialog.cc:49
 msgid "Select certificate file"
 msgstr "选择证书文件"
 
-#: src/wx/config_dialog.cc:202
+#: src/wx/full_config_dialog.cc:104
 msgid "Select cinema and screen database file"
-msgstr "选择电影和屏幕的数据库文件"
+msgstr "选择电影和银幕的数据库文件"
+
+#: src/wx/full_config_dialog.cc:99
+msgid "Select configuration file"
+msgstr "选择配置文件"
+
+#: src/wx/export_dialog.cc:56
+msgid "Select output file"
+msgstr "选择输出文件"
 
-#: src/wx/kdm_output_panel.cc:87
+#: src/wx/kdm_output_panel.cc:132
 msgid "Send by email"
 msgstr "通过电子邮件发送"
 
-#: src/wx/report_problem_dialog.cc:61
+#: src/wx/confirm_kdm_email_dialog.cc:31
+msgid "Send emails"
+msgstr "发送电子邮件"
+
+#: src/wx/report_problem_dialog.cc:63
 msgid "Send logs"
 msgstr "发送日志"
 
@@ -1376,11 +1758,11 @@ msgstr "发送日志"
 msgid "Serial number"
 msgstr "序列号"
 
-#: src/wx/server_dialog.cc:29
+#: src/wx/server_dialog.cc:30
 msgid "Server"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:604
+#: src/wx/full_config_dialog.cc:532
 msgid "Servers"
 msgstr "服务器"
 
@@ -1390,61 +1772,78 @@ msgstr "设置"
 
 #: src/wx/font_files_dialog.cc:51
 msgid "Set from file..."
-msgstr "外置字体"
+msgstr "从文件中获取设置…"
 
 #: src/wx/font_files_dialog.cc:54
 msgid "Set from system font..."
-msgstr "系统字体"
+msgstr "使用系统字体…"
 
-#: src/wx/config_dialog.cc:163
+#: src/wx/config_dialog.cc:115
 msgid "Set language"
 msgstr "设置语言"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:45
+#: src/wx/subtitle_appearance_dialog.cc:196
+msgid "Set to"
+msgstr "设置为"
+
+#: src/wx/subtitle_appearance_dialog.cc:127
 msgid "Shadow"
 msgstr "字幕阴影"
 
-#: src/wx/dcp_panel.cc:759
+#: src/wx/dcp_panel.cc:767
 msgid "Show audio..."
-msgstr "显示音频"
+msgstr "显示音频…"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:71
 msgid "Show graph of audio levels..."
-msgstr "显示音频电平图"
+msgstr "显示音频电平图…"
 
 #: src/wx/dcp_panel.cc:117
 msgid "Signed"
 msgstr "签名"
 
-#: src/wx/config_dialog.cc:1029
+#: src/wx/config_dialog.cc:751 src/wx/config_dialog.cc:778
 msgid "Signing DCPs and KDMs"
 msgstr "签名DCP和KDM"
 
-#: src/wx/dcp_panel.cc:183
+#: src/wx/colour_conversion_editor.cc:60
+msgid "Simple gamma"
+msgstr "简单伽马值"
+
+#: src/wx/colour_conversion_editor.cc:61
+msgid "Simple gamma, linearised for small values"
+msgstr "简单伽马值，低位对齐"
+
+#: src/wx/dcp_panel.cc:182
 msgid "Single reel"
 msgstr "签名卷"
 
-#: src/wx/audio_dialog.cc:114
+#: src/wx/player_information.cc:127
+#, c-format
+msgid "Size: %dx%d"
+msgstr "大小: %dx%d"
+
+#: src/wx/audio_dialog.cc:129
 msgid "Smoothing"
 msgstr "平滑"
 
-#: src/wx/timeline_dialog.cc:42
+#: src/wx/timeline_dialog.cc:56
 msgid "Snap"
 msgstr "临时"
 
-#: src/wx/dcp_panel.cc:184
+#: src/wx/dcp_panel.cc:183
 msgid "Split by video content"
 msgstr "根据内容进行分割"
 
 #: src/wx/update_dialog.cc:46
 msgid "Stable version "
-msgstr "稳定版"
+msgstr "稳定版 "
 
 #: src/wx/dcp_panel.cc:156
 msgid "Standard"
 msgstr "标准"
 
-#: src/wx/subtitle_view.cc:40
+#: src/wx/subtitle_view.cc:43
 msgid "Start"
 msgstr "开始"
 
@@ -1452,130 +1851,171 @@ msgstr "开始"
 msgid "Start of reel"
 msgstr "分卷数量"
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Stream"
 msgstr "流"
 
-#: src/wx/isdcf_metadata_dialog.cc:49
+#: src/wx/isdcf_metadata_dialog.cc:52
 msgid "Studio (e.g. TCF)"
-msgstr "工作室(例如:TCF)"
+msgstr "工作室(例如:ROV)"
 
-#: src/wx/config_dialog.cc:1262
+#: src/wx/full_config_dialog.cc:740
 msgid "Subject"
 msgstr "类目"
 
-#: src/wx/subtitle_view.cc:56
+#: src/wx/subtitle_view.cc:59
 msgid "Subtitle"
 msgstr "字幕"
 
-#: src/wx/isdcf_metadata_dialog.cc:40
+#: src/wx/isdcf_metadata_dialog.cc:43
 msgid "Subtitle Language (e.g. FR)"
-msgstr "字幕语言(例如:CN)"
+msgstr "字幕语言(例如:QMS)"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:30
+#: src/wx/subtitle_appearance_dialog.cc:43
 msgid "Subtitle appearance"
 msgstr "字幕外观"
 
-#: src/wx/image_subtitle_colour_dialog.cc:31
-msgid "Subtitle colours"
-msgstr "字幕颜色"
-
-#: src/wx/subtitle_panel.cc:48 src/wx/subtitle_view.cc:33
+#: src/wx/subtitle_panel.cc:47 src/wx/subtitle_view.cc:36
 #: src/wx/timeline_labels_view.cc:40 src/wx/timeline_labels_view.cc:74
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/player_information.cc:137
+msgid "Subtitles: no"
+msgstr "字幕: 关闭"
+
+#: src/wx/player_information.cc:135
+msgid "Subtitles: yes"
+msgstr "字幕: 开启"
+
+#: src/wx/about_dialog.cc:141
 msgid "Supported by"
 msgstr "技术支持"
 
-#: src/wx/config_dialog.cc:1114
+#: src/wx/full_config_dialog.cc:592
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:1139
+#: src/wx/full_config_dialog.cc:617
 msgid "Target path"
 msgstr "目标路径"
 
-#: src/wx/isdcf_metadata_dialog.cc:55
+#: src/wx/isdcf_metadata_dialog.cc:58
 msgid "Temp version"
 msgstr "临时版本"
 
-#: src/wx/isdcf_metadata_dialog.cc:43
+#: src/wx/templates_dialog.cc:42
+msgid "Template"
+msgstr "模板"
+
+#: src/wx/save_template_dialog.cc:31
+msgid "Template name"
+msgstr "模板名称"
+
+#: src/wx/save_template_dialog.cc:52 src/wx/templates_dialog.cc:125
+msgid "Template names must not be empty."
+msgstr "模板名称不能为空."
+
+#: src/wx/templates_dialog.cc:32
+msgid "Templates"
+msgstr "模板"
+
+#: src/wx/isdcf_metadata_dialog.cc:46
 msgid "Territory (e.g. UK)"
 msgstr "国别地区(例如:CN)"
 
 #: src/wx/update_dialog.cc:52
 msgid "Test version "
-msgstr "测试版"
+msgstr "测试版 "
 
-#: src/wx/about_dialog.cc:323
+#: src/wx/about_dialog.cc:199
 msgid "Tested by"
 msgstr "测试"
 
-#: src/wx/kdm_timing_panel.cc:105
+#: src/wx/kdm_timing_panel.cc:114
 msgid "The 'until' time must be after the 'from' time."
-msgstr "结束时间必须大于开始时间！"
+msgstr "结束时间必须大于开始时间."
 
-#: src/wx/content_menu.cc:307
+#: src/wx/recreate_chain_dialog.cc:33
+msgid ""
+"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
+"contains a small error\n"
+"which will prevent DCPs from being validated correctly on some systems.  Do "
+"you want to re-create\n"
+"the certificate chain for signing DCPs and KDMs?"
+msgstr ""
+"用于签署DCPS和KDMs的这份证书包含一个小错误\n"
+"这将导致DCP在某些系统上无法验证。要重新创建证书吗?"
+
+#: src/wx/content_menu.cc:360
 msgid ""
 "The content file(s) you specified are not the same as those that are "
 "missing.  Either try again with the correct content file or remove the "
 "missing content."
-msgstr "文件不匹配，请删除不规范的文件或添加正确的文件"
+msgstr "文件不匹配，请删除不规范的文件或添加正确的文件."
+
+#: src/wx/film_name_location_dialog.cc:120
+msgid ""
+"The directory %1 already exists and is not empty.  Are you sure you want to "
+"use it?"
+msgstr "已存在文件 %s 并不为空，是否覆盖？"
+
+#: src/wx/config_move_dialog.cc:34
+#, c-format
+msgid ""
+"The file %s already exists.  Do you want to use it as your new configuration "
+"or overwrite it with your current configuration?"
+msgstr "文件 %s 已经存在. 您希望将它作为新设置或是用现有设置覆盖他?"
 
 #: src/wx/hints_dialog.cc:89
 msgid "There are no hints: everything looks good!"
 msgstr "正常!"
 
-#: src/wx/film_viewer.cc:163
+#: src/wx/save_template_dialog.cc:55
+msgid ""
+"There is already a template with this name.  Do you want to overwrite it?"
+msgstr "已存在同名模板，是否覆盖？"
+
+#: src/wx/film_viewer.cc:212
 msgid "There is not enough free memory to do that."
-msgstr "内存不足！"
+msgstr "内存不足."
 
-#: src/wx/config_dialog.cc:780
+#: src/wx/config_dialog.cc:466
 msgid ""
 "This file contains other certificates (or other data) after its first "
 "certificate. Only the first certificate will be used."
-msgstr "该文件调用多个证书文件，但是只有第一个被使用。"
+msgstr "该文件调用多个证书文件，但只使用第一个。"
 
 #: src/wx/kdm_cpl_panel.cc:120
 msgid "This is not a valid CPL file"
-msgstr "CPL文件无效！"
+msgstr "CPL文件无效"
 
 #: src/wx/servers_list_dialog.cc:51
 msgid "Threads"
 msgstr "线程"
 
-#: src/wx/config_dialog.cc:196
-msgid "Threads to use for encoding on this host"
-msgstr "线程数"
-
-#: src/wx/config_dialog.cc:697 src/wx/screen_dialog.cc:101
+#: src/wx/config_dialog.cc:366 src/wx/screen_dialog.cc:102
 msgid "Thumbprint"
 msgstr "指纹"
 
-#: src/wx/audio_plot.cc:172
-msgid "Time"
-msgstr "时间"
-
-#: src/wx/timeline_dialog.cc:35
+#: src/wx/timeline_dialog.cc:38
 msgid "Timeline"
 msgstr "时间线"
 
-#: src/wx/content_panel.cc:101
+#: src/wx/content_panel.cc:112
 msgid "Timeline..."
-msgstr "时间线"
+msgstr "时间线…"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
 #: src/wx/timing_panel.cc:50
 msgid "Timing|Timing"
 msgstr "计时器"
 
-#: src/wx/video_panel.cc:129
+#: src/wx/video_panel.cc:140
 msgid "Top"
 msgstr "顶部"
 
-#: src/wx/about_dialog.cc:128
+#: src/wx/about_dialog.cc:130
 msgid "Translated by"
 msgstr "翻译"
 
@@ -1595,13 +2035,13 @@ msgstr "开始裁剪"
 msgid "Trim up to current position"
 msgstr "裁剪至当前位置"
 
-#: src/wx/audio_dialog.cc:325
+#: src/wx/audio_dialog.cc:354
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:689
-#: src/wx/video_panel.cc:86
+#: src/wx/audio_dialog.cc:112 src/wx/config_dialog.cc:358
+#: src/wx/video_panel.cc:97
 msgid "Type"
 msgstr "类型"
 
@@ -1617,15 +2057,15 @@ msgstr "UTC偏差（时区）"
 msgid "UTC+1"
 msgstr "东1区"
 
-#: src/wx/cinema_dialog.cc:109
+#: src/wx/cinema_dialog.cc:111
 msgid "UTC+10"
 msgstr "东10区"
 
-#: src/wx/cinema_dialog.cc:110
+#: src/wx/cinema_dialog.cc:112
 msgid "UTC+11"
 msgstr "东11区"
 
-#: src/wx/cinema_dialog.cc:111
+#: src/wx/cinema_dialog.cc:113
 msgid "UTC+12"
 msgstr "东12区"
 
@@ -1646,21 +2086,29 @@ msgid "UTC+5"
 msgstr "东5区"
 
 #: src/wx/cinema_dialog.cc:105
+msgid "UTC+5:30"
+msgstr "东5:30区 (印度，斯里兰卡)"
+
+#: src/wx/cinema_dialog.cc:106
 msgid "UTC+6"
 msgstr "东6区"
 
-#: src/wx/cinema_dialog.cc:106
+#: src/wx/cinema_dialog.cc:107
 msgid "UTC+7"
 msgstr "东7区"
 
-#: src/wx/cinema_dialog.cc:107
+#: src/wx/cinema_dialog.cc:108
 msgid "UTC+8"
-msgstr "东8区(北京时间)"
+msgstr "东8区 (北京时间)"
 
-#: src/wx/cinema_dialog.cc:108
+#: src/wx/cinema_dialog.cc:109
 msgid "UTC+9"
 msgstr "东9区"
 
+#: src/wx/cinema_dialog.cc:110
+msgid "UTC+9:30"
+msgstr "东9:30区"
+
 #: src/wx/cinema_dialog.cc:98
 msgid "UTC-1"
 msgstr "西1区"
@@ -1713,10 +2161,6 @@ msgstr "西8区"
 msgid "UTC-9"
 msgstr "西9区"
 
-#: src/wx/content_panel.cc:93
-msgid "Up"
-msgstr "上移"
-
 #: src/wx/update_dialog.cc:29
 msgid "Update"
 msgstr "更新"
@@ -1729,7 +2173,7 @@ msgstr "制作好DCP后上传到TMS"
 msgid "Use ISDCF name"
 msgstr "使用ISDCF名称"
 
-#: src/wx/dcp_panel.cc:664
+#: src/wx/dcp_panel.cc:679
 msgid "Use best"
 msgstr "使用最佳"
 
@@ -1737,11 +2181,27 @@ msgstr "使用最佳"
 msgid "Use preset"
 msgstr "使用预设"
 
-#: src/wx/subtitle_panel.cc:60
+#: src/wx/subtitle_panel.cc:70
 msgid "Use subtitles"
 msgstr "使用字幕"
 
-#: src/wx/config_dialog.cc:1143
+#: src/wx/audio_panel.cc:53
+msgid "Use this DCP's audio as OV and make VF"
+msgstr "将此DCP中的音频作为OV然后制作VF"
+
+#: src/wx/subtitle_panel.cc:53
+msgid "Use this DCP's subtitle as OV and make VF"
+msgstr "将此DCP中的字幕作为OV然后制作VF"
+
+#: src/wx/video_panel.cc:79
+msgid "Use this DCP's video as OV and make VF"
+msgstr "将此DCP中的视频作为OV然后制作VF"
+
+#: src/wx/config_move_dialog.cc:29
+msgid "Use this file as new configuration"
+msgstr "将这个文件作为新设置"
+
+#: src/wx/full_config_dialog.cc:621
 msgid "User name"
 msgstr "用户名"
 
@@ -1759,67 +2219,108 @@ msgstr "视频波形"
 msgid "Video frame rate"
 msgstr "视频帧率"
 
-#: src/wx/subtitle_panel.cc:131
+#: src/wx/subtitle_panel.cc:141
 msgid "View..."
-msgstr "视图窗口"
+msgstr "视图窗口…"
 
-#: src/wx/config_dialog.cc:1474
+#: src/wx/full_config_dialog.cc:1024
 msgid "Warnings"
 msgstr "警告"
 
-#: src/wx/colour_conversion_editor.cc:140
+#: src/wx/colour_conversion_editor.cc:151
 msgid "White point"
 msgstr "白点"
 
-#: src/wx/colour_conversion_editor.cc:164
+#: src/wx/colour_conversion_editor.cc:175
 msgid "White point adjustment"
 msgstr "白点调整"
 
-#: src/wx/about_dialog.cc:134
+#: src/wx/about_dialog.cc:137
 msgid "With help from"
 msgstr "帮助"
 
-#: src/wx/kdm_output_panel.cc:74 src/wx/self_dkdm_dialog.cc:75
+#: src/wx/kdm_output_panel.cc:127
+msgid "Write a ZIP file for each cinema's KDMs"
+msgstr "将所有KDM保存到同一个zip压缩文件中"
+
+#: src/wx/kdm_output_panel.cc:125
+msgid "Write a folder for each cinema's KDMs"
+msgstr "将每个KDM保存到单独的文件夹中"
+
+#: src/wx/kdm_output_panel.cc:123
+msgid "Write all KDMs to the same folder"
+msgstr "将所有KDM保存到同一个文件夹中"
+
+#: src/wx/kdm_output_panel.cc:104 src/wx/self_dkdm_dialog.cc:76
 msgid "Write to"
-msgstr "输出目录："
+msgstr "输出到"
 
-#: src/wx/about_dialog.cc:97
+#: src/wx/about_dialog.cc:98
 msgid "Written by"
 msgstr "撰稿"
 
-#: src/wx/subtitle_panel.cc:69
+#: src/wx/subtitle_panel.cc:79
 msgid "X Offset"
-msgstr "X偏移"
+msgstr "X 偏移"
 
-#: src/wx/subtitle_panel.cc:89
+#: src/wx/subtitle_panel.cc:99
 msgid "X Scale"
-msgstr "X缩放"
+msgstr "X 缩放"
 
-#: src/wx/subtitle_panel.cc:79
+#: src/wx/subtitle_panel.cc:89
 msgid "Y Offset"
-msgstr "Y偏移"
+msgstr "Y 偏移"
 
-#: src/wx/subtitle_panel.cc:99
+#: src/wx/subtitle_panel.cc:109
 msgid "Y Scale"
-msgstr "Y缩放"
+msgstr "Y 缩放"
 
-#: src/wx/colour_conversion_editor.cc:95
+#: src/wx/colour_conversion_editor.cc:106
 msgid "YUV to RGB conversion"
-msgstr "YUV转换到RGB"
+msgstr "YUV转换到RGB(色彩空间)"
 
-#: src/wx/colour_conversion_editor.cc:97
+#: src/wx/colour_conversion_editor.cc:108
 msgid "YUV to RGB matrix"
-msgstr "YUV转换到RGB矩阵"
+msgstr "YUV转换到RGB矩阵(色彩空间)"
+
+#: src/wx/screens_panel.cc:217
+#, c-format
+msgid ""
+"You cannot add a screen called '%s' as the cinema already has a screen with "
+"this name."
+msgstr "存在同名银幕，不能添加新银幕 '%s' ."
 
-#: src/wx/video_waveform_dialog.cc:65
+#: src/wx/screens_panel.cc:258
+#, c-format
+msgid ""
+"You cannot change this screen's name to '%s' as the cinema already has a "
+"screen with this name."
+msgstr "存在同名银幕！不能将银幕名称设置为 '%s' ."
+
+#: src/wx/kdm_output_panel.cc:208
+msgid ""
+"You have selected some cinemas that have no configured email address.  Do "
+"you want to continue?"
+msgstr "您选择了一些没有邮箱信息的影院。需要继续吗？"
+
+#: src/wx/kdm_output_panel.cc:196
+msgid ""
+"You must set up a mail server in Preferences before you can send emails."
+msgstr "您必须先在偏好设置中设定邮件服务器才能发送邮件."
+
+#: src/wx/report_problem_dialog.cc:68
+msgid "Your email address"
+msgstr "您的邮箱地址"
+
+#: src/wx/video_waveform_dialog.cc:72
 msgid "component value"
 msgstr "结构"
 
-#: src/wx/audio_gain_dialog.cc:31 src/wx/audio_panel.cc:77
+#: src/wx/audio_gain_dialog.cc:31 src/wx/audio_panel.cc:88
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/name_format_editor.cc:67
+#: src/wx/name_format_editor.cc:74
 #, c-format
 msgid "e.g. %s"
 msgstr "例如 %s"
@@ -1840,20 +2341,20 @@ msgid "m"
 msgstr "分"
 
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:94 src/wx/config_dialog.cc:455
+#: src/wx/audio_panel.cc:105 src/wx/full_config_dialog.cc:324
 msgid "ms"
 msgstr "毫秒"
 
-#: src/wx/config_dialog.cc:1247
+#: src/wx/full_config_dialog.cc:725
 msgid "port"
 msgstr "端口"
 
 #. // TRANSLATORS: this is an abbreviation for "seconds"
-#: src/wx/config_dialog.cc:413 src/wx/timing_panel.cc:75
+#: src/wx/full_config_dialog.cc:278 src/wx/timing_panel.cc:75
 msgid "s"
 msgstr "秒"
 
-#: src/wx/colour_conversion_editor.cc:65
+#: src/wx/colour_conversion_editor.cc:76
 msgid "threshold"
 msgstr "最低"
 
@@ -1861,18 +2362,54 @@ msgstr "最低"
 msgid "times"
 msgstr "时间"
 
-#: src/wx/kdm_timing_panel.cc:44
+#: src/wx/kdm_timing_panel.cc:49
 msgid "until"
 msgstr "终止"
 
-#: src/wx/colour_conversion_editor.cc:114
+#: src/wx/colour_conversion_editor.cc:125
 msgid "x"
 msgstr "x"
 
-#: src/wx/colour_conversion_editor.cc:115
+#: src/wx/colour_conversion_editor.cc:126
 msgid "y"
 msgstr "y"
 
+#~ msgid "No DCP selected."
+#~ msgstr "没有选择DCP."
+
+#~ msgid "Time"
+#~ msgstr "时间"
+
+#~ msgid "Refer to existing DCP"
+#~ msgstr "参考现有的DCP"
+
+#~ msgid "Load..."
+#~ msgstr "加载..."
+
+#~ msgid "New Film"
+#~ msgstr "新建工程"
+
+#~ msgid "Could not get video for view (%s)"
+#~ msgstr "无法获取视频 (%s)"
+
+#~ msgid "Subtitle colours"
+#~ msgstr "字幕颜色"
+
+#~ msgid "Threads to use for encoding on this host"
+#~ msgstr "线程数"
+
+#~ msgid "Contact email"
+#~ msgstr "邮箱地址"
+
+#~ msgid "Outline / shadow colour"
+#~ msgstr "缩略视图轮廓颜色"
+
+#~ msgid "Down"
+#~ msgstr "下移"
+
+#~ msgid "Up"
+#~ msgstr "上移"
+
 #~ 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; "