pot/merge.

[dcpomatic.git] / src / wx / po / zh_CN.po

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 1f91a402dce038afa5578cf2529619e03df60912..aa24fbd9f7cc1efa6ca3efe4e77cbb97bc3cc560 100644 (file)
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -7,135 +7,164 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-O-MATIC_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-27 11:57+0100\n"
-"PO-Revision-Date: 2017-02-24 06:32+0800\n"
+"POT-Creation-Date: 2019-01-26 23:08+0000\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.12\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"
 
+#: src/wx/initial_setup_dialog.cc:62
+msgid ""
+"\n"
+"You can change the mode at any time from the General page of Preferences."
+msgstr ""
+
+#: src/wx/timeline_audio_content_view.cc:68
+#, c-format
+msgid " advanced by %dms"
+msgstr ""
+
+#: src/wx/timeline_audio_content_view.cc:66
+#, c-format
+msgid " delayed by %dms"
+msgstr ""
+
 # 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/subtitle_panel.cc:72 src/wx/subtitle_panel.cc:82
-#: src/wx/subtitle_panel.cc:92 src/wx/subtitle_panel.cc:102
-#: src/wx/subtitle_panel.cc:112
+#: src/wx/text_panel.cc:82 src/wx/text_panel.cc:85 src/wx/text_panel.cc:90
+#: src/wx/text_panel.cc:93 src/wx/text_panel.cc:97
 msgid "%"
 msgstr "%"
 
-#: src/wx/kdm_dialog.cc:153
+#: src/wx/film_name_location_dialog.cc:131
+msgid "%1 already exists as a file, so you cannot use it for a film."
+msgstr "%1 文件已经存在，所以不能创建工程."
+
+#: src/wx/kdm_dialog.cc:165
 #, c-format
 msgid "%d KDM written to %s"
-msgstr ""
+msgstr "%d KDM 保存到 %s"
 
-#: src/wx/kdm_dialog.cc:153
+#: src/wx/kdm_dialog.cc:165
 #, c-format
 msgid "%d KDMs written to %s"
-msgstr ""
+msgstr "%d KDMs 保存到 %s"
 
-#: src/wx/about_dialog.cc:83
+#: src/wx/about_dialog.cc:84
+#, fuzzy
 msgid ""
-"(C) 2012-2017 Carl Hetherington, Terrence Meiczinger\n"
+"(C) 2012-2019 Carl Hetherington, Terrence Meiczinger\n"
 " Ole Laursen, Brecht Sanders"
 msgstr ""
 "(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:44 src/wx/file_picker_ctrl.cc:59
 msgid "(None)"
-msgstr "无"
+msgstr "(无)"
 
-#: src/wx/config_dialog.cc:189
+#: src/wx/full_config_dialog.cc:1339
+#, fuzzy
+msgid "(restart DCP-o-matic to see all ratios)"
+msgstr "(重启DCP-O-MATIC查看语言变化)"
+
+#: src/wx/config_dialog.cc:143
 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:171
 msgid "-6dB"
 msgstr "-6db"
 
-#: src/wx/wx_util.cc:377
+#: src/wx/export_dialog.cc:68
+msgid "0 is best, 51 is worst"
+msgstr ""
+
+#: src/wx/wx_util.cc:444
 msgid "12 - 7.1/HI/VI"
 msgstr "12声道—7.1+听力障碍声道/视力障碍声道"
 
-#: src/wx/wx_util.cc:369
+#: src/wx/wx_util.cc:436
 msgid "2 - stereo"
 msgstr "2声道—立体声"
 
-#: src/wx/rgba_colour_picker.cc:36
+#: src/wx/rgba_colour_picker.cc:37
 msgid "255"
 msgstr "255"
 
-#: src/wx/video_panel.cc:234
+#: src/wx/video_panel.cc:190
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/isdcf_metadata_dialog.cc:70
+#: src/wx/isdcf_metadata_dialog.cc:71
 msgid "2D version of content available in 3D"
 msgstr "伪3D"
 
-#: src/wx/dcp_panel.cc:712
+#: src/wx/dcp_panel.cc:795
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:670 src/wx/video_panel.cc:235
+#: src/wx/dcp_panel.cc:765 src/wx/video_panel.cc:191
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:238
+#: src/wx/video_panel.cc:194
 msgid "3D alternate"
 msgstr "左右交叉(3D)"
 
-#: src/wx/video_panel.cc:239
+#: src/wx/video_panel.cc:195
 msgid "3D left only"
 msgstr "仅左眼(3D)"
 
-#: src/wx/video_panel.cc:236
+#: src/wx/video_panel.cc:192
 msgid "3D left/right"
 msgstr "左右眼(3D)"
 
-#: src/wx/video_panel.cc:240
+#: src/wx/video_panel.cc:196
 msgid "3D right only"
 msgstr "仅右眼(3D)"
 
-#: src/wx/video_panel.cc:237
+#: src/wx/video_panel.cc:193
 msgid "3D top/bottom"
 msgstr "上下眼(3D)"
 
-#: src/wx/wx_util.cc:371
+#: src/wx/wx_util.cc:438
 msgid "4 - L/C/R/Lfe"
 msgstr "4声道—左/中/右/低音"
 
-#: src/wx/dcp_panel.cc:713
+#: src/wx/dcp_panel.cc:796
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/wx_util.cc:373
+#: src/wx/wx_util.cc:440
 msgid "6 - 5.1"
 msgstr "6声道—5.1声道"
 
-#: src/wx/wx_util.cc:375
+#: src/wx/wx_util.cc:442
 msgid "8 - 5.1/HI/VI"
 msgstr "8声道—5.1+听力障碍声道/视力障碍声道"
 
-#: src/wx/subtitle_appearance_dialog.cc:98
+#: src/wx/subtitle_appearance_dialog.cc:107
 msgid "<b>New colour</b>"
 msgstr "<b>新色彩空间</b>"
 
-#: src/wx/subtitle_appearance_dialog.cc:95
+#: src/wx/subtitle_appearance_dialog.cc:104
 msgid "<b>Original colour</b>"
 msgstr "<b>原色彩空间</b>"
 
 #. //trac.wxwidgets.org/ticket/13389
 #.
-#: src/wx/report_problem_dialog.cc:77
+#: src/wx/report_problem_dialog.cc:79
 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>"
@@ -143,70 +172,89 @@ msgstr "<i>请输入一个有效的邮箱地址，否则我们将无法解决您
 
 #. //trac.wxwidgets.org/ticket/13389
 #.
-#: src/wx/timing_panel.cc:132
+#: src/wx/timing_panel.cc:107
 msgid ""
 "<i>Only change this if the content's frame rate has been read incorrectly.</"
 "i>"
 msgstr "<i>当帧率错误是进行此项设置。</i>"
 
-#: src/wx/colour_conversion_editor.cc:79
+#: src/wx/initial_setup_dialog.cc:35
+msgid ""
+"<span weight=\"bold\" size=\"larger\">Welcome to DCP-o-matic!</span>\n"
+"\n"
+"DCP-o-matic can work in two modes: '<i>simple</i>' or '<i>full</i>'.\n"
+"\n"
+"<i>Simple mode</i> is ideal for producing straightforward DCPs without too "
+"many confusing options.\n"
+"\n"
+"<i>Full mode</i> gives you the most control over the DCPs you make.\n"
+"\n"
+"Please choose which mode you would like to start DCP-o-matic in:"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:81
 msgid "A"
 msgstr "A"
 
-#: src/wx/update_dialog.cc:36
+#: src/wx/update_dialog.cc:37
 msgid "A new version of DCP-o-matic is available."
-msgstr "发现 DCP-O-MATIC 新版本"
+msgstr "发现新版本的DCP-o-matic可用."
 
-#: src/wx/about_dialog.cc:35
+#: src/wx/about_dialog.cc:36
 msgid "About DCP-o-matic"
 msgstr "关于 DCP-o-matic"
 
-#: src/wx/screens_panel.cc:150
+#: src/wx/full_config_dialog.cc:952
+msgid "Accounts"
+msgstr ""
+
+#: src/wx/screens_panel.cc:151
 msgid "Add Cinema"
 msgstr "添加影院"
 
-#: src/wx/screens_panel.cc:57
+#: src/wx/screens_panel.cc:58
 msgid "Add Cinema..."
 msgstr "添加影院..."
 
-#: src/wx/content_panel.cc:90
-#, fuzzy
+#: src/wx/content_panel.cc:106
 msgid "Add DCP..."
-msgstr "添加 KDM..."
+msgstr "添加 DCP…"
+
+#: src/wx/new_dkdm_folder_dialog.cc:24
+msgid "Add DKDM folder"
+msgstr "添加KDMs文件夹"
 
-#: src/wx/content_menu.cc:77
+#: src/wx/content_menu.cc:78
 msgid "Add KDM..."
 msgstr "添加 KDM..."
 
-#: src/wx/content_menu.cc:78
+#: src/wx/content_menu.cc:79
 msgid "Add OV..."
 msgstr "添加 OV..."
 
-#: src/wx/screens_panel.cc:206
+#: src/wx/screens_panel.cc:207
 msgid "Add Screen"
 msgstr "添加银幕（放映服务器）"
 
-#: src/wx/screens_panel.cc:63
+#: src/wx/screens_panel.cc:64
 msgid "Add Screen..."
 msgstr "添加银幕（放映服务器）..."
 
-#: src/wx/content_panel.cc:91
-#, fuzzy
+#: src/wx/content_panel.cc:107
 msgid "Add a DCP."
-msgstr "添加 KDM..."
+msgstr "添加 DCP..."
 
-#: src/wx/content_panel.cc:87
-#, fuzzy
+#: src/wx/content_panel.cc:103
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a folder of sound files."
-msgstr "添加���列帧文件夹或DCP包文件夹"
+msgstr "添加���含序列帧文件或音频的媒体文件夹."
 
-#: src/wx/content_panel.cc:82
+#: src/wx/content_panel.cc:98
 msgid "Add file(s)..."
 msgstr "添加文件..."
 
-#: src/wx/content_panel.cc:86
+#: src/wx/content_panel.cc:102
 msgid "Add folder..."
 msgstr "添加文件夹..."
 
@@ -214,40 +262,71 @@ msgstr "添加文件夹..."
 msgid "Add image sequence"
 msgstr "添加图像序列"
 
-#: src/wx/content_panel.cc:83
+#: src/wx/text_panel.cc:262
 #, fuzzy
+msgid "Add new..."
+msgstr "添加影院..."
+
+#: src/wx/content_panel.cc:99
 msgid "Add video, image, sound or subtitle files to the film."
-msgstr "添加视频、图片或音频文件"
+msgstr "添加视频、图片、音频或字幕文件。"
 
-#: src/wx/config_dialog.cc:812 src/wx/editable_list.h:74
+#: src/wx/config_dialog.cc:383 src/wx/editable_list.h:76
 msgid "Add..."
 msgstr "添加..."
 
-#: src/wx/cinema_dialog.cc:71 src/wx/config_dialog.cc:1373
+#: src/wx/config_dialog.cc:478
+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:863
+#: src/wx/full_config_dialog.cc:1100
 msgid "Address"
 msgstr "地址"
 
-#: src/wx/colour_conversion_editor.cc:177
+#: src/wx/colour_conversion_editor.cc:179
 msgid "Adjust white point to"
 msgstr "调整白点"
 
-#: src/wx/config_dialog.cc:1532
+#: src/wx/kdm_advanced_dialog.cc:25
+msgid "Advanced KDM options"
+msgstr ""
+
+#: src/wx/config_dialog.cc:746 src/wx/config_dialog.cc:761
+#: src/wx/kdm_output_panel.cc:70
+msgid "Advanced..."
+msgstr "高级…"
+
+#: src/wx/full_config_dialog.cc:1331
 msgid "Allow any DCP frame rate"
 msgstr "允许任何DCP帧速率"
 
-#: src/wx/rgba_colour_picker.cc:33
+#: src/wx/full_config_dialog.cc:1335
+msgid "Allow non-standard container ratios"
+msgstr ""
+
+#: src/wx/rgba_colour_picker.cc:34
 msgid "Alpha   0"
 msgstr "透明度 0"
 
-#: src/wx/kdm_output_panel.cc:236
+#: src/wx/about_dialog.cc:148
+#, fuzzy
+msgid "Also supported by"
+msgstr "技术支持"
+
+#: src/wx/kdm_output_panel.cc:293
 msgid "An unknown exception occurred."
 msgstr "出现未知错误。"
 
-#: src/wx/subtitle_panel.cc:134
+#: src/wx/text_panel.cc:110
 msgid "Appearance..."
 msgstr "显示..."
 
-#: src/wx/job_view.cc:134
+#: src/wx/job_view.cc:171
 msgid "Are you sure you want to cancel this job?"
 msgstr "确定要取消当前任务吗？"
 
@@ -259,66 +338,80 @@ msgstr ""
 "你确定要发送邮件到以下地址？\n"
 "\n"
 
-#: src/wx/timeline_labels_view.cc:41 src/wx/timeline_labels_view.cc:80
+#: src/wx/timeline_labels_view.cc:42 src/wx/timeline_labels_view.cc:81
 msgid "Atmos"
 msgstr "全景声"
 
-#: 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
+#: src/wx/audio_dialog.cc:54 src/wx/audio_panel.cc:51
+#: src/wx/content_properties_dialog.cc:77 src/wx/dcp_panel.cc:121
+#: src/wx/timeline_labels_view.cc:40 src/wx/timeline_labels_view.cc:87
 msgid "Audio"
 msgstr "音频"
 
-#: src/wx/isdcf_metadata_dialog.cc:40
+#: src/wx/isdcf_metadata_dialog.cc:41
 msgid "Audio Language (e.g. EN)"
 msgstr "音频语言 (例如 CMN)"
 
-#: src/wx/audio_mapping_view.cc:342
+#: src/wx/player_information.cc:142
+#, c-format
+msgid "Audio channels: %d"
+msgstr "音频通道: %d"
+
+#: src/wx/audio_mapping_view.cc:348
 #, 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:351
 #, 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:224
+#: src/wx/full_config_dialog.cc:126
 msgid "Automatically analyse content audio"
 msgstr "自动解析源内容中的音频"
 
-#: src/wx/colour_conversion_editor.cc:82
+#: src/wx/colour_conversion_editor.cc:84
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1384
+#: src/wx/full_config_dialog.cc:874 src/wx/full_config_dialog.cc:1111
 msgid "BCC address"
 msgstr "抄送地址"
 
-#: src/wx/colour_conversion_editor.cc:144
+#: src/wx/player_config_dialog.cc:264
+msgid "Background image"
+msgstr ""
+
+#: src/wx/barco_alchemy_certificate_panel.cc:76
+msgid "Barco Alchemy"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:146
 msgid "Blue chromaticity"
 msgstr "蓝色色度"
 
-#: src/wx/fonts_dialog.cc:70
+#: src/wx/fonts_dialog.cc:72
 msgid "Bold file"
 msgstr "字体文件"
 
-#: src/wx/font_files_dialog.cc:37
+#: src/wx/font_files_dialog.cc:39
 msgid "Bold font"
 msgstr "粗体"
 
-#: src/wx/video_panel.cc:140
-msgid "Bottom"
+#: src/wx/video_panel.cc:130
+#, fuzzy
+msgid "Bottom crop"
 msgstr "底部"
 
-#: src/wx/dir_picker_ctrl.cc:38 src/wx/kdm_cpl_panel.cc:38
+#: src/wx/dir_picker_ctrl.cc:40 src/wx/kdm_cpl_panel.cc:40
 msgid "Browse..."
 msgstr "浏览..."
 
-#: src/wx/subtitle_panel.cc:63
+#: src/wx/text_panel.cc:77
 msgid "Burn subtitles into image"
 msgstr "字幕以图像输出"
 
@@ -326,44 +419,70 @@ msgstr "字幕以图像输出"
 msgid "But I have to use fader"
 msgstr "使用推子"
 
-#: src/wx/config_dialog.cc:1374
+#: src/wx/full_config_dialog.cc:864 src/wx/full_config_dialog.cc:1101
 msgid "CC addresses"
-msgstr "抄送地址 "
+msgstr "抄送地址"
 
-#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:85
-#: src/wx/self_dkdm_dialog.cc:59
+#: src/wx/kdm_cpl_panel.cc:37 src/wx/kdm_dialog.cc:88
+#: src/wx/self_dkdm_dialog.cc:61
 msgid "CPL"
 msgstr "CPL"
 
-#: src/wx/kdm_cpl_panel.cc:47
+#: src/wx/kdm_cpl_panel.cc:49
 msgid "CPL ID"
 msgstr "CPL ID"
 
-#: src/wx/kdm_cpl_panel.cc:50
+#: src/wx/kdm_cpl_panel.cc:52
 msgid "CPL annotation text"
 msgstr "CPL注释文本"
 
-#: src/wx/kdm_output_panel.cc:232
+#: 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:76
 msgid "Calculate..."
 msgstr "计算..."
 
-#: src/wx/job_view.cc:58
+#: src/wx/job_view.cc:69
 msgid "Cancel"
 msgstr "取消"
 
-#: src/wx/content_sub_panel.cc:65
-msgid "Cannot reference this DCP.  "
-msgstr "不能引用该DCP"
+#: src/wx/content_sub_panel.cc:68
+#, fuzzy
+msgid "Cannot reference this DCP."
+msgstr "不能引用该DCP. "
+
+#: src/wx/content_sub_panel.cc:70
+#, fuzzy
+msgid "Cannot reference this DCP: "
+msgstr "不能引用该DCP. "
+
+#: src/wx/text_view.cc:67
+msgid "Caption"
+msgstr ""
+
+#: src/wx/subtitle_appearance_dialog.cc:49
+#, fuzzy
+msgid "Caption appearance"
+msgstr "字幕外观"
+
+#: src/wx/text_view.cc:42
+msgid "Captions"
+msgstr ""
+
+#: src/wx/recreate_chain_dialog.cc:33
+msgid "Certificate chain"
+msgstr "证书秘钥"
 
-#: src/wx/dolby_doremi_certificate_panel.cc:204
+#: src/wx/barco_alchemy_certificate_panel.cc:68
+#: src/wx/christie_certificate_panel.cc:76
+#: src/wx/dolby_doremi_certificate_panel.cc:189
+#: src/wx/gdc_certificate_panel.cc:60
 msgid "Certificate downloaded"
 msgstr "证书下载"
 
-#: src/wx/isdcf_metadata_dialog.cc:67
+#: src/wx/isdcf_metadata_dialog.cc:68
 msgid "Chain"
 msgstr "链接"
 
@@ -371,36 +490,35 @@ msgstr "链接"
 msgid "Channel gain"
 msgstr "信道增益"
 
-#: src/wx/audio_dialog.cc:93 src/wx/dcp_panel.cc:744
+#: src/wx/audio_dialog.cc:97 src/wx/dcp_panel.cc:875
 msgid "Channels"
 msgstr "通道"
 
-#: src/wx/config_dialog.cc:232
+#: src/wx/config_dialog.cc:183
 msgid "Check for testing updates on startup"
 msgstr "启动时检查软件更新"
 
-#: src/wx/config_dialog.cc:228
+#: src/wx/config_dialog.cc:179
 msgid "Check for updates on startup"
 msgstr "启动时检查软件更新"
 
-#: src/wx/content_menu.cc:80
+#: src/wx/content_menu.cc:81
 msgid "Choose CPL..."
-msgstr "选择CPL"
+msgstr "选择CPL…"
 
-#: src/wx/content_panel.cc:355
-#, fuzzy
+#: src/wx/content_panel.cc:492
 msgid "Choose a DCP folder"
-msgstr "选择一个文件夹"
+msgstr "选择一个DCP文件夹"
 
-#: src/wx/content_menu.cc:294
+#: src/wx/content_menu.cc:299
 msgid "Choose a file"
 msgstr "选择一个文件"
 
-#: src/wx/content_panel.cc:282
+#: src/wx/content_panel.cc:419
 msgid "Choose a file or files"
 msgstr "选择一个或多个文件"
 
-#: src/wx/content_menu.cc:289 src/wx/content_panel.cc:310
+#: src/wx/content_menu.cc:294 src/wx/content_panel.cc:447
 msgid "Choose a folder"
 msgstr "选择一个文件夹"
 
@@ -408,11 +526,15 @@ msgstr "选择一个文件夹"
 msgid "Choose a font"
 msgstr "选择字体"
 
-#: src/wx/font_files_dialog.cc:80
+#: src/wx/font_files_dialog.cc:82
 msgid "Choose a font file"
 msgstr "选择一个字体文件"
 
-#: src/wx/config_dialog.cc:207
+#: src/wx/christie_certificate_panel.cc:84
+msgid "Christie"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:111
 msgid "Cinema and screen database file"
 msgstr "放映厅和银幕数据库文件"
 
@@ -420,374 +542,504 @@ msgstr "放映厅和银幕数据库文件"
 msgid "Click the button to set all selected content to the same value."
 msgstr "单击该按钮可将所有选定的内容为相同的值。"
 
-#: src/wx/subtitle_appearance_dialog.cc:54
+#: src/wx/closed_captions_dialog.cc:37
+msgid "Closed captions"
+msgstr ""
+
+#: src/wx/subtitle_appearance_dialog.cc:74
 msgid "Colour"
 msgstr "色彩空间"
 
-#: src/wx/content_colour_conversion_dialog.cc:37 src/wx/video_panel.cc:195
+#: src/wx/content_colour_conversion_dialog.cc:38 src/wx/video_panel.cc:166
 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:174
 msgid "Colour|Custom"
 msgstr "自定义"
 
-#: src/wx/video_waveform_dialog.cc:58
+#: src/wx/video_waveform_dialog.cc:60
 msgid "Component"
 msgstr "结构"
 
+#: src/wx/full_config_dialog.cc:106
+msgid "Configuration file"
+msgstr "配置文件"
+
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
-#: src/wx/config_dialog.cc:1580
+#: src/wx/full_config_dialog.cc:1398
 msgid "Config|Timing"
 msgstr "时间设置"
 
-#: src/wx/confirm_kdm_email_dialog.cc:31
+#: src/wx/confirm_kdm_email_dialog.cc:33
 msgid "Confirm KDM email"
 msgstr "确认接收KDM的电子邮件地址"
 
-#: src/wx/dcp_panel.cc:645
+#: src/wx/dcp_panel.cc:748
 msgid "Container"
 msgstr "封装格式"
 
-#: src/wx/audio_mapping_view.cc:437 src/wx/audio_mapping_view.cc:439
-#: src/wx/film_editor.cc:53
+#: src/wx/audio_mapping_view.cc:454 src/wx/audio_mapping_view.cc:456
+#: src/wx/film_editor.cc:54
 msgid "Content"
 msgstr "内容"
 
-#: src/wx/content_properties_dialog.cc:37
+#: src/wx/content_properties_dialog.cc:38
 msgid "Content Properties"
 msgstr "内容属性"
 
-#: src/wx/dcp_panel.cc:106
+#: src/wx/dcp_panel.cc:91
 msgid "Content Type"
 msgstr "内容类型"
 
-#: src/wx/isdcf_metadata_dialog.cc:37
+#: src/wx/player_config_dialog.cc:248
+#, fuzzy
+msgid "Content directory"
+msgstr "DCP目录"
+
+#: src/wx/isdcf_metadata_dialog.cc:38
 msgid "Content version"
 msgstr "内容版本"
 
-#: src/wx/video_waveform_dialog.cc:61
+#: src/wx/video_waveform_dialog.cc:63
 msgid "Contrast"
 msgstr "对比度"
 
-#: src/wx/dcp_panel.cc:89
+#: src/wx/dcp_panel.cc:81
 msgid "Copy as name"
 msgstr "复制名称"
 
-#: src/wx/audio_dialog.cc:250
+#: src/wx/audio_dialog.cc:278
 msgid "Could not analyse audio."
 msgstr "无法分析音频。"
 
-#: src/wx/content_menu.cc:374
+#: src/wx/config_dialog.cc:461
 #, c-format
-msgid "Could not load KDM (%s)"
-msgstr "无法���载 KDM (%s)"
+msgid "Could not import certificate (%s)"
+msgstr "无法���入证书文件 (%s)"
 
-#: src/wx/config_dialog.cc:890 src/wx/config_dialog.cc:1058
-#: src/wx/download_certificate_panel.cc:56 src/wx/screen_dialog.cc:158
-#, c-format
-msgid "Could not read certificate file (%s)"
-msgstr "无法读取证书文件 (%s)"
+#: src/wx/content_menu.cc:383
+#, fuzzy
+msgid "Could not load KDM"
+msgstr "无法加载 KDM."
+
+#: src/wx/screen_dialog.cc:71
+#, fuzzy, c-format
+msgid "Could not load certficate (%s)"
+msgstr "无法导入证书文件 (%s)"
+
+#: src/wx/player_config_dialog.cc:318
+#, fuzzy
+msgid "Could not load image file."
+msgstr "无法读取证书文件."
+
+#: src/wx/config_dialog.cc:487 src/wx/config_dialog.cc:682
+#: src/wx/download_certificate_panel.cc:60 src/wx/screen_dialog.cc:201
+#: src/wx/screen_dialog.cc:206
+msgid "Could not read certificate file."
+msgstr "无法读取证书文件."
 
-#: src/wx/config_dialog.cc:1049
+#: src/wx/config_dialog.cc:672
 #, c-format
 msgid "Could not read key file; file is too long (%s)"
 msgstr "无法读取Key文件，因为文件过长 (%s)"
 
-#: src/wx/film_viewer.cc:729
-#, c-format
+#: src/wx/film_viewer.cc:662
 msgid ""
-"Could not set up audio output (%s).  There will be no audio during the "
-"preview."
-msgstr ""
+"Could not set up audio output.  There will be no audio during the preview."
+msgstr "不能设置音频输出 (%s)。因此预览时将没有音频输出."
 
-#: src/wx/new_film_dialog.cc:42
+#: src/wx/full_config_dialog.cc:1233
+msgid "Cover Sheet"
+msgstr "封面"
+
+#: src/wx/film_name_location_dialog.cc:44
 msgid "Create in folder"
 msgstr "创建文件夹"
 
-#: src/wx/config_dialog.cc:243
+#: src/wx/full_config_dialog.cc:139
 msgid "Creator"
 msgstr "创建者"
 
-#: src/wx/video_panel.cc:100
-msgid "Crop"
-msgstr "裁剪"
+#: src/wx/audio_dialog.cc:436
+#, c-format
+msgid "Cursor: %.1fdB at %s"
+msgstr ""
 
-#: src/wx/audio_mapping_view.cc:472 src/wx/audio_mapping_view.cc:474
-#: src/wx/film_editor.cc:55
+#: src/wx/audio_dialog.cc:430
+msgid "Cursor: none"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:492 src/wx/audio_mapping_view.cc:494
+#: src/wx/film_editor.cc:56 src/wx/player_information.cc:55
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/config_dialog.cc:1553
+#: src/wx/dcp_text_track_dialog.cc:27
+msgid "DCP Text Track"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:1371
 msgid "DCP asset filename format"
 msgstr "DCP内容的文件名格式"
 
-#: src/wx/kdm_cpl_panel.cc:44
+#: src/wx/kdm_cpl_panel.cc:46
 msgid "DCP directory"
 msgstr "DCP目录"
 
-#: src/wx/config_dialog.cc:1541
+#: src/wx/full_config_dialog.cc:1359
 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/text_panel.cc:99
+msgid "DCP track"
+msgstr ""
+
+#: 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:51 src/wx/content_view.cc:77 src/wx/job_view.cc:149
+#: src/wx/wx_util.cc:138 src/wx/wx_util.cc:155 src/wx/wx_util.cc:163
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:151
-msgid "DCP-o-matic audio"
-msgstr "DCP-o-matic音频"
+#: src/wx/audio_dialog.cc:154
+#, c-format
+msgid "DCP-o-matic audio - %s"
+msgstr "DCP-o-matic音频 - %s"
+
+#: src/wx/initial_setup_dialog.cc:27
+#, fuzzy
+msgid "DCP-o-matic setup"
+msgstr "DCP-o-matic"
 
-#: src/wx/config_dialog.cc:1582
+#: src/wx/full_config_dialog.cc:1400
 msgid "Debug: decode"
 msgstr "解码"
 
-#: src/wx/config_dialog.cc:1586
+#: src/wx/full_config_dialog.cc:1404
 msgid "Debug: email sending"
 msgstr "发送到邮箱"
 
-#: src/wx/config_dialog.cc:1584
+#: src/wx/full_config_dialog.cc:1402
 msgid "Debug: encode"
 msgstr "编码"
 
-#: src/wx/config_dialog.cc:1139
-msgid "Decrypting DCPs"
-msgstr "解密DCP"
+#: src/wx/player_information.cc:169
+#, c-format
+msgid "Decode resolution: %dx%d"
+msgstr "解码分辨率: %dx%d"
+
+#: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:770
+msgid "Decrypting KDMs"
+msgstr "解密KDMs中"
 
-#: src/wx/config_dialog.cc:522
+#: src/wx/full_config_dialog.cc:352
 msgid "Default DCP audio channels"
 msgstr "默认DCP音频通道"
 
-#: src/wx/config_dialog.cc:510
+#: src/wx/full_config_dialog.cc:336
 msgid "Default ISDCF name details"
 msgstr "默认ISDCF名称的详细信息"
 
-#: src/wx/config_dialog.cc:527
+#: src/wx/full_config_dialog.cc:357
 msgid "Default JPEG2000 bandwidth"
 msgstr "默认JPEG2000码率"
 
-#: src/wx/config_dialog.cc:548
+#: src/wx/full_config_dialog.cc:378
 msgid "Default KDM directory"
 msgstr "默认KDM目录"
 
-#: src/wx/config_dialog.cc:536
+#: src/wx/full_config_dialog.cc:366
 msgid "Default audio delay"
 msgstr "默认音频延迟"
 
-#: src/wx/config_dialog.cc:514
+#: src/wx/full_config_dialog.cc:340
 msgid "Default container"
 msgstr "默认显示比例"
 
-#: src/wx/config_dialog.cc:518
+#: src/wx/full_config_dialog.cc:348
 msgid "Default content type"
 msgstr "默认类型"
 
-#: src/wx/config_dialog.cc:502
+#: src/wx/full_config_dialog.cc:328
 msgid "Default directory for new films"
 msgstr "新工程默认目录"
 
-#: src/wx/config_dialog.cc:494
+#: src/wx/full_config_dialog.cc:320
 msgid "Default duration of still images"
 msgstr "默认持续时间(黑场)"
 
-#: src/wx/config_dialog.cc:544
+#: src/wx/full_config_dialog.cc:344
+msgid "Default scale-to"
+msgstr "默认缩放比例"
+
+#: src/wx/full_config_dialog.cc:374
 msgid "Default standard"
 msgstr "默认打包标准类型"
 
-#: src/wx/config_dialog.cc:476
+#: src/wx/full_config_dialog.cc:387
+msgid "Default to enabling upload of DCP to TMS"
+msgstr "默认开启DCP自动上传到TMS"
+
+#: src/wx/full_config_dialog.cc:302
 msgid "Defaults"
 msgstr "默认"
 
-#: src/wx/audio_panel.cc:82
+#: src/wx/audio_panel.cc:78
 msgid "Delay"
 msgstr "延迟"
 
-#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:62
+#: src/wx/dcp_panel.cc:80 src/wx/job_view.cc:73
 msgid "Details..."
 msgstr "详细..."
 
-#: src/wx/download_certificate_dialog.cc:37
+#: src/wx/monitor_dialog.cc:32
+msgid "Device"
+msgstr ""
+
+#: src/wx/player_config_dialog.cc:419
+msgid "Devices"
+msgstr ""
+
+#: src/wx/recreate_chain_dialog.cc:33
+msgid "Do nothing"
+msgstr "不做更改"
+
+#: src/wx/dolby_doremi_certificate_panel.cc:206
 msgid "Dolby / Doremi"
 msgstr "杜比 / 哆来咪"
 
-#: src/wx/confirm_kdm_email_dialog.cc:42
+#: src/wx/confirm_kdm_email_dialog.cc:42 src/wx/recreate_chain_dialog.cc:41
 msgid "Don't ask this again"
 msgstr "不再询问"
 
-#: src/wx/confirm_kdm_email_dialog.cc:50
+#: src/wx/confirm_kdm_email_dialog.cc:33
 msgid "Don't send emails"
 msgstr "不发送电子邮件"
 
-#: src/wx/hints_dialog.cc:45
+#: src/wx/hints_dialog.cc:57
 msgid "Don't show hints again"
 msgstr "不再显示小提示"
 
-#: src/wx/download_certificate_dialog.cc:39
+#: src/wx/nag_dialog.cc:38
+msgid "Don't show this message again"
+msgstr "不再显示小提示"
+
+#: src/wx/download_certificate_dialog.cc:40
 msgid "Download"
 msgstr "下载"
 
-#: src/wx/download_certificate_dialog.cc:28
+#: src/wx/download_certificate_dialog.cc:33
 msgid "Download certificate"
 msgstr "下载证书"
 
-#: src/wx/screen_dialog.cc:91
+#: src/wx/screen_dialog.cc:135
 msgid "Download..."
 msgstr "下载..."
 
-#: src/wx/dolby_doremi_certificate_panel.cc:56
+#: src/wx/download_certificate_panel.cc:73
 msgid "Downloading certificate"
 msgstr "下载证书"
 
-#: src/wx/content_panel.cc:98
+#: src/wx/player_information.cc:93
+#, c-format
+msgid "Dropped frames: %d"
+msgstr "丢帧: %d"
+
+#: src/wx/player_config_dialog.cc:98
+msgid "Dual-screen displays"
+msgstr ""
+
+#: src/wx/player_config_dialog.cc:370
+#, fuzzy
+msgid "Duration"
+msgstr "团队"
+
+#: src/wx/content_panel.cc:114
 msgid "Earlier"
 msgstr "上移"
 
-#: src/wx/screens_panel.cc:59
+#: src/wx/screens_panel.cc:60
 msgid "Edit Cinema..."
-msgstr "编辑影院"
+msgstr "编辑影院…"
 
-#: src/wx/screens_panel.cc:65
+#: src/wx/screens_panel.cc:66
 msgid "Edit Screen..."
 msgstr "编辑放映厅服务器（证书）"
 
-#: src/wx/screens_panel.cc:170
+#: src/wx/screens_panel.cc:171
 msgid "Edit cinema"
 msgstr "编辑影院"
 
-#: src/wx/screens_panel.cc:246
+#: src/wx/screens_panel.cc:247
 msgid "Edit screen"
 msgstr "编辑放映厅服务器（证书）"
 
-#: src/wx/audio_mapping_view.cc:168 src/wx/config_dialog.cc:511
-#: 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:77
+#: src/wx/audio_mapping_view.cc:172 src/wx/dcp_panel.cc:103
+#: src/wx/fonts_dialog.cc:80 src/wx/full_config_dialog.cc:337
+#: src/wx/video_panel.cc:164 src/wx/video_panel.cc:175
+#: src/wx/editable_list.h:79
 msgid "Edit..."
 msgstr "编辑..."
 
-#: src/wx/subtitle_appearance_dialog.cc:59
+#: src/wx/subtitle_appearance_dialog.cc:77
 msgid "Effect"
 msgstr "效果"
 
-#: src/wx/subtitle_appearance_dialog.cc:64
+#: src/wx/subtitle_appearance_dialog.cc:80
 msgid "Effect colour"
 msgstr "效果颜色"
 
+#: src/wx/full_config_dialog.cc:743 src/wx/full_config_dialog.cc:1083
+#, fuzzy
+msgid "Email"
+msgstr "邮件发送 KDM"
+
 #: 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"
 msgstr "编码服务器"
 
-#: src/wx/dcp_panel.cc:121
+#: src/wx/dcp_panel.cc:95
 msgid "Encrypted"
 msgstr "加密"
 
-#: src/wx/subtitle_view.cc:51
+#: src/wx/text_view.cc:59
 msgid "End"
 msgstr "结束"
 
-#: src/wx/report_problem_dialog.cc:109
+#: src/wx/report_problem_dialog.cc:111
 #, c-format
 msgid "Enter your email address for the contact, not %s"
 msgstr "请输入您的电子邮件地址，不是 %s"
 
-#: src/wx/config_dialog.cc:1577
+#: src/wx/full_config_dialog.cc:1395
 msgid "Errors"
 msgstr "错误"
 
-#: src/wx/config_dialog.cc:816
+#: src/wx/config_dialog.cc:387
 msgid "Export"
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1146
-msgid ""
-"Export DCP decryption\n"
-"certificate..."
-msgstr "导出DCP证书"
+#: src/wx/config_dialog.cc:738
+msgid "Export KDM decryption certificate..."
+msgstr "导出KDM解密证书…"
 
-#: src/wx/config_dialog.cc:1148
-msgid ""
-"Export DCP decryption\n"
-"chain..."
-msgstr "导出DCP密匙"
+#: src/wx/config_dialog.cc:740
+msgid "Export KDM decryption chain..."
+msgstr "导出KDM解密密匙…"
+
+#: src/wx/config_dialog.cc:742
+msgid "Export all KDM decryption settings..."
+msgstr "导出所有KDM加密设置…"
 
-#: src/wx/config_dialog.cc:833
+#: src/wx/export_dialog.cc:53
+msgid "Export film"
+msgstr "导出工程"
+
+#: src/wx/config_dialog.cc:404 src/wx/full_config_dialog.cc:114
 msgid "Export..."
-msgstr "导出"
+msgstr "导出…"
 
-#: src/wx/config_dialog.cc:1254
+#: src/wx/full_config_dialog.cc:676
 msgid "FTP (for Dolby)"
 msgstr "FTP (Dolby)"
 
-#: src/wx/isdcf_metadata_dialog.cc:55
+#: src/wx/isdcf_metadata_dialog.cc:56
 msgid "Facility (e.g. DLA)"
 msgstr "设备(例如:DLA)"
 
-#: src/wx/video_panel.cc:154
+#: src/wx/video_panel.cc:140
 msgid "Fade in"
 msgstr "淡入"
 
-#: src/wx/subtitle_appearance_dialog.cc:74
+#: src/wx/subtitle_appearance_dialog.cc:88
 msgid "Fade in time"
 msgstr "淡入时间"
 
-#: src/wx/video_panel.cc:159
+#: src/wx/video_panel.cc:143
 msgid "Fade out"
 msgstr "淡出"
 
-#: src/wx/subtitle_appearance_dialog.cc:79
+#: src/wx/subtitle_appearance_dialog.cc:91
 msgid "Fade out time"
 msgstr "淡出时间"
 
-#: src/wx/kdm_dialog.cc:132
+#: src/wx/kdm_dialog.cc:135
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "已存在文件 %s ，是否覆盖？"
 
-#: src/wx/kdm_output_panel.cc:79
+#: src/wx/kdm_output_panel.cc:78
 msgid "Filename format"
 msgstr "文件名格式"
 
-#: src/wx/new_film_dialog.cc:39
+#: src/wx/film_name_location_dialog.cc:41
 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:162
 msgid "Filters"
 msgstr "过滤器"
 
-#: src/wx/config_dialog.cc:219
+#: src/wx/full_config_dialog.cc:121
 msgid ""
 "Find integrated loudness, true peak and loudness range when analysing audio"
-msgstr "���析音频时，发现综合响度，真实峰值和响度范围！"
+msgstr "���现响度，峰值和响度范围不合标准"
 
-#: src/wx/content_menu.cc:73
+#: src/wx/content_menu.cc:74
 msgid "Find missing..."
 msgstr "查询失败..."
 
-#: src/wx/kdm_output_panel.cc:65
-#, fuzzy
+#: src/wx/subtitle_appearance_dialog.cc:119
+msgid "Finding the colours in these subtitles..."
+msgstr ""
+
+#: src/wx/kdm_output_panel.cc:74
 msgid "Folder / ZIP name format"
-msgstr "文件���格式"
+msgstr "文件���/ZIP名称格式"
 
-#: src/wx/fonts_dialog.cc:38 src/wx/font_files_dialog.cc:28
-#: src/wx/font_files_dialog.cc:30
+#: src/wx/new_dkdm_folder_dialog.cc:26
+msgid "Folder name"
+msgstr "文件夹名称"
+
+#: src/wx/fonts_dialog.cc:39 src/wx/font_files_dialog.cc:30
+#: src/wx/font_files_dialog.cc:32
 msgid "Fonts"
-msgstr "字体..."
+msgstr "字体"
 
-#: src/wx/subtitle_panel.cc:132
+#: src/wx/text_panel.cc:109
 msgid "Fonts..."
 msgstr "字体..."
 
-#: src/wx/dcp_panel.cc:656
+#: src/wx/kdm_advanced_dialog.cc:31
+msgid "Forensically mark audio"
+msgstr ""
+
+#: src/wx/kdm_advanced_dialog.cc:27
+msgid "Forensically mark video"
+msgstr ""
+
+#: src/wx/export_dialog.cc:55
+msgid "Format"
+msgstr "格式"
+
+#: src/wx/dcp_panel.cc:755
 msgid "Frame Rate"
 msgstr "帧率"
 
@@ -795,37 +1047,50 @@ msgstr "帧率"
 msgid "Frame rate"
 msgstr "帧率"
 
-#: src/wx/about_dialog.cc:66
+#: src/wx/player_information.cc:139
+#, c-format
+msgid "Frame rate: %d"
+msgstr "帧速率: %d"
+
+#: src/wx/about_dialog.cc:67
 msgid "Free, open-source DCP creation from almost anything."
-msgstr ""
-"免费的DCP打包软件。 -汉化：Rov\n"
-"最新汉化请关注：放映员资料库 (www.rov8.com)"
+msgstr "免费的DCP打包软件."
 
-#: src/wx/kdm_timing_panel.cc:36
+#: src/wx/kdm_timing_panel.cc:37
 msgid "From"
 msgstr "起始"
 
-#: src/wx/config_dialog.cc:1368
+#: src/wx/full_config_dialog.cc:858 src/wx/full_config_dialog.cc:1091
 msgid "From address"
 msgstr "发件人地址"
 
-#: src/wx/new_film_dialog.cc:57
+#: src/wx/film_name_location_dialog.cc:60
 msgid "From template"
 msgstr "从模板"
 
-#: src/wx/audio_mapping_view.cc:166
+#: src/wx/audio_mapping_view.cc:170 src/wx/full_config_dialog.cc:150
 msgid "Full"
 msgstr "总"
 
-#: src/wx/timing_panel.cc:96
+#: src/wx/timing_panel.cc:87
 msgid "Full length"
 msgstr "总长度"
 
-#: src/wx/dcp_panel.cc:151
+#: src/wx/initial_setup_dialog.cc:48
+#, fuzzy
+msgid "Full mode"
+msgstr "总"
+
+#: src/wx/dcp_panel.cc:110
 msgid "GB"
 msgstr "GB"
 
-#: src/wx/audio_panel.cc:66
+#: src/wx/gdc_certificate_panel.cc:68
+#, fuzzy
+msgid "GDC"
+msgstr "DCP"
+
+#: src/wx/audio_panel.cc:65
 msgid "Gain"
 msgstr "增益(+/-)"
 
@@ -838,15 +1103,15 @@ msgstr "增益计算"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "从内容通道  %d 到DCP %d 通道进行增益调整"
 
-#: src/wx/config_dialog.cc:1573 src/wx/content_properties_dialog.cc:70
+#: src/wx/content_properties_dialog.cc:71 src/wx/full_config_dialog.cc:1391
 msgid "General"
 msgstr "普通"
 
-#: src/wx/screen_dialog.cc:90
+#: src/wx/screen_dialog.cc:134
 msgid "Get from file..."
-msgstr "外置字体 "
+msgstr "从文件获取…"
 
-#: src/wx/hints_dialog.cc:56
+#: src/wx/hints_dialog.cc:68
 msgid "Go back"
 msgstr "返回"
 
@@ -863,15 +1128,19 @@ msgstr "跳转到帧"
 msgid "Go to timecode"
 msgstr "跳转到时间码"
 
-#: src/wx/colour_conversion_editor.cc:137
+#: src/wx/colour_conversion_editor.cc:139
 msgid "Green chromaticity"
 msgstr "绿色色度"
 
-#: src/wx/batch_job_view.cc:44
+#: src/wx/full_config_dialog.cc:404
+msgid "Guess from content"
+msgstr "匹配源"
+
+#: src/wx/batch_job_view.cc:45
 msgid "Higher priority"
 msgstr "高场优先"
 
-#: src/wx/hints_dialog.cc:37
+#: src/wx/hints_dialog.cc:41
 msgid "Hints"
 msgstr "温馨提示"
 
@@ -887,230 +1156,346 @@ msgstr "服务器地址或IP地址"
 msgid "I want to play this back at fader"
 msgstr "使用推子"
 
-#: src/wx/fonts_dialog.cc:46
+#: src/wx/fonts_dialog.cc:48
 msgid "ID"
 msgstr "ID"
 
-#: src/wx/config_dialog.cc:1237
+#: src/wx/full_config_dialog.cc:659
 msgid "IP address"
 msgstr "IP地址"
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/full_config_dialog.cc:595
 msgid "IP address / host name"
 msgstr "IP地址/服务器地址"
 
-#: src/wx/isdcf_metadata_dialog.cc:35
+#: src/wx/isdcf_metadata_dialog.cc:36
 msgid "ISDCF name"
 msgstr "ISDCF名称"
 
-#: src/wx/video_waveform_dialog.cc:68
+#: src/wx/config_dialog.cc:865
+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:70
 msgid "Image X position"
 msgstr "画面 X 轴位置"
 
-#: src/wx/colour_conversion_editor.cc:66
+#: src/wx/player_config_dialog.cc:100
+msgid "Image on primary, controls on secondary"
+msgstr ""
+
+#: src/wx/player_config_dialog.cc:101
+msgid "Image on secondary, controls on primary"
+msgstr ""
+
+#: src/wx/config_dialog.cc:744
+msgid "Import all KDM decryption settings..."
+msgstr "导入所有KDM解密设置…"
+
+#: src/wx/config_dialog.cc:402
+msgid "Import..."
+msgstr "导入…"
+
+#: src/wx/nag_dialog.cc:31
+msgid "Important notice"
+msgstr "重要提示"
+
+#: src/wx/servers_list_dialog.cc:89
+#, fuzzy
+msgid "Incorrect version"
+msgstr "内容版本"
+
+#: src/wx/colour_conversion_editor.cc:68
 msgid "Input gamma"
 msgstr "伽马值"
 
-#: src/wx/colour_conversion_editor.cc:56
+#: src/wx/colour_conversion_editor.cc:58
 msgid "Input gamma correction"
 msgstr "伽玛校正"
 
-#: src/wx/colour_conversion_editor.cc:71
+#: src/wx/colour_conversion_editor.cc:73
 msgid "Input power"
 msgstr "功率"
 
-#: src/wx/colour_conversion_editor.cc:58
+#: src/wx/colour_conversion_editor.cc:60
 msgid "Input transfer function"
 msgstr "输入变换功能"
 
-#: src/wx/audio_dialog.cc:354
+#: src/wx/audio_dialog.cc:402
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "平均响度 %.2f LUFS"
 
-#: src/wx/config_dialog.cc:960
+#: src/wx/full_config_dialog.cc:91
+msgid "Interface complexity"
+msgstr ""
+
+#: src/wx/config_dialog.cc:562
 msgid "Intermediate"
 msgstr "公钥"
 
-#: src/wx/make_chain_dialog.cc:67
+#: src/wx/make_chain_dialog.cc:68
 msgid "Intermediate common name"
 msgstr "公钥名称"
 
-#: src/wx/config_dialog.cc:588 src/wx/dcp_panel.cc:191
+#: src/wx/dcp_panel.cc:148 src/wx/full_config_dialog.cc:428
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/colour_conversion_editor.cc:205
-#, fuzzy
+#: src/wx/config_dialog.cc:853
+msgid "Invalid DCP-o-matic export file"
+msgstr "DCP-o-matic无法输出此类格式"
+
+#: src/wx/colour_conversion_editor.cc:207
 msgid "Inverse 2.6 gamma correction on output"
 msgstr "输出时添加反转的2.6伽马值"
 
-#: src/wx/config_dialog.cc:239
+#: src/wx/full_config_dialog.cc:135
 msgid "Issuer"
 msgstr "发行"
 
-#: src/wx/fonts_dialog.cc:62
+#: src/wx/fonts_dialog.cc:64
 msgid "Italic file"
 msgstr "斜体文件"
 
-#: src/wx/font_files_dialog.cc:36
+#: src/wx/font_files_dialog.cc:38
 msgid "Italic font"
 msgstr "斜体"
 
-#: src/wx/dcp_panel.cc:680
+#: src/wx/dcp_panel.cc:767
 msgid ""
 "JPEG2000 bandwidth\n"
 "for newly-encoded data"
 msgstr "JPEG2000码率"
 
-#: src/wx/content_menu.cc:72
+#: src/wx/content_menu.cc:73
 msgid "Join"
 msgstr "创建"
 
-#: src/wx/film_viewer.cc:81
+#: src/wx/controls.cc:83
 msgid "Jump to selected content"
-msgstr ""
+msgstr "跳转到已选择的内容"
 
-#: src/wx/config_dialog.cc:1327
+#: src/wx/full_config_dialog.cc:837
 msgid "KDM Email"
 msgstr "邮件发送 KDM"
 
-#: src/wx/kdm_output_panel.cc:52
+#: src/wx/player_config_dialog.cc:258
+#, fuzzy
+msgid "KDM directory"
+msgstr "DCP目录"
+
+#: src/wx/player_config_dialog.cc:115
+msgid "KDM server URL"
+msgstr ""
+
+#: src/wx/kdm_output_panel.cc:57
 msgid "KDM type"
 msgstr "KDM类型"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/wx/kdm_dialog.cc:78
+#: src/wx/kdm_dialog.cc:81
 msgid "KDM|Timing"
 msgstr "KDM有效期"
 
-#: src/wx/timeline_dialog.cc:58
+#: src/wx/timeline_dialog.cc:70
 msgid "Keep video and subtitles in sequence"
 msgstr "保持视频序列和字幕序列"
 
-#: src/wx/dcp_panel.cc:130 src/wx/key_dialog.cc:28 src/wx/key_dialog.cc:30
+#: src/wx/dcp_panel.cc:101 src/wx/key_dialog.cc:29 src/wx/key_dialog.cc:31
 msgid "Key"
 msgstr "键值"
 
-#: src/wx/config_dialog.cc:1116
+#: src/wx/config_dialog.cc:721
 msgid "Keys"
 msgstr "键值"
 
-#: src/wx/subtitle_panel.cc:117
+#: src/wx/dcp_text_track_dialog.cc:31 src/wx/send_i18n_dialog.cc:45
+#: src/wx/text_panel.cc:102
 msgid "Language"
 msgstr "语言"
 
-#: src/wx/content_panel.cc:102
+#: src/wx/content_panel.cc:118
 msgid "Later"
 msgstr "下移"
 
-#: src/wx/config_dialog.cc:958
+#: src/wx/config_dialog.cc:560
 msgid "Leaf"
 msgstr "私钥"
 
-#: src/wx/make_chain_dialog.cc:78
+#: src/wx/make_chain_dialog.cc:79
 msgid "Leaf common name"
 msgstr "私钥名称"
 
-#: src/wx/config_dialog.cc:825
+#: src/wx/config_dialog.cc:396
 msgid "Leaf private key"
 msgstr "私钥"
 
-#: src/wx/video_panel.cc:105
+#: src/wx/config_dialog.cc:414
+msgid "Leaf private key does not match leaf certificate!"
+msgstr "私人秘钥private key与提供的证书certificate不匹配!"
+
+#: src/wx/controls.cc:79
 msgid "Left"
 msgstr "左边"
 
-#: src/wx/film_viewer.cc:79
-msgid "Left eye"
-msgstr "左眼"
+#: src/wx/video_panel.cc:100
+#, fuzzy
+msgid "Left crop"
+msgstr "左边"
 
-#: src/wx/content_properties_dialog.cc:79
+#: src/wx/content_properties_dialog.cc:80
 msgid "Length"
 msgstr "长度"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/player_information.cc:155
+msgid "Length: %1 (%2 frames)"
+msgstr "长度: %1 (%2 帧)"
+
+#: src/wx/text_panel.cc:95
 msgid "Line spacing"
 msgstr "行间距"
 
-#: src/wx/config_dialog.cc:831
-msgid "Load..."
-msgstr "加载..."
+#: src/wx/screen_dialog.cc:56
+#, fuzzy
+msgid "Load certificate..."
+msgstr "下载证书"
+
+#: src/wx/player_config_dialog.cc:229
+#, fuzzy
+msgid "Locations"
+msgstr "证书秘钥"
 
-#: src/wx/config_dialog.cc:1571
+#: src/wx/player_config_dialog.cc:120
+#, fuzzy
+msgid "Lock file"
+msgstr "字体文件"
+
+#: src/wx/full_config_dialog.cc:1389
 msgid "Log"
 msgstr "日志"
 
-#: src/wx/audio_dialog.cc:363
+#: src/wx/player_config_dialog.cc:109
+#, fuzzy
+msgid "Log file"
+msgstr "字体文件"
+
+#: src/wx/audio_dialog.cc:411
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "响度范围 %.2f LU"
 
-#: src/wx/batch_job_view.cc:47
+#: src/wx/batch_job_view.cc:48
 msgid "Lower priority"
 msgstr "低场优先"
 
-#: src/wx/content_panel.cc:555
+#: src/wx/content_panel.cc:710
 msgid "MISSING: "
-msgstr "丢失:"
+msgstr "丢失: "
 
-#: src/wx/config_dialog.cc:1360
-msgid "Mail password"
-msgstr "邮箱登录密码"
+#: src/wx/export_dialog.cc:38
+msgid "MOV files (*.mov)|*.mov"
+msgstr "MOV 文件 (*.mov)|*.mov"
+
+#: src/wx/export_dialog.cc:34
+#, fuzzy
+msgid "MP4 / H.264"
+msgstr "H.264"
 
-#: src/wx/config_dialog.cc:1356
-msgid "Mail user name"
-msgstr "邮箱用户名"
+#: src/wx/export_dialog.cc:39
+msgid "MP4 files (*.mp4)|*.mp4"
+msgstr "MP4 文件 (*.mp4)|*.mp4"
 
-#: src/wx/hints_dialog.cc:55
-msgid "Make DCP anyway"
-msgstr "强制制作DCP"
+#: src/wx/hints_dialog.cc:67
+#, fuzzy
+msgid "Make DCP"
+msgstr "创建KDM"
 
-#: src/wx/self_dkdm_dialog.cc:49
+#: src/wx/self_dkdm_dialog.cc:51
 msgid "Make DKDM for DCP-o-matic"
 msgstr "制作 KDM(DCP-o-matic)"
 
-#: src/wx/kdm_dialog.cc:54 src/wx/kdm_dialog.cc:98
+#: src/wx/kdm_dialog.cc:57 src/wx/kdm_dialog.cc:101
 msgid "Make KDMs"
 msgstr "创建KDM"
 
-#: src/wx/make_chain_dialog.cc:34
+#: src/wx/make_chain_dialog.cc:35
 msgid "Make certificate chain"
 msgstr "创建证书"
 
-#: src/wx/isdcf_metadata_dialog.cc:77
+#: src/wx/player_config_dialog.cc:429
+msgid "Manufacture week"
+msgstr ""
+
+#: src/wx/player_config_dialog.cc:430
+#, fuzzy
+msgid "Manufacture year"
+msgstr "服务器制造商"
+
+#: src/wx/monitor_dialog.cc:34 src/wx/player_config_dialog.cc:426
+#, fuzzy
+msgid "Manufacturer ID"
+msgstr "服务器制造商"
+
+#: src/wx/monitor_dialog.cc:36
+msgid "Manufacturer product code"
+msgstr ""
+
+#: src/wx/isdcf_metadata_dialog.cc:78
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr "要求亮度(例如:14FL)"
 
-#: src/wx/colour_conversion_editor.cc:127
+#: src/wx/colour_conversion_editor.cc:129
 msgid "Matrix"
 msgstr "矩阵"
 
-#: src/wx/config_dialog.cc:1524
+#: src/wx/full_config_dialog.cc:1323
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "最大JPEG2000码率"
 
-#: src/wx/config_dialog.cc:531 src/wx/config_dialog.cc:1528
-#: src/wx/dcp_panel.cc:684
+#: src/wx/full_config_dialog.cc:1351
+msgid "Maximum number of frames to store per thread"
+msgstr "设置每个线程处理的最大帧数"
+
+#: src/wx/dcp_panel.cc:769 src/wx/full_config_dialog.cc:361
+#: src/wx/full_config_dialog.cc:1327
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
+#: src/wx/full_config_dialog.cc:1079
+msgid "Message box"
+msgstr ""
+
+#: src/wx/export_dialog.cc:59
+msgid "Mix audio down to stereo"
+msgstr "将所有音频轨混到一个双声道轨"
+
+#: src/wx/config_move_dialog.cc:29
+msgid "Move configuration"
+msgstr "移动设置"
+
 #: src/wx/move_to_dialog.cc:31
 msgid "Move content"
 msgstr "分卷内容"
 
-#: src/wx/content_panel.cc:99
+#: src/wx/content_panel.cc:115
 msgid "Move the selected piece of content earlier in the film."
-msgstr "上移选择内容"
+msgstr "前移选择内容."
 
-#: src/wx/content_panel.cc:103
+#: src/wx/content_panel.cc:119
 msgid "Move the selected piece of content later in the film."
-msgstr "下移选择内容"
+msgstr "后移选择内容."
 
-#: src/wx/timing_panel.cc:93
+#: src/wx/timing_panel.cc:86
 msgid "Move to start of reel"
 msgstr "分卷设置"
 
-#: src/wx/video_panel.cc:378
+#: src/wx/video_panel.cc:418
 msgid "Multiple content selected"
 msgstr "选择多个文件"
 
@@ -1118,240 +1503,343 @@ msgstr "选择多个文件"
 msgid "Multiple values"
 msgstr "多值"
 
-#: src/wx/dir_picker_ctrl.cc:52
+#: src/wx/dir_picker_ctrl.cc:54
 msgid "My Documents"
 msgstr "我的文档"
 
-#: src/wx/report_problem_dialog.cc:51
+#: src/wx/report_problem_dialog.cc:53
 msgid "My problem is"
 msgstr "错误内容"
 
-#: src/wx/content_panel.cc:559
+#: src/wx/content_panel.cc:714
 msgid "NEEDS KDM: "
-msgstr "需要KDM:"
+msgstr "需要KDM: "
 
-#: src/wx/content_panel.cc:563
+#: src/wx/content_panel.cc:718
 msgid "NEEDS OV: "
-msgstr "需要OV:"
+msgstr "需要OV: "
 
-#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:72 src/wx/screen_dialog.cc:68
+#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:75
+#: src/wx/dcp_text_track_dialog.cc:29 src/wx/screen_dialog.cc:112
 msgid "Name"
 msgstr "名称"
 
-#: src/wx/new_film_dialog.cc:37
-msgid "New Film"
-msgstr "新建工程"
+#: src/wx/player_information.cc:131
+msgid "Needs KDM"
+msgstr "需要KDM"
+
+#: src/wx/player_information.cc:126
+msgid "Needs OV"
+msgstr "需要OV"
 
 #: src/wx/rename_template_dialog.cc:26
 msgid "New name"
 msgstr "新名称"
 
-#: src/wx/update_dialog.cc:38
+#: src/wx/update_dialog.cc:39
 msgid "New versions of DCP-o-matic are available."
-msgstr "DCP-o-Matic有新版！"
+msgstr "有新版本的DCP-o-matic可用."
+
+#: src/wx/barco_alchemy_certificate_panel.cc:49
+msgid ""
+"No Barco username/password configured.  Add your account details to the "
+"Accounts page in Preferences."
+msgstr ""
+
+#: src/wx/christie_certificate_panel.cc:43
+msgid ""
+"No Christie username/password configured.  Add your account details to the "
+"Accounts page in Preferences."
+msgstr ""
+
+#: src/wx/player_information.cc:114
+msgid "No DCP loaded."
+msgstr "没有选择DCP."
 
-#: src/wx/content_sub_panel.cc:63
-msgid "No DCP selected."
-msgstr "没有选择DCP"
+#: src/wx/gdc_certificate_panel.cc:43
+msgid ""
+"No GDC username/password configured.  Add your account details to the "
+"Accounts page in Preferences."
+msgstr ""
 
-#: src/wx/audio_mapping_view.cc:340
+#: src/wx/audio_mapping_view.cc:346
 #, 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:329
+#: src/wx/content_panel.cc:466
 msgid "No content found in this folder."
-msgstr "���有找到文件！"
+msgstr "���件夹中没有找到文件."
 
 #. /OUTLINE/SHADOW variables
-#: src/wx/dcp_panel.cc:752 src/wx/subtitle_appearance_dialog.cc:127
-#: src/wx/video_panel.cc:186 src/wx/video_panel.cc:200
-#: src/wx/video_panel.cc:307
+#: src/wx/dcp_panel.cc:881 src/wx/subtitle_appearance_dialog.cc:140
+#: src/wx/video_panel.cc:163 src/wx/video_panel.cc:168
+#: src/wx/video_panel.cc:347
 msgid "None"
 msgstr "无"
 
-#: src/wx/fonts_dialog.cc:54
+#: src/wx/fonts_dialog.cc:56
 msgid "Normal file"
 msgstr "普通文件"
 
-#: src/wx/font_files_dialog.cc:35
+#: src/wx/font_files_dialog.cc:37
 msgid "Normal font"
 msgstr "普通字体"
 
-#: src/wx/cinema_dialog.cc:60 src/wx/screen_dialog.cc:73
+#: src/wx/cinema_dialog.cc:60 src/wx/screen_dialog.cc:117
 msgid "Notes"
 msgstr "记录"
 
-#: src/wx/config_dialog.cc:202
-msgid "Number of threads DCP-o-matic encode server should use"
+#: src/wx/full_config_dialog.cc:1062
+#, fuzzy
+msgid "Notifications"
+msgstr "证书秘钥"
+
+#: src/wx/job_view.cc:82
+msgid "Notify when complete"
 msgstr ""
 
-#: src/wx/config_dialog.cc:197
+#: src/wx/full_config_dialog.cc:101
+msgid "Number of threads DCP-o-matic encode server should use"
+msgstr "多个DCP-o-matic 编码服务器将被使用"
+
+#: src/wx/full_config_dialog.cc:96
 msgid "Number of threads DCP-o-matic should use"
-msgstr ""
+msgstr "多个DCP-o-matic 将被使用"
 
-#: src/wx/audio_mapping_view.cc:165
+#: src/wx/audio_mapping_view.cc:169
 msgid "Off"
 msgstr "关闭"
 
-#: src/wx/config_dialog.cc:1536
-msgid "Only servers encode"
+#: src/wx/text_panel.cc:79
+#, fuzzy
+msgid "Offset"
+msgstr "X 偏移"
+
+#: src/wx/full_config_dialog.cc:1346
+msgid "Only servers encode"
 msgstr "仅在编码服务器编码"
 
-#: src/wx/config_dialog.cc:1592
+#: src/wx/full_config_dialog.cc:1410
 msgid "Open console window"
 msgstr "打开控制台窗口"
 
-#: src/wx/content_panel.cc:107
+#: src/wx/content_panel.cc:123
 msgid "Open the timeline for the film."
-msgstr "打开工程时间表"
+msgstr "打开工程时间线."
 
-#: src/wx/make_chain_dialog.cc:51
+#: src/wx/make_chain_dialog.cc:52
 msgid "Organisation"
 msgstr "团队"
 
-#: src/wx/make_chain_dialog.cc:53
+#: src/wx/make_chain_dialog.cc:54
 msgid "Organisational unit"
 msgstr "组织"
 
-#: src/wx/screen_dialog.cc:98
+#: src/wx/screen_dialog.cc:142
 msgid "Other trusted devices"
 msgstr "其它可信设备(服务器设备)"
 
-#: src/wx/config_dialog.cc:1344
+#: src/wx/full_config_dialog.cc:760
 msgid "Outgoing mail server"
 msgstr "发送邮件服务器地址"
 
-#: src/wx/subtitle_appearance_dialog.cc:128
+#: src/wx/subtitle_appearance_dialog.cc:141
 msgid "Outline"
 msgstr "缩略视图"
 
-#: src/wx/film_viewer.cc:78
+#: src/wx/controls.cc:76
 msgid "Outline content"
 msgstr "缩略视图内容"
 
-#: src/wx/subtitle_appearance_dialog.cc:69
+#: src/wx/subtitle_appearance_dialog.cc:83
 msgid "Outline width"
 msgstr "轮廓线宽度"
 
-#: src/wx/subtitle_appearance_dialog.cc:193
-msgid "Outline width cannot be set unless you are burning in subtitles"
-msgstr "只有选择烧录字幕才能显示轮廓线！"
+#: src/wx/subtitle_appearance_dialog.cc:305
+#, fuzzy
+msgid "Outline width cannot be set unless you are burning in captions"
+msgstr "只有选择烧录字幕才能显示轮廓线"
 
-#: src/wx/kdm_dialog.cc:92 src/wx/self_dkdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:95 src/wx/self_dkdm_dialog.cc:68
 msgid "Output"
 msgstr "输出"
 
-#: src/wx/colour_conversion_editor.cc:203
+#: src/wx/export_dialog.cc:74
+msgid "Output file"
+msgstr "输出文件"
+
+#: src/wx/colour_conversion_editor.cc:205
 msgid "Output gamma correction"
 msgstr "输出伽玛校正"
 
-#: src/wx/config_dialog.cc:1249
+#: src/wx/config_move_dialog.cc:31
+msgid "Overwrite this file with current configuration"
+msgstr "使用正确的设置改写这个文件"
+
+#: src/wx/full_config_dialog.cc:671 src/wx/full_config_dialog.cc:776
 msgid "Password"
 msgstr "密码"
 
-#: src/wx/normal_job_view.cc:37 src/wx/normal_job_view.cc:53
+#: src/wx/paste_dialog.cc:25
+msgid "Paste"
+msgstr "黏贴"
+
+#: src/wx/paste_dialog.cc:30
+msgid "Paste audio settings"
+msgstr "黏贴音频设置"
+
+#: src/wx/paste_dialog.cc:33
+#, fuzzy
+msgid "Paste subtitle and caption settings"
+msgstr "黏贴字幕设置"
+
+#: src/wx/paste_dialog.cc:27
+msgid "Paste video settings"
+msgstr "黏贴视频设置"
+
+#: src/wx/normal_job_view.cc:38 src/wx/normal_job_view.cc:54
 msgid "Pause"
 msgstr "暂停"
 
-#: src/wx/audio_dialog.cc:115
+#: src/wx/audio_dialog.cc:116
 msgid "Peak"
 msgstr "最佳"
 
-#: src/wx/audio_panel.cc:324
+#: src/wx/audio_panel.cc:375
 #, c-format
 msgid "Peak: %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_panel.cc:326
+#: src/wx/audio_panel.cc:377
 msgid "Peak: unknown"
 msgstr "最佳值: 未知"
 
-#: src/wx/film_viewer.cc:87
+#: src/wx/player_information.cc:73
+msgid "Performance"
+msgstr "偏好设置"
+
+#: src/wx/player_config_dialog.cc:363
+msgid "Period"
+msgstr ""
+
+#: src/wx/standard_controls.cc:30
 msgid "Play"
 msgstr "播放"
 
-#: src/wx/timing_panel.cc:111
+#: src/wx/timing_panel.cc:95
 msgid "Play length"
 msgstr "播放长度"
 
-#: src/wx/config_dialog.cc:212
-msgid "Play sound in the preview via"
-msgstr ""
+#: src/wx/config_dialog.cc:158
+msgid "Play sound via"
+msgstr "声音播放设备"
+
+#: src/wx/player_config_dialog.cc:253
+#, fuzzy
+msgid "Playlist directory"
+msgstr "DCP目录"
 
-#: src/wx/report_problem_dialog.cc:104
+#: src/wx/report_problem_dialog.cc:106
 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 "请稍等，正在解析音频..."
 
-#: src/wx/timing_panel.cc:90
+#: src/wx/timing_panel.cc:84
 msgid "Position"
 msgstr "位置"
 
-#: src/wx/isdcf_metadata_dialog.cc:61
+#: src/wx/isdcf_metadata_dialog.cc:62
 msgid "Pre-release"
 msgstr "预发布(点映版)"
 
-#: src/wx/dcp_panel.cc:750
+#: src/wx/export_dialog.cc:33
+msgid "ProRes"
+msgstr "ProRes"
+
+#: src/wx/dcp_panel.cc:879
 msgid "Processor"
 msgstr "处理类型"
 
-#: src/wx/content_menu.cc:74
+#: src/wx/player_config_dialog.cc:427
+msgid "Product code"
+msgstr ""
+
+#: src/wx/content_menu.cc:75
 msgid "Properties..."
 msgstr "属性..."
 
-#: src/wx/config_dialog.cc:1233
+#: src/wx/full_config_dialog.cc:655
 msgid "Protocol"
 msgstr "协议"
 
-#: src/wx/colour_conversion_editor.cc:123
+#: src/wx/export_dialog.cc:64
+msgid "Quality"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:125
 msgid "RGB to XYZ conversion"
 msgstr "RGB转换到XYZ(色彩空间)"
 
-#: src/wx/audio_dialog.cc:116
+#: src/wx/audio_dialog.cc:117
 msgid "RMS"
 msgstr "RMS"
 
-#: src/wx/key_dialog.cc:50
+#: src/wx/key_dialog.cc:51
 msgid "Random"
 msgstr "随机"
 
-#: src/wx/isdcf_metadata_dialog.cc:49
+#: src/wx/isdcf_metadata_dialog.cc:50
 msgid "Rating (e.g. 15)"
 msgstr "评级 (例如:15)"
 
-#: src/wx/content_menu.cc:75
+#: src/wx/dcp_panel.cc:771
+msgid "Re-encode JPEG2000 data from input"
+msgstr ""
+
+#: src/wx/content_menu.cc:76
 msgid "Re-examine..."
 msgstr "重新制作..."
 
-#: src/wx/config_dialog.cc:838
-msgid ""
-"Re-make certificates\n"
-"and key..."
-msgstr "重新制作证书和密钥..."
+#: src/wx/config_dialog.cc:409
+msgid "Re-make certificates and key..."
+msgstr "重新创建证书和密钥..."
 
-#: src/wx/colour_conversion_editor.cc:110
+#: src/wx/player_config_dialog.cc:443
+msgid "Read current devices"
+msgstr ""
+
+#: src/wx/content_view.cc:77
+#, fuzzy
+msgid "Reading content directory"
+msgstr "DCP目录"
+
+#: src/wx/colour_conversion_editor.cc:112
 msgid "Rec. 601"
 msgstr "Rec. 601"
 
-#: src/wx/colour_conversion_editor.cc:111
+#: src/wx/colour_conversion_editor.cc:113
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:85
+#: src/wx/screen_dialog.cc:129
 msgid "Recipient certificate"
 msgstr "接受证书(设备)"
 
-#: src/wx/isdcf_metadata_dialog.cc:64
+#: src/wx/recreate_chain_dialog.cc:33
+msgid "Recreate signing certificates"
+msgstr "重新创建登录证书"
+
+#: src/wx/isdcf_metadata_dialog.cc:65
 msgid "Red band"
 msgstr "限制"
 
-#: src/wx/colour_conversion_editor.cc:130
+#: src/wx/colour_conversion_editor.cc:132
 msgid "Red chromaticity"
 msgstr "红色色度"
 
@@ -1360,47 +1848,42 @@ msgstr "红色色度"
 msgid "Reel %d"
 msgstr "卷 %d"
 
-#: src/wx/dcp_panel.cc:145
+#: src/wx/dcp_panel.cc:108
 msgid "Reel length"
 msgstr "卷大小"
 
-#: src/wx/dcp_panel.cc:140
+#: src/wx/dcp_panel.cc:105
 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:143
 msgid "Reel|Custom"
 msgstr "分卷|自定义"
 
-#: src/wx/audio_panel.cc:56 src/wx/subtitle_panel.cc:55
-#: src/wx/video_panel.cc:82
-msgid "Refer to existing DCP"
-msgstr "参考现有的DCP"
-
-#: src/wx/config_dialog.cc:814 src/wx/content_menu.cc:82
-#: src/wx/content_panel.cc:94 src/wx/templates_dialog.cc:52
-#: src/wx/editable_list.h:80
+#: src/wx/config_dialog.cc:385 src/wx/content_menu.cc:83
+#: src/wx/content_panel.cc:110 src/wx/templates_dialog.cc:53
+#: src/wx/editable_list.h:82
 msgid "Remove"
 msgstr "移除"
 
-#: src/wx/screens_panel.cc:61
+#: src/wx/screens_panel.cc:62
 msgid "Remove Cinema"
 msgstr "移除影院"
 
-#: src/wx/screens_panel.cc:67
+#: src/wx/screens_panel.cc:68
 msgid "Remove Screen"
 msgstr "移除厅放映服务器（证书）"
 
-#: src/wx/content_panel.cc:95
+#: src/wx/content_panel.cc:111
 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
+#: src/wx/templates_dialog.cc:51
 msgid "Rename..."
 msgstr "重命名..."
 
@@ -1412,63 +1895,72 @@ msgstr "重复"
 msgid "Repeat Content"
 msgstr "重复内容"
 
-#: src/wx/content_menu.cc:71
+#: src/wx/content_menu.cc:72
 msgid "Repeat..."
 msgstr "重复..."
 
-#: src/wx/report_problem_dialog.cc:35
+#: src/wx/report_problem_dialog.cc:37
 msgid "Report A Problem"
 msgstr "报告问题"
 
-#: src/wx/config_dialog.cc:1391
+#: src/wx/full_config_dialog.cc:881 src/wx/full_config_dialog.cc:1118
 msgid "Reset to default subject and text"
 msgstr "恢复到默认"
 
-#: src/wx/dcp_panel.cc:674
+#: src/wx/full_config_dialog.cc:1249
+msgid "Reset to default text"
+msgstr "恢复到默认"
+
+#: src/wx/dcp_panel.cc:752
 msgid "Resolution"
 msgstr "解析度"
 
-#: src/wx/subtitle_appearance_dialog.cc:114
+#: src/wx/player_config_dialog.cc:105
+msgid "Respect KDM validity periods"
+msgstr ""
+
+#: src/wx/subtitle_appearance_dialog.cc:126
 msgid "Restore to original colours"
 msgstr "恢复为原始色彩"
 
-#: src/wx/normal_job_view.cc:56
+#: src/wx/normal_job_view.cc:57
 msgid "Resume"
 msgstr "恢复"
 
-#: src/wx/video_panel.cc:116
+#: src/wx/controls.cc:80
 msgid "Right"
 msgstr "右边"
 
-#: src/wx/audio_mapping_view.cc:348
+#: src/wx/audio_mapping_view.cc:354
 msgid "Right click to change gain."
 msgstr "右键单击要更改增益。"
 
-#: src/wx/film_viewer.cc:80
-msgid "Right eye"
-msgstr "右眼"
+#: src/wx/video_panel.cc:110
+#, fuzzy
+msgid "Right crop"
+msgstr "右边"
 
-#: src/wx/config_dialog.cc:956
+#: src/wx/config_dialog.cc:558
 msgid "Root"
 msgstr "根"
 
-#: src/wx/make_chain_dialog.cc:56
+#: src/wx/make_chain_dialog.cc:57
 msgid "Root common name"
 msgstr "根名称"
 
-#: src/wx/colour_conversion_editor.cc:62
+#: src/wx/colour_conversion_editor.cc:64
 msgid "S-Gamut3"
 msgstr "索尼S-Gamut3"
 
-#: src/wx/config_dialog.cc:1253
+#: src/wx/full_config_dialog.cc:675
 msgid "SCP (for AAM and Doremi)"
 msgstr "SCP (用于AAM和Doremi)"
 
-#: src/wx/config_dialog.cc:587 src/wx/dcp_panel.cc:190
+#: src/wx/dcp_panel.cc:147 src/wx/full_config_dialog.cc:427
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:323
+#: src/wx/audio_dialog.cc:371
 #, c-format
 msgid "Sample peak is %.2fdB at %s on %s"
 msgstr "最佳值 %.2fdB 到 %s 在 %s"
@@ -1477,68 +1969,129 @@ msgstr "最佳值 %.2fdB 到 %s 在 %s"
 msgid "Save template"
 msgstr "保存模板"
 
-#: src/wx/self_dkdm_dialog.cc:70
+#: src/wx/self_dkdm_dialog.cc:72
 msgid "Save to KDM Creator tool's list"
 msgstr "保存到创建KDM的工具列表"
 
-#: src/wx/video_panel.cc:164
+#: src/wx/text_panel.cc:87
+#, fuzzy
+msgid "Scale"
+msgstr "X 缩放"
+
+#: src/wx/video_panel.cc:146
 msgid "Scale to"
 msgstr "缩放"
 
-#: src/wx/kdm_dialog.cc:70
+#: src/wx/kdm_dialog.cc:73
 msgid "Screens"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:719
+#: src/wx/full_config_dialog.cc:591
 msgid "Search network for servers"
 msgstr "搜索网络服务器（局域网）"
 
-#: src/wx/kdm_cpl_panel.cc:95
+#: src/wx/timeline_dialog.cc:66
+#, fuzzy
+msgid "Select"
+msgstr "选择OV"
+
+#: src/wx/kdm_cpl_panel.cc:97
 msgid "Select CPL XML file"
 msgstr "选择CPL文件"
 
-#: src/wx/config_dialog.cc:873 src/wx/config_dialog.cc:921
-#: src/wx/config_dialog.cc:1158 src/wx/screen_dialog.cc:165
+#: src/wx/config_dialog.cc:452 src/wx/config_dialog.cc:521
+#: src/wx/config_dialog.cc:896 src/wx/screen_dialog.cc:213
 msgid "Select Certificate File"
 msgstr "选择证书文件"
 
-#: src/wx/config_dialog.cc:1178
+#: src/wx/config_dialog.cc:874
 msgid "Select Chain File"
 msgstr "选择私钥文件"
 
-#: src/wx/content_menu.cc:368
+#: src/wx/full_config_dialog.cc:197
+#, fuzzy
+msgid "Select Cinemas File"
+msgstr "选择私钥文件"
+
+#: src/wx/config_dialog.cc:796
+msgid "Select Export File"
+msgstr "选择文件以输出"
+
+#: src/wx/config_dialog.cc:822
+msgid "Select File To Import"
+msgstr "选择文件以导入"
+
+#: src/wx/content_menu.cc:377
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/wx/config_dialog.cc:1041 src/wx/config_dialog.cc:1075
+#: src/wx/config_dialog.cc:664 src/wx/config_dialog.cc:700
 msgid "Select Key File"
 msgstr "选择密钥文件"
 
-#: src/wx/content_menu.cc:394
+#: src/wx/content_menu.cc:403
 msgid "Select OV"
 msgstr "选择OV"
 
-#: src/wx/screen_dialog.cc:49
-msgid "Select certificate file"
-msgstr "选择证书文件"
+#: src/wx/timeline_dialog.cc:66
+#, fuzzy
+msgid "Select and move content"
+msgstr "根据内容进行分割"
 
-#: src/wx/config_dialog.cc:208
+#: src/wx/full_config_dialog.cc:112
 msgid "Select cinema and screen database file"
 msgstr "选择电影和银幕的数据库文件"
 
-#: src/wx/kdm_output_panel.cc:131
+#: src/wx/full_config_dialog.cc:107
+msgid "Select configuration file"
+msgstr "选择配置文件"
+
+#: src/wx/player_config_dialog.cc:265
+#, fuzzy
+msgid "Select image file"
+msgstr "选择私钥文件"
+
+#: src/wx/player_config_dialog.cc:121
+#, fuzzy
+msgid "Select lock file"
+msgstr "选择输出文件"
+
+#: src/wx/player_config_dialog.cc:110
+#, fuzzy
+msgid "Select log file"
+msgstr "选择输出文件"
+
+#: src/wx/export_dialog.cc:75
+msgid "Select output file"
+msgstr "选择输出文件"
+
+#: src/wx/kdm_output_panel.cc:122
 msgid "Send by email"
 msgstr "通过电子邮件发送"
 
-#: src/wx/confirm_kdm_email_dialog.cc:49
+#: src/wx/confirm_kdm_email_dialog.cc:33
 msgid "Send emails"
 msgstr "发送电子邮件"
 
-#: src/wx/report_problem_dialog.cc:63
+#: src/wx/report_problem_dialog.cc:65
 msgid "Send logs"
 msgstr "发送日志"
 
-#: src/wx/dolby_doremi_certificate_panel.cc:44
+#: src/wx/send_i18n_dialog.cc:30
+#, fuzzy
+msgid "Send translations"
+msgstr "团队"
+
+#: src/wx/timeline_dialog.cc:70
+msgid "Sequence"
+msgstr ""
+
+#: src/wx/player_config_dialog.cc:428
+#, fuzzy
+msgid "Serial"
+msgstr "序列号"
+
+#: src/wx/download_certificate_panel.cc:44 src/wx/monitor_dialog.cc:38
 msgid "Serial number"
 msgstr "序列号"
 
@@ -1546,81 +2099,98 @@ msgstr "序列号"
 msgid "Server"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:706
+#: src/wx/full_config_dialog.cc:578
 msgid "Servers"
 msgstr "服务器"
 
-#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:120
+#: src/wx/timecode.cc:66 src/wx/timing_panel.cc:100
 msgid "Set"
 msgstr "设置"
 
-#: src/wx/font_files_dialog.cc:51
+#: src/wx/font_files_dialog.cc:53
 msgid "Set from file..."
-msgstr "外置字体"
+msgstr "从文件中获取设置…"
 
-#: src/wx/font_files_dialog.cc:54
+#: src/wx/font_files_dialog.cc:56
 msgid "Set from system font..."
-msgstr "系统字体"
+msgstr "使用系统字体…"
 
-#: src/wx/config_dialog.cc:164
+#: src/wx/config_dialog.cc:118
 msgid "Set language"
 msgstr "设置语言"
 
-#: src/wx/subtitle_appearance_dialog.cc:129
+#: src/wx/subtitle_appearance_dialog.cc:219
+msgid "Set to"
+msgstr "设置为"
+
+#: src/wx/subtitle_appearance_dialog.cc:142
 msgid "Shadow"
 msgstr "字幕阴影"
 
-#: src/wx/dcp_panel.cc:759
+#: src/wx/dcp_panel.cc:886
 msgid "Show audio..."
-msgstr "显示音频"
+msgstr "显示音频…"
 
-#: src/wx/audio_panel.cc:60
+#: src/wx/audio_panel.cc:62
 msgid "Show graph of audio levels..."
-msgstr "显示音频电平图"
+msgstr "显示音频电平图…"
 
-#: src/wx/dcp_panel.cc:117
+#: src/wx/dcp_panel.cc:94
 msgid "Signed"
 msgstr "签名"
 
-#: src/wx/config_dialog.cc:1131
+#: src/wx/config_dialog.cc:756 src/wx/config_dialog.cc:783
 msgid "Signing DCPs and KDMs"
 msgstr "签名DCP和KDM"
 
-#: src/wx/colour_conversion_editor.cc:60
+#: src/wx/full_config_dialog.cc:149
 #, fuzzy
+msgid "Simple"
+msgstr "简单伽马值"
+
+#: src/wx/colour_conversion_editor.cc:62
 msgid "Simple gamma"
 msgstr "简单伽马值"
 
-#: src/wx/colour_conversion_editor.cc:61
-#, fuzzy
+#: src/wx/colour_conversion_editor.cc:63
 msgid "Simple gamma, linearised for small values"
 msgstr "简单伽马值，低位对齐"
 
-#: src/wx/dcp_panel.cc:183
+#: src/wx/initial_setup_dialog.cc:46
+#, fuzzy
+msgid "Simple mode"
+msgstr "简单伽马值"
+
+#: src/wx/dcp_panel.cc:140
 msgid "Single reel"
 msgstr "签名卷"
 
-#: src/wx/audio_dialog.cc:126
+#: src/wx/player_information.cc:137
+#, c-format
+msgid "Size: %dx%d"
+msgstr "大小: %dx%d"
+
+#: src/wx/audio_dialog.cc:127
 msgid "Smoothing"
 msgstr "平滑"
 
-#: src/wx/timeline_dialog.cc:56
+#: src/wx/timeline_dialog.cc:69
 msgid "Snap"
 msgstr "临时"
 
-#: src/wx/dcp_panel.cc:184
+#: src/wx/dcp_panel.cc:141
 msgid "Split by video content"
 msgstr "根据内容进行分割"
 
-#: src/wx/update_dialog.cc:46
+#: src/wx/update_dialog.cc:47
 msgid "Stable version "
-msgstr "稳定版"
+msgstr "稳定版 "
 
-#: src/wx/dcp_panel.cc:156
+#: src/wx/dcp_panel.cc:112
 msgid "Standard"
 msgstr "标准"
 
-#: src/wx/subtitle_view.cc:43
+#: src/wx/text_view.cc:51
 msgid "Start"
 msgstr "开始"
 
@@ -1628,52 +2198,56 @@ msgstr "开始"
 msgid "Start of reel"
 msgstr "分卷数量"
 
-#: src/wx/subtitle_panel.cc:122
+#: src/wx/player_config_dialog.cc:90
+msgid "Start player as"
+msgstr ""
+
+#: src/wx/text_panel.cc:105
 msgid "Stream"
 msgstr "流"
 
-#: src/wx/isdcf_metadata_dialog.cc:52
+#: src/wx/isdcf_metadata_dialog.cc:53
 msgid "Studio (e.g. TCF)"
 msgstr "工作室(例如:ROV)"
 
-#: src/wx/config_dialog.cc:1364
+#: src/wx/full_config_dialog.cc:854 src/wx/full_config_dialog.cc:1087
 msgid "Subject"
 msgstr "类目"
 
-#: src/wx/subtitle_view.cc:59
-msgid "Subtitle"
-msgstr "字幕"
+#: src/wx/about_dialog.cc:144
+msgid "Subscribers"
+msgstr ""
 
-#: src/wx/isdcf_metadata_dialog.cc:43
+#: src/wx/isdcf_metadata_dialog.cc:44
 msgid "Subtitle Language (e.g. FR)"
 msgstr "字幕语言(例如:QMS)"
 
-#: src/wx/subtitle_appearance_dialog.cc:42
-msgid "Subtitle appearance"
-msgstr "字幕外观"
-
-#: 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"
+#: src/wx/timeline_labels_view.cc:41 src/wx/timeline_labels_view.cc:75
+#, fuzzy
+msgid "Subtitles/captions"
 msgstr "字幕"
 
-#: src/wx/about_dialog.cc:295
-msgid "Supported by"
-msgstr "技术支持"
+#: src/wx/player_information.cc:147
+msgid "Subtitles: no"
+msgstr "字幕: 关闭"
 
-#: src/wx/config_dialog.cc:1216
+#: src/wx/player_information.cc:145
+msgid "Subtitles: yes"
+msgstr "字幕: 开启"
+
+#: src/wx/full_config_dialog.cc:638
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:1241
+#: src/wx/full_config_dialog.cc:663
 msgid "Target path"
 msgstr "目标路径"
 
-#: src/wx/isdcf_metadata_dialog.cc:58
+#: src/wx/isdcf_metadata_dialog.cc:59
 msgid "Temp version"
 msgstr "临时版本"
 
-#: src/wx/templates_dialog.cc:42
+#: src/wx/templates_dialog.cc:43
 msgid "Template"
 msgstr "模板"
 
@@ -1681,38 +2255,104 @@ msgstr "模板"
 msgid "Template name"
 msgstr "模板名称"
 
-#: src/wx/save_template_dialog.cc:52 src/wx/templates_dialog.cc:125
+#: src/wx/save_template_dialog.cc:52 src/wx/templates_dialog.cc:126
 msgid "Template names must not be empty."
-msgstr "模板名称不能为空"
+msgstr "模板名称不能为空."
 
-#: src/wx/templates_dialog.cc:32
+#: src/wx/templates_dialog.cc:33
 msgid "Templates"
 msgstr "模板"
 
-#: src/wx/isdcf_metadata_dialog.cc:46
+#: src/wx/isdcf_metadata_dialog.cc:47
 msgid "Territory (e.g. UK)"
 msgstr "国别地区(例如:CN)"
 
-#: src/wx/update_dialog.cc:52
+#: src/wx/update_dialog.cc:53
 msgid "Test version "
-msgstr "测试版"
+msgstr "测试版 "
 
-#: src/wx/about_dialog.cc:352
+#: src/wx/about_dialog.cc:206
 msgid "Tested by"
 msgstr "测试"
 
-#: src/wx/kdm_timing_panel.cc:114
+#: src/wx/kdm_timing_panel.cc:115
 msgid "The 'until' time must be after the 'from' time."
-msgstr "结束时间必须大于开始时间！"
+msgstr "结束时间必须大于开始时间."
+
+#: src/wx/verify_dcp_dialog.cc:91
+msgid "The PKL and CPL hashes disagree for a picture asset."
+msgstr ""
 
-#: src/wx/content_menu.cc:354
+#: src/wx/verify_dcp_dialog.cc:100
+msgid "The PKL and CPL hashes disagree for a sound asset."
+msgstr ""
+
+#: src/wx/recreate_chain_dialog.cc:35
+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:363
 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/hints_dialog.cc:89
+#: src/wx/film_name_location_dialog.cc:121
+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:35
+#, 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/verify_dcp_dialog.cc:79
+msgid ""
+"The hash of the CPL in the PKL does not agree with the CPL file.  This "
+"probably means that the CPL file is corrupt."
+msgstr ""
+
+#: src/wx/verify_dcp_dialog.cc:86
+#, c-format
+msgid ""
+"The hash of the picture asset %s does not agree with the PKL file.  This "
+"probably means that the asset file is corrupt."
+msgstr ""
+
+#: src/wx/verify_dcp_dialog.cc:95
+#, c-format
+msgid ""
+"The hash of the sound asset %s does not agree with the PKL file.  This "
+"probably means that the asset file is corrupt."
+msgstr ""
+
+#: src/wx/verify_dcp_dialog.cc:82
+msgid "The picture in a reel has an invalid frame rate"
+msgstr ""
+
+#: src/wx/player_config_dialog.cc:358
+#, fuzzy
+msgid "Theatre name"
+msgstr "模板名称"
+
+#: src/wx/hints_dialog.cc:132
+#, fuzzy
+msgid "There are no hints yet: project check in progress."
+msgstr "正常!"
+
+#: src/wx/hints_dialog.cc:130
 msgid "There are no hints: everything looks good!"
 msgstr "正常!"
 
@@ -1721,76 +2361,98 @@ msgid ""
 "There is already a template with this name.  Do you want to overwrite it?"
 msgstr "已存在同名模板，是否覆盖？"
 
-#: src/wx/film_viewer.cc:190
+#: src/wx/film_viewer.cc:146
 msgid "There is not enough free memory to do that."
-msgstr "内存不足！"
+msgstr "内存不足."
 
-#: src/wx/config_dialog.cc:882
+#: src/wx/config_dialog.cc:469
 msgid ""
 "This file contains other certificates (or other data) after its first "
 "certificate. Only the first certificate will be used."
 msgstr "该文件调用多个证书文件，但只使用第一个。"
 
-#: src/wx/kdm_cpl_panel.cc:120
+#: src/wx/kdm_cpl_panel.cc:122
 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:798 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:369 src/wx/screen_dialog.cc:54
+#: src/wx/screen_dialog.cc:146
 msgid "Thumbprint"
 msgstr "指纹"
 
-#: src/wx/audio_plot.cc:172
-msgid "Time"
-msgstr "时间"
-
-#: src/wx/timeline_dialog.cc:38
+#: src/wx/timeline_dialog.cc:41
 msgid "Timeline"
 msgstr "时间线"
 
-#: src/wx/content_panel.cc:106
+#: src/wx/content_panel.cc:122
 msgid "Timeline..."
-msgstr "时间线"
+msgstr "时间线…"
+
+#: src/wx/content_panel.cc:140
+#, fuzzy
+msgid "Timing"
+msgstr "KDM有效期"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
-#: src/wx/timing_panel.cc:50
+#: src/wx/timing_panel.cc:53
 msgid "Timing|Timing"
 msgstr "计时器"
 
-#: src/wx/video_panel.cc:129
-msgid "Top"
-msgstr "顶部"
+#: src/wx/full_config_dialog.cc:1095
+#, fuzzy
+msgid "To address"
+msgstr "发件人地址"
+
+#: src/wx/video_panel.cc:120
+msgid "Top crop"
+msgstr ""
 
-#: src/wx/about_dialog.cc:128
+#: src/wx/instant_i18n_dialog.cc:28
+#, fuzzy
+msgid "Translate"
+msgstr "翻译"
+
+#: src/wx/about_dialog.cc:140
 msgid "Translated by"
 msgstr "翻译"
 
-#: src/wx/timing_panel.cc:108
+#: src/wx/timing_panel.cc:94
 msgid "Trim after current position"
 msgstr "裁剪当前位置"
 
-#: src/wx/timing_panel.cc:105
+#: src/wx/timing_panel.cc:92
 msgid "Trim from end"
 msgstr "裁剪结束"
 
-#: src/wx/timing_panel.cc:99
+#: src/wx/timing_panel.cc:89
 msgid "Trim from start"
 msgstr "开始裁剪"
 
-#: src/wx/timing_panel.cc:102
+#: src/wx/timing_panel.cc:91
 msgid "Trim up to current position"
 msgstr "裁剪至当前位置"
 
-#: src/wx/audio_dialog.cc:340
+#: src/wx/audio_dialog.cc:388
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_dialog.cc:109 src/wx/config_dialog.cc:790
-#: src/wx/video_panel.cc:86
+#: src/wx/screen_dialog.cc:52
+#, fuzzy
+msgid "Trusted Device"
+msgstr "其它可信设备(服务器设备)"
+
+#: src/wx/screen_dialog.cc:65
+#, fuzzy
+msgid "Trusted Device certificate"
+msgstr "接受证书(设备)"
+
+#: src/wx/audio_dialog.cc:110 src/wx/config_dialog.cc:361
+#: src/wx/video_panel.cc:88
 msgid "Type"
 msgstr "类型"
 
@@ -1806,15 +2468,15 @@ msgstr "UTC偏差（时区）"
 msgid "UTC+1"
 msgstr "东1区"
 
-#: src/wx/cinema_dialog.cc:110
+#: src/wx/cinema_dialog.cc:111
 msgid "UTC+10"
 msgstr "东10区"
 
-#: src/wx/cinema_dialog.cc:111
+#: src/wx/cinema_dialog.cc:112
 msgid "UTC+11"
 msgstr "东11区"
 
-#: src/wx/cinema_dialog.cc:112
+#: src/wx/cinema_dialog.cc:113
 msgid "UTC+12"
 msgstr "东12区"
 
@@ -1854,6 +2516,10 @@ msgstr "东8区 (北京时间)"
 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区"
@@ -1906,173 +2572,292 @@ msgstr "西8区"
 msgid "UTC-9"
 msgstr "西9区"
 
-#: src/wx/update_dialog.cc:29
+#: src/wx/update_dialog.cc:30
 msgid "Update"
 msgstr "更新"
 
-#: src/wx/dcp_panel.cc:161
+#: src/wx/dcp_panel.cc:115
 msgid "Upload DCP to TMS after it is made"
 msgstr "制作好DCP后上传到TMS"
 
-#: src/wx/dcp_panel.cc:82
+#: src/wx/dcp_panel.cc:79
 msgid "Use ISDCF name"
 msgstr "使用ISDCF名称"
 
-#: src/wx/dcp_panel.cc:664
+#: src/wx/text_panel.cc:72
+#, fuzzy
+msgid "Use as"
+msgstr "使用最佳"
+
+#: src/wx/dcp_panel.cc:762
 msgid "Use best"
 msgstr "使用最佳"
 
-#: src/wx/content_colour_conversion_dialog.cc:45
+#: src/wx/content_colour_conversion_dialog.cc:46
 msgid "Use preset"
 msgstr "使用预设"
 
-#: src/wx/subtitle_panel.cc:59
-msgid "Use subtitles"
-msgstr "使用字幕"
+#: src/wx/audio_panel.cc:54
+msgid "Use this DCP's audio as OV and make VF"
+msgstr "将此DCP中的音频作为OV然后制作VF"
+
+#: src/wx/text_panel.cc:61
+#, fuzzy
+msgid "Use this DCP's closed caption as OV and make VF"
+msgstr "将此DCP中的音频作为OV然后制作VF"
+
+#: src/wx/text_panel.cc:59
+msgid "Use this DCP's subtitle as OV and make VF"
+msgstr "将此DCP中的字幕作为OV然后制作VF"
 
-#: src/wx/config_dialog.cc:1245
+#: src/wx/video_panel.cc:80
+msgid "Use this DCP's video as OV and make VF"
+msgstr "将此DCP中的视频作为OV然后制作VF"
+
+#: src/wx/config_move_dialog.cc:30
+msgid "Use this file as new configuration"
+msgstr "将这个文件作为新设置"
+
+#: src/wx/full_config_dialog.cc:667 src/wx/full_config_dialog.cc:772
 msgid "User name"
 msgstr "用户名"
 
-#: src/wx/content_properties_dialog.cc:73 src/wx/dcp_panel.cc:114
-#: src/wx/timeline_labels_view.cc:38 src/wx/timeline_labels_view.cc:69
-#: src/wx/video_panel.cc:75
+#: src/wx/content_properties_dialog.cc:74 src/wx/dcp_panel.cc:120
+#: src/wx/timeline_labels_view.cc:39 src/wx/timeline_labels_view.cc:70
+#: src/wx/video_panel.cc:78
 msgid "Video"
 msgstr "视频"
 
-#: src/wx/video_waveform_dialog.cc:36
+#: src/wx/video_waveform_dialog.cc:38
 msgid "Video Waveform"
 msgstr "视频波形"
 
-#: src/wx/timing_panel.cc:116
+#: src/wx/timing_panel.cc:98
 msgid "Video frame rate"
 msgstr "视频帧率"
 
-#: src/wx/subtitle_panel.cc:130
+#: src/wx/text_panel.cc:108
 msgid "View..."
-msgstr "视图窗口"
+msgstr "视图窗口…"
 
-#: src/wx/config_dialog.cc:1575
+#: src/wx/full_config_dialog.cc:1393
 msgid "Warnings"
 msgstr "警告"
 
-#: src/wx/colour_conversion_editor.cc:151
+#: src/wx/player_config_dialog.cc:347
+msgid "Watermark"
+msgstr ""
+
+#: src/wx/monitor_dialog.cc:40
+#, fuzzy
+msgid "Week of manufacture"
+msgstr "服务器制造商"
+
+#: src/wx/colour_conversion_editor.cc:153
 msgid "White point"
 msgstr "白点"
 
-#: src/wx/colour_conversion_editor.cc:175
+#: src/wx/colour_conversion_editor.cc:177
 msgid "White point adjustment"
 msgstr "白点调整"
 
-#: src/wx/about_dialog.cc:135
+#: src/wx/about_dialog.cc:107
 msgid "With help from"
 msgstr "帮助"
 
-#: src/wx/kdm_output_panel.cc:126
+#: src/wx/kdm_output_panel.cc:117
 msgid "Write a ZIP file for each cinema's KDMs"
-msgstr ""
+msgstr "将所有KDM保存到同一个zip压缩文件中"
 
-#: src/wx/kdm_output_panel.cc:124
+#: src/wx/kdm_output_panel.cc:115
 msgid "Write a folder for each cinema's KDMs"
-msgstr ""
+msgstr "将每个KDM保存到单独的文件夹中"
 
-#: src/wx/kdm_output_panel.cc:122
+#: src/wx/kdm_output_panel.cc:113
 msgid "Write all KDMs to the same folder"
+msgstr "将所有KDM保存到同一个文件夹中"
+
+#: src/wx/export_dialog.cc:62
+msgid "Write reels into separate files"
 msgstr ""
 
-#: src/wx/kdm_output_panel.cc:103 src/wx/self_dkdm_dialog.cc:75
+#: src/wx/kdm_output_panel.cc:94 src/wx/self_dkdm_dialog.cc:77
 msgid "Write to"
-msgstr "输出目录："
+msgstr "输出到"
 
-#: src/wx/about_dialog.cc:97
+#: src/wx/about_dialog.cc:99
 msgid "Written by"
 msgstr "撰稿"
 
-#: src/wx/subtitle_panel.cc:68
-msgid "X Offset"
-msgstr "X 偏移"
-
-#: src/wx/subtitle_panel.cc:88
-msgid "X Scale"
-msgstr "X 缩放"
-
-#: src/wx/subtitle_panel.cc:78
-msgid "Y Offset"
-msgstr "Y 偏移"
+#: src/wx/text_panel.cc:80 src/wx/text_panel.cc:88
+msgid "X"
+msgstr ""
 
-#: src/wx/subtitle_panel.cc:98
-msgid "Y Scale"
-msgstr "Y 缩放"
+#: src/wx/text_panel.cc:83 src/wx/text_panel.cc:91
+msgid "Y"
+msgstr ""
 
-#: src/wx/colour_conversion_editor.cc:106
+#: src/wx/colour_conversion_editor.cc:108
 msgid "YUV to RGB conversion"
 msgstr "YUV转换到RGB(色彩空间)"
 
-#: src/wx/colour_conversion_editor.cc:108
+#: src/wx/colour_conversion_editor.cc:110
 msgid "YUV to RGB matrix"
 msgstr "YUV转换到RGB矩阵(色彩空间)"
 
-#: src/wx/screens_panel.cc:217
+#: src/wx/monitor_dialog.cc:42
+#, fuzzy
+msgid "Year of manufacture"
+msgstr "服务器制造商"
+
+#: src/wx/screens_panel.cc:218
 #, c-format
 msgid ""
 "You cannot add a screen called '%s' as the cinema already has a screen with "
 "this name."
 msgstr "存在同名银幕，不能添加新银幕 '%s' ."
 
-#: src/wx/screens_panel.cc:258
+#: src/wx/screens_panel.cc:259
 #, 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/report_problem_dialog.cc:68
+#: src/wx/kdm_output_panel.cc:209
+msgid ""
+"You have selected some cinemas that have no configured email address.  Do "
+"you want to continue?"
+msgstr "您选择了一些没有邮箱信息的影院。需要继续吗？"
+
+#: src/wx/kdm_output_panel.cc:197
+msgid ""
+"You must set up a mail server in Preferences before you can send emails."
+msgstr "您必须先在偏好设置中设定邮件服务器才能发送邮件."
+
+#: src/wx/send_i18n_dialog.cc:41
+#, fuzzy
+msgid "Your email"
+msgstr "您的邮箱地址"
+
+#: src/wx/report_problem_dialog.cc:70
 msgid "Your email address"
 msgstr "您的邮箱地址"
 
-#: src/wx/video_waveform_dialog.cc:72
+#: src/wx/send_i18n_dialog.cc:37
+#, fuzzy
+msgid "Your name"
+msgstr "文件夹名称"
+
+#: src/wx/timeline_dialog.cc:67
+msgid "Zoom"
+msgstr ""
+
+#: src/wx/timeline_dialog.cc:68
+msgid "Zoom all"
+msgstr ""
+
+#: src/wx/timeline_dialog.cc:67
+msgid "Zoom in / out"
+msgstr ""
+
+#: src/wx/timeline_dialog.cc:68
+msgid "Zoom out to whole film"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:972
+msgid "certificates.barco.com password"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:968
+msgid "certificates.barco.com user name"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:980
+msgid "certificates.christiedigital.com password"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:976
+msgid "certificates.christiedigital.com user name"
+msgstr ""
+
+#: src/wx/text_panel.cc:75
+msgid "closed captions"
+msgstr ""
+
+#: src/wx/video_waveform_dialog.cc:74
 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:75
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/name_format_editor.cc:74
+#: src/wx/config_dialog.cc:896
+msgid "dcpomatic_kdm_decryption_cert.pem"
+msgstr ""
+
+#: src/wx/config_dialog.cc:874
+msgid "dcpomatic_kdm_decryption_chain.pem"
+msgstr ""
+
+#: src/wx/name_format_editor.cc:75
 #, c-format
 msgid "e.g. %s"
 msgstr "例如 %s"
 
 #. // TRANSLATORS: this is an abbreviation for "frames"
-#: src/wx/timing_panel.cc:82
+#: src/wx/timing_panel.cc:79
 msgid "f"
 msgstr "帧"
 
+#: src/wx/player_config_dialog.cc:93
+#, fuzzy
+msgid "full screen"
+msgstr "编辑放映厅服务器（证书）"
+
+#: src/wx/player_config_dialog.cc:94
+msgid "full screen with controls on other monitor"
+msgstr ""
+
 #. // TRANSLATORS: this is an abbreviation for "hours"
-#: src/wx/timing_panel.cc:60
+#: src/wx/timing_panel.cc:63
 msgid "h"
 msgstr "时"
 
 #. // TRANSLATORS: this is an abbreviation for "minutes"
-#: src/wx/timing_panel.cc:68
+#: src/wx/timing_panel.cc:69
 msgid "m"
 msgstr "分"
 
+#: src/wx/player_config_dialog.cc:374
+msgid "milliseconds"
+msgstr ""
+
+#: src/wx/player_config_dialog.cc:367
+msgid "minutes"
+msgstr ""
+
 #. / TRANSLATORS: this is an abbreviation for milliseconds, the unit of time
-#: src/wx/audio_panel.cc:94 src/wx/config_dialog.cc:540
+#: src/wx/audio_panel.cc:89 src/wx/full_config_dialog.cc:370
 msgid "ms"
 msgstr "毫秒"
 
-#: src/wx/config_dialog.cc:1349
+#: src/wx/text_panel.cc:74
+#, fuzzy
+msgid "open subtitles"
+msgstr "使用字幕"
+
+#: src/wx/full_config_dialog.cc:765
 msgid "port"
 msgstr "端口"
 
 #. // TRANSLATORS: this is an abbreviation for "seconds"
-#: src/wx/config_dialog.cc:498 src/wx/timing_panel.cc:75
+#: src/wx/full_config_dialog.cc:324 src/wx/timing_panel.cc:74
 msgid "s"
 msgstr "秒"
 
-#: src/wx/colour_conversion_editor.cc:76
+#: src/wx/colour_conversion_editor.cc:78
 msgid "threshold"
 msgstr "最低"
 
@@ -2080,18 +2865,86 @@ msgstr "最低"
 msgid "times"
 msgstr "时间"
 
-#: src/wx/kdm_timing_panel.cc:49
+#: src/wx/kdm_timing_panel.cc:50
 msgid "until"
 msgstr "终止"
 
-#: src/wx/colour_conversion_editor.cc:125
+#: src/wx/player_config_dialog.cc:92
+msgid "window"
+msgstr ""
+
+#: src/wx/colour_conversion_editor.cc:127
 msgid "x"
 msgstr "x"
 
-#: src/wx/colour_conversion_editor.cc:126
+#: src/wx/colour_conversion_editor.cc:128
 msgid "y"
 msgstr "y"
 
+#~ msgid "Mail password"
+#~ msgstr "邮箱登录密码"
+
+#~ msgid "Mail user name"
+#~ msgstr "邮箱用户名"
+
+#, fuzzy
+#~ msgid "Add"
+#~ msgstr "添加..."
+
+#~ msgid "Load..."
+#~ msgstr "加载..."
+
+#, fuzzy
+#~ msgid "Save..."
+#~ msgstr "重命名..."
+
+#~ msgid "Select certificate file"
+#~ msgstr "选择证书文件"
+
+#, fuzzy
+#~ msgid "Select playlist file"
+#~ msgstr "选择输出文件"
+
+#~ msgid "Crop"
+#~ msgstr "裁剪"
+
+#~ msgid "Top"
+#~ msgstr "顶部"
+
+#, fuzzy
+#~ msgid "Subtitle/captions"
+#~ msgstr "字幕"
+
+#~ msgid "Left eye"
+#~ msgstr "左眼"
+
+#~ msgid "Make DCP anyway"
+#~ msgstr "强制制作DCP"
+
+#~ msgid "Right eye"
+#~ msgstr "右眼"
+
+#~ msgid "Subtitle"
+#~ msgstr "字幕"
+
+#~ msgid "Y Offset"
+#~ msgstr "Y 偏移"
+
+#~ msgid "Y Scale"
+#~ msgstr "Y 缩放"
+
+#~ msgid "No DCP selected."
+#~ msgstr "没有选择DCP."
+
+#~ msgid "Time"
+#~ msgstr "时间"
+
+#~ msgid "Refer to existing DCP"
+#~ msgstr "参考现有的DCP"
+
+#~ msgid "New Film"
+#~ msgstr "新建工程"
+
 #~ msgid "Could not get video for view (%s)"
 #~ msgstr "无法获取视频 (%s)"
 
@@ -2213,9 +3066,6 @@ msgstr "y"
 #~ msgid "Other"
 #~ msgstr "其他"
 
-#~ msgid "Server manufacturer"
-#~ msgstr "服务器制造商"
-
 #~ msgid "Server serial number"
 #~ msgstr "服务器序列"