X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fpo%2Fzh_CN.po;h=43e1967650715eebe5921f134ea8dca8db371813;hb=c4b76ea025e0d6430023bf42d115e6fb86e61a55;hp=110c1b75f66d4f9b908bc9c1bac1c7cb1ef0fed1;hpb=b256a6fa3514bc5ef1e1d72c4bb7e9f24bcc2492;p=dcpomatic.git

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 110c1b75f..43e196765 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -7,10 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-O-MATIC_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-06-29 22:02+0100\n"
-"PO-Revision-Date: 2016-03-27 22:12+0800\n"
-"Last-Translator: Rov(若文)\n"
-"Language-Team: Rov(若文) <lojy2009@qq.com>\n"
+"POT-Creation-Date: 2017-02-15 00:11+0000\n"
+"PO-Revision-Date: 2016-12-19 22:13+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"
@@ -27,12 +27,14 @@ msgstr ""
 #
 #: 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
 msgid "%"
 msgstr "%"
 
 #: src/wx/about_dialog.cc:83
+#, fuzzy
 msgid ""
-"(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n"
+"(C) 2012-2017 Carl Hetherington, Terrence Meiczinger\n"
 " Ole Laursen, Brecht Sanders"
 msgstr ""
 "(C) 2012-2016 Carl Hetherington, Terrence Meiczinger\n"
@@ -42,14 +44,22 @@ msgstr ""
 msgid "(None)"
 msgstr "无"
 
-#: src/wx/config_dialog.cc:186
+#: src/wx/config_dialog.cc:188
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(重启DCP-O-MATIC查看语言变化)"
 
-#: src/wx/audio_mapping_view.cc:158
+#: src/wx/audio_mapping_view.cc:167
 msgid "-6dB"
 msgstr "-6db"
 
+#: src/wx/wx_util.cc:377
+msgid "12 - 7.1/HI/VI"
+msgstr "12声道—7.1+听力障碍声道/视力障碍声道"
+
+#: src/wx/wx_util.cc:369
+msgid "2 - stereo"
+msgstr "2声道—立体声"
+
 #: src/wx/rgba_colour_picker.cc:36
 msgid "255"
 msgstr "255"
@@ -62,11 +72,11 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "伪3D"
 
-#: src/wx/dcp_panel.cc:710
+#: src/wx/dcp_panel.cc:712
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:668 src/wx/video_panel.cc:235
+#: src/wx/dcp_panel.cc:670 src/wx/video_panel.cc:235
 msgid "3D"
 msgstr "3D"
 
@@ -90,15 +100,27 @@ msgstr "仅右眼(3D)"
 msgid "3D top/bottom"
 msgstr "上下眼(3D)"
 
-#: src/wx/dcp_panel.cc:711
+#: src/wx/wx_util.cc:371
+msgid "4 - L/C/R/Lfe"
+msgstr "4声道—左/中/右/低音"
+
+#: src/wx/dcp_panel.cc:713
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/image_subtitle_colour_dialog.cc:41
+#: src/wx/wx_util.cc:373
+msgid "6 - 5.1"
+msgstr "6声道—5.1声道"
+
+#: src/wx/wx_util.cc:375
+msgid "8 - 5.1/HI/VI"
+msgstr "8声道—5.1+听力障碍声道/视力障碍声道"
+
+#: src/wx/image_subtitle_colour_dialog.cc:54
 msgid "<b>New colour</b>"
 msgstr "<b>新色彩空间</b>"
 
-#: src/wx/image_subtitle_colour_dialog.cc:38
+#: src/wx/image_subtitle_colour_dialog.cc:51
 msgid "<b>Original colour</b>"
 msgstr "<b>原色彩空间</b>"
 
@@ -108,65 +130,57 @@ msgstr "<b>原色彩空间</b>"
 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>"
-msgstr ""
+msgstr "<i>请输入一个有效的邮箱地址，否则我们将无法解决您的问题！</i>"
 
 #. //trac.wxwidgets.org/ticket/13389
 #.
-#: src/wx/timing_panel.cc:131
-#, fuzzy
+#: src/wx/timing_panel.cc:132
 msgid ""
 "<i>Only change this if the content's frame rate has been read incorrectly.</"
 "i>"
-msgstr "检测到帧率错误。"
+msgstr "<i>当帧率错误是进行此项设置。</i>"
 
-#: src/wx/colour_conversion_editor.cc:68
+#: src/wx/colour_conversion_editor.cc:79
 msgid "A"
 msgstr "A"
 
-#: src/wx/hints_dialog.cc:141
-msgid ""
-"A few projectors have problems playing back very high bit-rate DCPs.  It is "
-"a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
-"unlikely to have any visible effect on the image."
-msgstr ""
-"高码率打包可能对于有些放映机不支持,我们推荐使用200Mbit/s以内的码率来进行打"
-"包，这种细微的调整肉眼很难分辨的！"
-
 #: 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"
 msgstr "关于 DCP-o-matic"
 
 #: src/wx/screens_panel.cc:150
-#, fuzzy
 msgid "Add Cinema"
 msgstr "添加影院"
 
 #: src/wx/screens_panel.cc:57
 msgid "Add Cinema..."
-msgstr "添加影院"
+msgstr "添加影院..."
 
-#: src/wx/content_menu.cc:68
+#: 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
-#, fuzzy
 msgid "Add Screen"
-msgstr "添加新服务器"
+msgstr "添加银幕（放映服务器）"
 
-#: src/wx/screens_panel.cc:59
+#: src/wx/screens_panel.cc:63
 msgid "Add Screen..."
-msgstr "添加新服务器"
+msgstr "添加银幕（放映服务器）..."
 
 #: src/wx/content_panel.cc:86
 msgid ""
 "Add a folder of image files (which will be used as a moving image sequence) "
 "or a DCP."
-msgstr "添加序列图文件夹或DCP包文件夹"
+msgstr "添加序列帧文件夹或DCP包文件夹"
 
 #: src/wx/content_panel.cc:81
 msgid "Add file(s)..."
@@ -174,45 +188,29 @@ msgstr "添加文件..."
 
 #: src/wx/content_panel.cc:85
 msgid "Add folder..."
-msgstr "添加文件夹"
+msgstr "添加文件夹..."
 
-#: src/wx/image_sequence_dialog.cc:26
+#: src/wx/image_sequence_dialog.cc:28
 msgid "Add image sequence"
-msgstr "加图像序列"
+msgstr "添加图像序列"
 
 #: src/wx/content_panel.cc:82
 msgid "Add video, image or sound files to the film."
 msgstr "添加视频、图片或音频文件"
 
-#: src/wx/config_dialog.cc:712 src/wx/editable_list.h:82
+#: src/wx/config_dialog.cc:727 src/wx/editable_list.h:74
 msgid "Add..."
 msgstr "添加..."
 
-#: src/wx/cinema_dialog.cc:71 src/wx/config_dialog.cc:1248
+#: src/wx/cinema_dialog.cc:71 src/wx/config_dialog.cc:1288
 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/hints_dialog.cc:129
-msgid ""
-"All of your content is at 1.85:1 or narrower but your DCP's container is "
-"Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
-"frame.  You may prefer to set your DCP's container to Flat (1.85:1) in the "
-"\"DCP\" tab."
-msgstr "遮幅(1.85：1)左右去黑边。"
-
-#: src/wx/hints_dialog.cc:123
-msgid ""
-"All of your content is in Scope (2.39:1) but your DCP's container is Flat "
-"(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
-"You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" "
-"tab."
-msgstr "宽幅(2.39：1)上下去黑边。"
-
-#: src/wx/config_dialog.cc:1397
+#: src/wx/config_dialog.cc:1447
 msgid "Allow any DCP frame rate"
 msgstr "允许任何DCP帧速率"
 
@@ -220,16 +218,32 @@ msgstr "允许任何DCP帧速率"
 msgid "Alpha   0"
 msgstr "透明度 0"
 
-#: src/wx/subtitle_panel.cc:125
+#: src/wx/kdm_dialog.cc:201
+msgid "An unknown exception occurred."
+msgstr "出现未知错误。"
+
+#: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
-msgstr "显示"
+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:35
+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 ""
+msgstr "全景声"
 
-#: src/wx/audio_dialog.cc:47 src/wx/audio_panel.cc:48
-#: src/wx/content_properties_dialog.cc:77 src/wx/dcp_panel.cc:114
+#: src/wx/audio_dialog.cc:49 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 "音频"
@@ -238,32 +252,32 @@ msgstr "音频"
 msgid "Audio Language (e.g. EN)"
 msgstr "音频语言 (例如 CMN)"
 
-#: src/wx/audio_mapping_view.cc:332
+#: src/wx/audio_mapping_view.cc:342
 #, 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:335
+#: src/wx/audio_mapping_view.cc:345
 #, 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:210
+#: src/wx/config_dialog.cc:212
 msgid "Automatically analyse content audio"
-msgstr "自动解析内容中的音频"
+msgstr "自动解析源内容中的音频"
 
-#: src/wx/colour_conversion_editor.cc:71
+#: src/wx/colour_conversion_editor.cc:82
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1260
+#: src/wx/config_dialog.cc:1299
 msgid "BCC address"
-msgstr "密送地址"
+msgstr "抄送地址"
 
-#: src/wx/colour_conversion_editor.cc:133
+#: src/wx/colour_conversion_editor.cc:144
 msgid "Blue chromaticity"
 msgstr "蓝色色度"
 
@@ -291,11 +305,11 @@ msgstr "字幕以图像输出"
 msgid "But I have to use fader"
 msgstr "使用推子"
 
-#: src/wx/config_dialog.cc:1249
+#: src/wx/config_dialog.cc:1289
 msgid "CC addresses"
 msgstr "抄送地址 "
 
-#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:73
+#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:85
 #: src/wx/self_dkdm_dialog.cc:59
 msgid "CPL"
 msgstr "CPL"
@@ -308,19 +322,23 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL注释文本"
 
+#: src/wx/kdm_dialog.cc:197
+msgid "CPL's content is not encrypted."
+msgstr "该内容没有加密"
+
 #: src/wx/audio_panel.cc:78
 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
+#: src/wx/content_sub_panel.cc:64
 msgid "Cannot reference this DCP.  "
 msgstr "不能引用该DCP"
 
-#: src/wx/dolby_doremi_certificate_panel.cc:203
+#: src/wx/dolby_doremi_certificate_panel.cc:204
 msgid "Certificate downloaded"
 msgstr "证书下载"
 
@@ -332,19 +350,23 @@ msgstr "链接"
 msgid "Channel gain"
 msgstr "信道增益"
 
-#: src/wx/audio_dialog.cc:81 src/wx/dcp_panel.cc:753
+#: src/wx/audio_dialog.cc:90 src/wx/dcp_panel.cc:744
 msgid "Channels"
 msgstr "通道"
 
-#: src/wx/config_dialog.cc:218
+#: src/wx/config_dialog.cc:220
 msgid "Check for testing updates on startup"
-msgstr "启动时检查更新 "
+msgstr "启动时检查软件更新"
 
-#: src/wx/config_dialog.cc:214
+#: src/wx/config_dialog.cc:216
 msgid "Check for updates on startup"
-msgstr "启动时检查更新"
+msgstr "启动时检查软件更新"
+
+#: src/wx/content_menu.cc:80
+msgid "Choose CPL..."
+msgstr "选择CPL"
 
-#: src/wx/content_menu.cc:253
+#: src/wx/content_menu.cc:294
 msgid "Choose a file"
 msgstr "选择一个文件"
 
@@ -352,7 +374,7 @@ msgstr "选择一个文件"
 msgid "Choose a file or files"
 msgstr "选择一个或多个文件"
 
-#: src/wx/content_menu.cc:248 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:289 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "选择一个文件夹"
 
@@ -364,15 +386,15 @@ msgstr "选择字体"
 msgid "Choose a font file"
 msgstr "选择一个字体文件"
 
-#: src/wx/config_dialog.cc:199
+#: src/wx/config_dialog.cc:201
 msgid "Cinema and screen database file"
-msgstr "厅和屏幕数据库文件"
+msgstr "放映厅和银幕数据库文件"
 
 #: src/wx/content_widget.h:76
 msgid "Click the button to set all selected content to the same value."
 msgstr "单击该按钮可将所有选定的内容为相同的值。"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:33
+#: src/wx/text_subtitle_appearance_dialog.cc:49
 msgid "Colour"
 msgstr "色彩空间"
 
@@ -382,37 +404,36 @@ msgstr "色彩转换"
 
 #. / TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
 #: src/wx/video_panel.cc:206
-#, fuzzy
 msgid "Colour|Custom"
-msgstr "色彩空间"
+msgstr "自定义"
 
-#: src/wx/video_waveform_dialog.cc:50
+#: src/wx/video_waveform_dialog.cc:58
 msgid "Component"
-msgstr "构成"
+msgstr "结构"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
-#: src/wx/config_dialog.cc:1422
+#: src/wx/config_dialog.cc:1495
 msgid "Config|Timing"
-msgstr "同步"
+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:643
+#: src/wx/dcp_panel.cc:645
 msgid "Container"
-msgstr "格式"
+msgstr "封装格式"
 
-#: src/wx/audio_mapping_view.cc:415 src/wx/audio_mapping_view.cc:417
-#: src/wx/film_editor.cc:52
+#: src/wx/audio_mapping_view.cc:437 src/wx/audio_mapping_view.cc:439
+#: src/wx/film_editor.cc:54
 msgid "Content"
 msgstr "内容"
 
-#: src/wx/content_properties_dialog.cc:38
+#: src/wx/content_properties_dialog.cc:37
 msgid "Content Properties"
 msgstr "内容属性"
 
-#: src/wx/dcp_panel.cc:105
+#: src/wx/dcp_panel.cc:106
 msgid "Content Type"
 msgstr "内容类型"
 
@@ -420,44 +441,44 @@ msgstr "内容类型"
 msgid "Content version"
 msgstr "内容版本"
 
-#: src/wx/video_waveform_dialog.cc:53
+#: src/wx/video_waveform_dialog.cc:61
 msgid "Contrast"
-msgstr "对比"
+msgstr "对比度"
 
-#: src/wx/dcp_panel.cc:88
+#: src/wx/dcp_panel.cc:89
 msgid "Copy as name"
 msgstr "复制名称"
 
-#: src/wx/audio_dialog.cc:230
+#: src/wx/audio_dialog.cc:247
 msgid "Could not analyse audio."
 msgstr "无法分析音频。"
 
-#: src/wx/film_viewer.cc:199
+#: src/wx/film_viewer.cc:203
 #, c-format
 msgid "Could not get video for view (%s)"
 msgstr "无法获取视频 (%s)"
 
-#: src/wx/content_menu.cc:329
+#: src/wx/content_menu.cc:374
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "无法加载 KDM (%s)"
 
-#: src/wx/config_dialog.cc:789 src/wx/config_dialog.cc:957
-#: src/wx/download_certificate_panel.cc:56 src/wx/screen_dialog.cc:156
+#: src/wx/config_dialog.cc:805 src/wx/config_dialog.cc:973
+#: 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/config_dialog.cc:948
-#, fuzzy, c-format
+#: src/wx/config_dialog.cc:964
+#, c-format
 msgid "Could not read key file; file is too long (%s)"
-msgstr "无法读取密钥文件 (%s)"
+msgstr "无法读取Key文件，因为文件过长 (%s)"
 
-#: src/wx/new_film_dialog.cc:41
+#: src/wx/new_film_dialog.cc:42
 msgid "Create in folder"
 msgstr "创建文件夹"
 
-#: src/wx/config_dialog.cc:229
+#: src/wx/config_dialog.cc:231
 msgid "Creator"
 msgstr "创建者"
 
@@ -465,77 +486,90 @@ msgstr "创建者"
 msgid "Crop"
 msgstr "裁剪"
 
-#: src/wx/audio_mapping_view.cc:446 src/wx/audio_mapping_view.cc:448
-#: src/wx/film_editor.cc:54
+#: src/wx/audio_mapping_view.cc:472 src/wx/audio_mapping_view.cc:474
+#: src/wx/film_editor.cc:56
 msgid "DCP"
 msgstr "DCP"
 
+#: src/wx/config_dialog.cc:1468
+msgid "DCP asset filename format"
+msgstr "DCP内容的文件名格式"
+
 #: src/wx/kdm_cpl_panel.cc:44
 msgid "DCP directory"
 msgstr "DCP目录"
 
-#: src/wx/about_dialog.cc:50 src/wx/wx_util.cc:88 src/wx/wx_util.cc:100
-#: src/wx/wx_util.cc:108
+#: src/wx/config_dialog.cc:1456
+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
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:135
+#: src/wx/audio_dialog.cc:148
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic音频"
 
-#: src/wx/config_dialog.cc:1424
+#: src/wx/config_dialog.cc:1497
 msgid "Debug: decode"
 msgstr "解码"
 
-#: src/wx/config_dialog.cc:1428
+#: src/wx/config_dialog.cc:1501
 msgid "Debug: email sending"
 msgstr "发送到邮箱"
 
-#: src/wx/config_dialog.cc:1426
+#: src/wx/config_dialog.cc:1499
 msgid "Debug: encode"
 msgstr "编码"
 
-#: src/wx/config_dialog.cc:1038
+#: src/wx/config_dialog.cc:1054
 msgid "Decrypting DCPs"
 msgstr "解密DCP"
 
-#: src/wx/config_dialog.cc:435
+#: src/wx/config_dialog.cc:437
 msgid "Default DCP audio channels"
-msgstr ""
+msgstr "默认DCP音频通道"
 
-#: src/wx/config_dialog.cc:423
+#: src/wx/config_dialog.cc:425
 msgid "Default ISDCF name details"
 msgstr "默认ISDCF名称的详细信息"
 
-#: src/wx/config_dialog.cc:440
+#: src/wx/config_dialog.cc:442
 msgid "Default JPEG2000 bandwidth"
 msgstr "默认JPEG2000码率"
 
-#: src/wx/config_dialog.cc:449
+#: src/wx/config_dialog.cc:463
+#, fuzzy
+msgid "Default KDM directory"
+msgstr "新工程默认目录"
+
+#: src/wx/config_dialog.cc:451
 msgid "Default audio delay"
 msgstr "默认音频延迟"
 
-#: src/wx/config_dialog.cc:427
+#: src/wx/config_dialog.cc:429
 msgid "Default container"
 msgstr "默认显示比例"
 
-#: src/wx/config_dialog.cc:431
+#: src/wx/config_dialog.cc:433
 msgid "Default content type"
 msgstr "默认类型"
 
-#: src/wx/config_dialog.cc:415
+#: src/wx/config_dialog.cc:417
 msgid "Default directory for new films"
 msgstr "新工程默认目录"
 
-#: src/wx/config_dialog.cc:407
+#: src/wx/config_dialog.cc:409
 msgid "Default duration of still images"
-msgstr "默认持续时间"
+msgstr "默认持续时间(黑场)"
 
-#: src/wx/config_dialog.cc:457
+#: src/wx/config_dialog.cc:459
 msgid "Default standard"
-msgstr "默认打包类型"
+msgstr "默认打包标准类型"
 
-#: src/wx/config_dialog.cc:389
+#: src/wx/config_dialog.cc:391
 msgid "Defaults"
 msgstr "默认"
 
@@ -543,7 +577,7 @@ msgstr "默认"
 msgid "Delay"
 msgstr "延迟"
 
-#: src/wx/dcp_panel.cc:86 src/wx/job_view.cc:57
+#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:62
 msgid "Details..."
 msgstr "详细..."
 
@@ -551,9 +585,17 @@ msgstr "详细..."
 msgid "Dolby / Doremi"
 msgstr "杜比 / 哆来咪"
 
-#: src/wx/content_panel.cc:97
-msgid "Down"
-msgstr "下移"
+#: src/wx/confirm_kdm_email_dialog.cc:42
+msgid "Don't ask this again"
+msgstr "不再询问"
+
+#: src/wx/confirm_kdm_email_dialog.cc:50
+msgid "Don't send emails"
+msgstr "不发送电子邮件"
+
+#: src/wx/hints_dialog.cc:45
+msgid "Don't show hints again"
+msgstr "不再显示小提示"
 
 #: src/wx/download_certificate_dialog.cc:39
 msgid "Download"
@@ -563,39 +605,49 @@ msgstr "下载"
 msgid "Download certificate"
 msgstr "下载证书"
 
-#: src/wx/screen_dialog.cc:90
+#: src/wx/screen_dialog.cc:91
 msgid "Download..."
 msgstr "下载..."
 
-#: src/wx/dolby_doremi_certificate_panel.cc:55
+#: src/wx/dolby_doremi_certificate_panel.cc:56
 msgid "Downloading certificate"
 msgstr "下载证书"
 
-#: src/wx/screens_panel.cc:61
+#: src/wx/content_panel.cc:93
+msgid "Earlier"
+msgstr "上移"
+
+#: src/wx/screens_panel.cc:59
 msgid "Edit Cinema..."
-msgstr "编辑影城..."
+msgstr "编辑影院"
 
-#: src/wx/screens_panel.cc:63
+#: src/wx/screens_panel.cc:65
 msgid "Edit Screen..."
-msgstr "编辑服务器..."
+msgstr "编辑放映厅服务器（证书）"
 
 #: src/wx/screens_panel.cc:170
-#, fuzzy
 msgid "Edit cinema"
-msgstr "编辑影城..."
+msgstr "编辑影院"
 
-#: src/wx/screens_panel.cc:232
-#, fuzzy
+#: src/wx/screens_panel.cc:246
 msgid "Edit screen"
-msgstr "编辑服务器..."
+msgstr "编辑放映厅服务器（证书）"
 
-#: src/wx/audio_mapping_view.cc:159 src/wx/config_dialog.cc:424
-#: src/wx/dcp_panel.cc:133 src/wx/fonts_dialog.cc:78 src/wx/video_panel.cc:188
-#: src/wx/video_panel.cc:209 src/wx/editable_list.h:85
+#: 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:77
 msgid "Edit..."
 msgstr "编辑..."
 
-#: src/wx/email_dialog.cc:28 src/wx/email_dialog.cc:30
+#: src/wx/text_subtitle_appearance_dialog.cc:54
+msgid "Effect"
+msgstr "效果"
+
+#: src/wx/text_subtitle_appearance_dialog.cc:59
+msgid "Effect colour"
+msgstr "效果颜色"
+
+#: src/wx/email_dialog.cc:29 src/wx/email_dialog.cc:31
 msgid "Email address"
 msgstr "发件人地址 "
 
@@ -607,7 +659,7 @@ msgstr "发送KDM到邮箱 "
 msgid "Encoding Servers"
 msgstr "编码服务器"
 
-#: src/wx/dcp_panel.cc:120
+#: src/wx/dcp_panel.cc:121
 msgid "Encrypted"
 msgstr "加密"
 
@@ -615,23 +667,36 @@ msgstr "加密"
 msgid "End"
 msgstr "结束"
 
-#: src/wx/config_dialog.cc:1419
+#: src/wx/report_problem_dialog.cc:107
+#, c-format
+msgid "Enter your email address for the contact, not %s"
+msgstr "请输入您的电子邮件地址，不是 %s"
+
+#: src/wx/config_dialog.cc:1492
 msgid "Errors"
 msgstr "错误"
 
-#: src/wx/config_dialog.cc:716
+#: src/wx/config_dialog.cc:731
 msgid "Export"
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1045
-msgid "Export DCP decryption certificate..."
+#: src/wx/config_dialog.cc:1061
+msgid ""
+"Export DCP decryption\n"
+"certificate..."
 msgstr "导出DCP证书"
 
-#: src/wx/config_dialog.cc:733
+#: src/wx/config_dialog.cc:1063
+msgid ""
+"Export DCP decryption\n"
+"chain..."
+msgstr "导出DCP密匙"
+
+#: src/wx/config_dialog.cc:748
 msgid "Export..."
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1129
+#: src/wx/config_dialog.cc:1169
 msgid "FTP (for Dolby)"
 msgstr "FTP (Dolby)"
 
@@ -643,11 +708,27 @@ msgstr "设备(例如:DLA)"
 msgid "Fade in"
 msgstr "淡入"
 
+#: src/wx/text_subtitle_appearance_dialog.cc:69
+msgid "Fade in time"
+msgstr "淡入时间"
+
 #: src/wx/video_panel.cc:159
 msgid "Fade out"
 msgstr "淡出"
 
-#: src/wx/new_film_dialog.cc:38
+#: src/wx/text_subtitle_appearance_dialog.cc:74
+msgid "Fade out time"
+msgstr "淡出时间"
+
+#: src/wx/kdm_dialog.cc:132
+msgid "File %s already exists.  Do you want to overwrite it?"
+msgstr ""
+
+#: src/wx/kdm_output_panel.cc:51
+msgid "Filename format"
+msgstr "文件名格式"
+
+#: src/wx/new_film_dialog.cc:39
 msgid "Film name"
 msgstr "工程名称"
 
@@ -655,55 +736,59 @@ msgstr "工程名称"
 msgid "Filters"
 msgstr "过滤器"
 
-#: src/wx/config_dialog.cc:205
+#: src/wx/config_dialog.cc:207
 msgid ""
 "Find integrated loudness, true peak and loudness range when analysing audio"
 msgstr "分析音频时，发现综合响度，真实峰值和响度范围！"
 
-#: src/wx/content_menu.cc:65
+#: src/wx/content_menu.cc:73
 msgid "Find missing..."
-msgstr "寻找丢失..."
+msgstr "查询失败..."
 
 #: src/wx/fonts_dialog.cc:38 src/wx/font_files_dialog.cc:28
 #: src/wx/font_files_dialog.cc:30
 msgid "Fonts"
 msgstr "字体..."
 
-#: src/wx/subtitle_panel.cc:123
+#: src/wx/subtitle_panel.cc:133
 msgid "Fonts..."
 msgstr "字体..."
 
-#: src/wx/dcp_panel.cc:654
+#: src/wx/dcp_panel.cc:656
 msgid "Frame Rate"
-msgstr "帧速率"
+msgstr "帧率"
 
-#: src/wx/image_sequence_dialog.cc:28
+#: src/wx/image_sequence_dialog.cc:30
 msgid "Frame rate"
-msgstr "帧速率"
+msgstr "帧率"
 
 #: src/wx/about_dialog.cc:66
 msgid "Free, open-source DCP creation from almost anything."
 msgstr ""
-"免费的DCP打包软件。 - Rov 汉化\n"
-"汉化下载：www.rov8.com ( 放映员资料库)"
+"免费的DCP打包软件。 -汉化：Rov\n"
+"最新汉化请关注：放映员资料库 (www.rov8.com)"
 
 #: src/wx/kdm_timing_panel.cc:36
 msgid "From"
 msgstr "起始"
 
-#: src/wx/config_dialog.cc:1243
+#: src/wx/config_dialog.cc:1283
 msgid "From address"
 msgstr "发件人地址"
 
-#: src/wx/audio_mapping_view.cc:157
+#: src/wx/new_film_dialog.cc:57
+msgid "From template"
+msgstr "从模板"
+
+#: src/wx/audio_mapping_view.cc:166
 msgid "Full"
 msgstr "总"
 
-#: src/wx/timing_panel.cc:95
+#: src/wx/timing_panel.cc:96
 msgid "Full length"
 msgstr "总长度"
 
-#: src/wx/dcp_panel.cc:150
+#: src/wx/dcp_panel.cc:151
 msgid "GB"
 msgstr "GB"
 
@@ -720,19 +805,40 @@ msgstr "增益计算"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "从内容通道  %d 到DCP %d 通道进行增益调整"
 
-#: src/wx/config_dialog.cc:1415 src/wx/content_properties_dialog.cc:71
+#: src/wx/config_dialog.cc:1488 src/wx/content_properties_dialog.cc:70
 msgid "General"
 msgstr "普通"
 
-#: src/wx/screen_dialog.cc:89
+#: src/wx/screen_dialog.cc:90
 msgid "Get from file..."
 msgstr "外置字体 "
 
-#: src/wx/colour_conversion_editor.cc:126
+#: src/wx/hints_dialog.cc:56
+msgid "Go back"
+msgstr "返回"
+
+#: src/wx/playhead_to_timecode_dialog.cc:27
+#: src/wx/playhead_to_frame_dialog.cc:30
+msgid "Go to"
+msgstr "跳转"
+
+#: src/wx/playhead_to_frame_dialog.cc:27
+msgid "Go to frame"
+msgstr "跳转到帧"
+
+#: src/wx/playhead_to_timecode_dialog.cc:24
+msgid "Go to timecode"
+msgstr "跳转到时间码"
+
+#: src/wx/colour_conversion_editor.cc:137
 msgid "Green chromaticity"
 msgstr "绿色色度"
 
-#: src/wx/hints_dialog.cc:39
+#: src/wx/batch_job_view.cc:44
+msgid "Higher prioirity"
+msgstr ""
+
+#: src/wx/hints_dialog.cc:37
 msgid "Hints"
 msgstr "温馨提示"
 
@@ -740,48 +846,56 @@ 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:1112
+#: src/wx/config_dialog.cc:1152
 msgid "IP address"
 msgstr "IP地址"
 
-#: src/wx/config_dialog.cc:622
+#: src/wx/config_dialog.cc:638
 msgid "IP address / host name"
-msgstr "IP地址/服务器名称"
+msgstr "IP地址/服务器地址"
 
 #: src/wx/isdcf_metadata_dialog.cc:32
 msgid "ISDCF name"
 msgstr "ISDCF名称"
 
-#: src/wx/colour_conversion_editor.cc:55
+#: src/wx/video_waveform_dialog.cc:68
+msgid "Image X position"
+msgstr "画面 X 轴位置"
+
+#: 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:335
+#: src/wx/colour_conversion_editor.cc:58
+msgid "Input transfer function"
+msgstr ""
+
+#: src/wx/audio_dialog.cc:351
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "平均响度 %.2f LUFS"
 
-#: src/wx/config_dialog.cc:859
+#: src/wx/config_dialog.cc:875
 msgid "Intermediate"
 msgstr "公钥"
 
@@ -789,11 +903,16 @@ msgstr "公钥"
 msgid "Intermediate common name"
 msgstr "公钥名称"
 
-#: src/wx/config_dialog.cc:497 src/wx/dcp_panel.cc:190
+#: src/wx/config_dialog.cc:503 src/wx/dcp_panel.cc:191
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/config_dialog.cc:225
+#: src/wx/colour_conversion_editor.cc:205
+#, fuzzy
+msgid "Inverse 2.6 gamma correction on output"
+msgstr "伽玛校正"
+
+#: src/wx/config_dialog.cc:227
 msgid "Issuer"
 msgstr "发行"
 
@@ -805,44 +924,50 @@ msgstr "斜体文件"
 msgid "Italic font"
 msgstr "斜体"
 
-#: src/wx/dcp_panel.cc:678
-msgid "JPEG2000 bandwidth"
+#: src/wx/dcp_panel.cc:680
+msgid ""
+"JPEG2000 bandwidth\n"
+"for newly-encoded data"
 msgstr "JPEG2000码率"
 
-#: src/wx/content_menu.cc:64
+#: src/wx/content_menu.cc:72
 msgid "Join"
 msgstr "创建"
 
-#: src/wx/config_dialog.cc:1202
+#: src/wx/config_dialog.cc:1242
 msgid "KDM Email"
-msgstr "Email KDM"
+msgstr "邮件发送 KDM"
 
-#: src/wx/kdm_output_panel.cc:36
+#: src/wx/kdm_output_panel.cc:38
 msgid "KDM type"
 msgstr "KDM类型"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/wx/kdm_dialog.cc:66
+#: 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 "保持视频序列和字幕序列"
 
-#: src/wx/dcp_panel.cc:129 src/wx/key_dialog.cc:28 src/wx/key_dialog.cc:30
+#: src/wx/dcp_panel.cc:130 src/wx/key_dialog.cc:28 src/wx/key_dialog.cc:30
 msgid "Key"
 msgstr "键值"
 
-#: src/wx/config_dialog.cc:1015
+#: src/wx/config_dialog.cc:1031
 msgid "Keys"
 msgstr "键值"
 
-#: src/wx/subtitle_panel.cc:108
+#: src/wx/subtitle_panel.cc:118
 msgid "Language"
 msgstr "语言"
 
-#: src/wx/config_dialog.cc:857
+#: src/wx/content_panel.cc:97
+msgid "Later"
+msgstr "下移"
+
+#: src/wx/config_dialog.cc:873
 msgid "Leaf"
 msgstr "私钥"
 
@@ -850,7 +975,7 @@ msgstr "私钥"
 msgid "Leaf common name"
 msgstr "私钥名称"
 
-#: src/wx/config_dialog.cc:725
+#: src/wx/config_dialog.cc:740
 msgid "Leaf private key"
 msgstr "私钥"
 
@@ -858,53 +983,56 @@ msgstr "私钥"
 msgid "Left"
 msgstr "左边"
 
-#: src/wx/film_viewer.cc:68
-#, fuzzy
+#: src/wx/film_viewer.cc:70
 msgid "Left eye"
-msgstr "左边"
+msgstr "左眼"
 
-#: src/wx/content_properties_dialog.cc:80
+#: src/wx/content_properties_dialog.cc:79
 msgid "Length"
-msgstr ""
+msgstr "长度"
 
-#: src/wx/colour_conversion_editor.cc:51
-msgid "Linearise input gamma curve for small values"
-msgstr "对齐低位的伽马值"
+#: src/wx/subtitle_panel.cc:109
+msgid "Line spacing"
+msgstr "行间距"
 
-#: src/wx/config_dialog.cc:731
+#: src/wx/config_dialog.cc:746
 msgid "Load..."
 msgstr "加载..."
 
-#: src/wx/config_dialog.cc:1409
+#: src/wx/config_dialog.cc:1486
 msgid "Log"
 msgstr "日志"
 
-#: src/wx/config_dialog.cc:1406
-msgid "Log:"
-msgstr "日志:"
-
-#: src/wx/audio_dialog.cc:344
+#: src/wx/audio_dialog.cc:360
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "响度范围 %.2f LU"
 
-#: src/wx/content_panel.cc:505
+#: src/wx/batch_job_view.cc:47
+msgid "Lower prioirity"
+msgstr ""
+
+#: src/wx/content_panel.cc:528
 msgid "MISSING: "
 msgstr "丢失:"
 
-#: src/wx/config_dialog.cc:1235
+#: src/wx/config_dialog.cc:1275
 msgid "Mail password"
 msgstr "邮箱登录密码"
 
-#: src/wx/config_dialog.cc:1231
+#: src/wx/config_dialog.cc:1271
 msgid "Mail user name"
 msgstr "邮箱用户名"
 
+#: src/wx/hints_dialog.cc:55
+msgid "Make DCP anyway"
+msgstr "强制制作DCP"
+
 #: src/wx/self_dkdm_dialog.cc:49
 msgid "Make DKDM for DCP-o-matic"
-msgstr "制作DCP-o-matic DKDM"
+msgstr "制作 KDM(DCP-o-matic)"
 
-#: src/wx/kdm_dialog.cc:44
+#: src/wx/kdm_dialog.cc:54 src/wx/kdm_dialog.cc:98
 msgid "Make KDMs"
 msgstr "创建KDM"
 
@@ -916,37 +1044,36 @@ msgstr "创建证书"
 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:1389
+#: src/wx/config_dialog.cc:1439
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "最大JPEG2000码率"
 
-#: src/wx/config_dialog.cc:444 src/wx/config_dialog.cc:1393
-#: src/wx/dcp_panel.cc:682
+#: src/wx/config_dialog.cc:446 src/wx/config_dialog.cc:1443
+#: src/wx/dcp_panel.cc:684
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
 #: src/wx/move_to_dialog.cc:31
-#, fuzzy
 msgid "Move content"
-msgstr "缩略视图内容"
+msgstr "分卷内容"
 
 #: src/wx/content_panel.cc:94
 msgid "Move the selected piece of content earlier in the film."
-msgstr "移动选择部分之前内容"
+msgstr "上移选择内容"
 
 #: src/wx/content_panel.cc:98
 msgid "Move the selected piece of content later in the film."
-msgstr "移动选择部分之后内容"
+msgstr "下移选择内容"
 
-#: src/wx/timing_panel.cc:92
+#: src/wx/timing_panel.cc:93
 msgid "Move to start of reel"
-msgstr ""
+msgstr "分卷设置"
 
-#: src/wx/video_panel.cc:374
+#: src/wx/video_panel.cc:378
 msgid "Multiple content selected"
 msgstr "选择多个文件"
 
@@ -962,27 +1089,35 @@ msgstr "我的文档"
 msgid "My problem is"
 msgstr "错误内容"
 
-#: src/wx/content_panel.cc:509
+#: src/wx/content_panel.cc:532
 msgid "NEEDS KDM: "
-msgstr "用KDM:"
+msgstr "需要KDM:"
 
-#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:71 src/wx/screen_dialog.cc:67
+#: src/wx/content_panel.cc:536
+msgid "NEEDS OV: "
+msgstr "需要OV:"
+
+#: 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
+#: src/wx/new_film_dialog.cc:37
 msgid "New Film"
 msgstr "新建工程"
 
+#: 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
+#: src/wx/content_sub_panel.cc:62
 msgid "No DCP selected."
 msgstr "没有选择DCP"
 
-#: src/wx/audio_mapping_view.cc:330
+#: src/wx/audio_mapping_view.cc:340
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "视频中没有音频，从 %d 到 %d 通道的DCP."
@@ -991,8 +1126,10 @@ msgstr "视频中没有音频，从 %d 到 %d 通道的DCP."
 msgid "No content found in this folder."
 msgstr "没有找到文件！"
 
-#: src/wx/dcp_panel.cc:761 src/wx/video_panel.cc:186 src/wx/video_panel.cc:200
-#: src/wx/video_panel.cc:303
+#. /OUTLINE/SHADOW variables
+#: src/wx/dcp_panel.cc:752 src/wx/text_subtitle_appearance_dialog.cc:88
+#: src/wx/video_panel.cc:186 src/wx/video_panel.cc:200
+#: src/wx/video_panel.cc:307
 msgid "None"
 msgstr "无"
 
@@ -1004,19 +1141,19 @@ 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 ""
+msgstr "记录"
 
-#: src/wx/audio_mapping_view.cc:156
+#: src/wx/audio_mapping_view.cc:165
 msgid "Off"
 msgstr "关闭"
 
-#: src/wx/config_dialog.cc:1401
+#: src/wx/config_dialog.cc:1451
 msgid "Only servers encode"
-msgstr "仅服务器编码"
+msgstr "仅在编码服务器编码"
 
-#: src/wx/config_dialog.cc:1434
+#: src/wx/config_dialog.cc:1507
 msgid "Open console window"
 msgstr "打开控制台窗口"
 
@@ -1032,56 +1169,65 @@ 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:1219
+#: src/wx/config_dialog.cc:1259
 msgid "Outgoing mail server"
-msgstr "发送邮件服务器"
+msgstr "发送邮件服务器地址"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:37
+#: src/wx/text_subtitle_appearance_dialog.cc:89
 msgid "Outline"
 msgstr "缩略视图"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:41
-msgid "Outline colour"
-msgstr "缩略视图轮廓颜色"
-
-#: src/wx/film_viewer.cc:67
+#: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "缩略视图内容"
 
-#: src/wx/kdm_dialog.cc:80 src/wx/self_dkdm_dialog.cc:66
+#: src/wx/text_subtitle_appearance_dialog.cc:64
+msgid "Outline width"
+msgstr "轮廓线宽度"
+
+#: src/wx/text_subtitle_appearance_dialog.cc:137
+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:66
 msgid "Output"
 msgstr "输出"
 
-#: src/wx/config_dialog.cc:1124
+#: src/wx/colour_conversion_editor.cc:203
+#, fuzzy
+msgid "Output gamma correction"
+msgstr "伽玛校正"
+
+#: src/wx/config_dialog.cc:1164
 msgid "Password"
 msgstr "密码"
 
-#: src/wx/job_view.cc:52 src/wx/job_view.cc:132
+#: src/wx/normal_job_view.cc:37 src/wx/normal_job_view.cc:53
 msgid "Pause"
 msgstr "暂停"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:112
 msgid "Peak"
 msgstr "最佳"
 
-#: src/wx/audio_panel.cc:324
+#: src/wx/audio_panel.cc:327
 #, c-format
 msgid "Peak: %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_panel.cc:326 src/wx/audio_panel.cc:329
+#: src/wx/audio_panel.cc:329
 msgid "Peak: unknown"
 msgstr "最佳值: 未知"
 
-#: src/wx/film_viewer.cc:75
+#: src/wx/film_viewer.cc:77
 msgid "Play"
 msgstr "播放"
 
-#: src/wx/timing_panel.cc:110
+#: src/wx/timing_panel.cc:111
 msgid "Play length"
 msgstr "播放长度"
 
@@ -1095,7 +1241,7 @@ msgstr "请输入您的电子邮件，以便我们可以与您取得联系。"
 msgid "Please wait; audio is being analysed..."
 msgstr "请稍等，正在解析音频..."
 
-#: src/wx/timing_panel.cc:89
+#: src/wx/timing_panel.cc:90
 msgid "Position"
 msgstr "位置"
 
@@ -1103,23 +1249,23 @@ msgstr "位置"
 msgid "Pre-release"
 msgstr "预发布(点映版)"
 
-#: src/wx/dcp_panel.cc:759
+#: src/wx/dcp_panel.cc:750
 msgid "Processor"
 msgstr "处理类型"
 
-#: src/wx/content_menu.cc:66
+#: src/wx/content_menu.cc:74
 msgid "Properties..."
 msgstr "属性..."
 
-#: src/wx/config_dialog.cc:1108
+#: src/wx/config_dialog.cc:1148
 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:100
+#: src/wx/audio_dialog.cc:113
 msgid "RMS"
 msgstr "RMS"
 
@@ -1131,31 +1277,33 @@ msgstr "随机"
 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:738
-msgid "Re-make certificates and key..."
+#: src/wx/config_dialog.cc:753
+msgid ""
+"Re-make certificates\n"
+"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
 msgid "Red band"
 msgstr "限制"
 
-#: src/wx/colour_conversion_editor.cc:119
+#: src/wx/colour_conversion_editor.cc:130
 msgid "Red chromaticity"
 msgstr "红色色度"
 
@@ -1164,42 +1312,50 @@ msgstr "红色色度"
 msgid "Reel %d"
 msgstr "卷 %d"
 
-#: src/wx/dcp_panel.cc:144
+#: src/wx/dcp_panel.cc:145
 msgid "Reel length"
 msgstr "卷大小"
 
-#: src/wx/dcp_panel.cc:139
+#: src/wx/dcp_panel.cc:140
 msgid "Reels"
 msgstr "卷"
 
 #. / TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix
-#: src/wx/dcp_panel.cc:185
-#, fuzzy
+#: src/wx/dcp_panel.cc:186
 msgid "Reel|Custom"
-msgstr "自定义"
+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:714 src/wx/content_menu.cc:70
-#: src/wx/content_panel.cc:89 src/wx/editable_list.h:88
+#: src/wx/config_dialog.cc:729 src/wx/content_menu.cc:82
+#: src/wx/content_panel.cc:89 src/wx/templates_dialog.cc:52
+#: src/wx/editable_list.h:80
 msgid "Remove"
 msgstr "移除"
 
-#: src/wx/screens_panel.cc:65
+#: src/wx/screens_panel.cc:61
 msgid "Remove Cinema"
 msgstr "移除影院"
 
 #: src/wx/screens_panel.cc:67
 msgid "Remove Screen"
-msgstr "移除服务器"
+msgstr "移除厅放映服务器（证书）"
 
 #: src/wx/content_panel.cc:90
 msgid "Remove the selected piece of content from the film."
 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"
 msgstr "重复"
@@ -1208,7 +1364,7 @@ msgstr "重复"
 msgid "Repeat Content"
 msgstr "重复内容"
 
-#: src/wx/content_menu.cc:63
+#: src/wx/content_menu.cc:71
 msgid "Repeat..."
 msgstr "重复..."
 
@@ -1216,15 +1372,19 @@ msgstr "重复..."
 msgid "Report A Problem"
 msgstr "报告问题"
 
-#: src/wx/config_dialog.cc:1267
+#: src/wx/config_dialog.cc:1306
 msgid "Reset to default subject and text"
 msgstr "恢复到默认"
 
-#: src/wx/dcp_panel.cc:672
+#: src/wx/dcp_panel.cc:674
 msgid "Resolution"
 msgstr "解析度"
 
-#: src/wx/job_view.cc:135
+#: src/wx/image_subtitle_colour_dialog.cc:70
+msgid "Restore to original colours"
+msgstr ""
+
+#: src/wx/normal_job_view.cc:56
 msgid "Resume"
 msgstr "恢复"
 
@@ -1232,98 +1392,117 @@ msgstr "恢复"
 msgid "Right"
 msgstr "右边"
 
-#: src/wx/audio_mapping_view.cc:338
+#: src/wx/audio_mapping_view.cc:348
 msgid "Right click to change gain."
 msgstr "右键单击要更改增益。"
 
-#: src/wx/film_viewer.cc:69
-#, fuzzy
+#: src/wx/film_viewer.cc:71
 msgid "Right eye"
-msgstr "右边"
+msgstr "右眼"
 
-#: src/wx/config_dialog.cc:855
+#: src/wx/config_dialog.cc:871
 msgid "Root"
-msgstr "Root"
+msgstr "æ ¹"
 
 #: src/wx/make_chain_dialog.cc:56
 msgid "Root common name"
-msgstr "Root名称"
+msgstr "根名称"
+
+#: src/wx/colour_conversion_editor.cc:62
+msgid "S-Gamut3"
+msgstr ""
 
-#: src/wx/config_dialog.cc:1128
+#: src/wx/config_dialog.cc:1168
 msgid "SCP (for AAM and Doremi)"
-msgstr "SCP (AAM-Doremi)"
+msgstr "SCP (用于AAM和Doremi)"
 
-#: src/wx/config_dialog.cc:496 src/wx/dcp_panel.cc:189
+#: src/wx/config_dialog.cc:502 src/wx/dcp_panel.cc:190
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:305
+#: src/wx/audio_dialog.cc:320
 #, 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
-msgid "Save to KDM creator tool's list"
-msgstr ""
+msgid "Save to KDM Creator tool's list"
+msgstr "保存到创建KDM的工具列表"
 
 #: src/wx/video_panel.cc:164
 msgid "Scale to"
 msgstr "缩放"
 
-#: src/wx/kdm_dialog.cc:54
+#: src/wx/kdm_dialog.cc:70
 msgid "Screens"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:618
+#: src/wx/config_dialog.cc:634
 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:773 src/wx/config_dialog.cc:820
-#: src/wx/config_dialog.cc:1054 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:788 src/wx/config_dialog.cc:836
+#: src/wx/config_dialog.cc:1073 src/wx/screen_dialog.cc:165
 msgid "Select Certificate File"
 msgstr "选择证书文件"
 
-#: src/wx/content_menu.cc:323
+#: src/wx/config_dialog.cc:1093
+msgid "Select Chain File"
+msgstr "选择私钥文件"
+
+#: src/wx/content_menu.cc:368
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/wx/config_dialog.cc:940 src/wx/config_dialog.cc:974
+#: src/wx/config_dialog.cc:956 src/wx/config_dialog.cc:990
 msgid "Select Key File"
 msgstr "选择密钥文件"
 
-#: src/wx/screen_dialog.cc:48
+#: src/wx/content_menu.cc:394
+msgid "Select OV"
+msgstr "选择OV"
+
+#: src/wx/screen_dialog.cc:49
 msgid "Select certificate file"
 msgstr "选择证书文件"
 
-#: src/wx/config_dialog.cc:200
+#: src/wx/config_dialog.cc:202
 msgid "Select cinema and screen database file"
-msgstr "选择电影和屏幕的数据库文件"
+msgstr "选择电影和银幕的数据库文件"
 
-#: src/wx/kdm_output_panel.cc:59
+#: src/wx/kdm_output_panel.cc:93
 msgid "Send by email"
 msgstr "通过电子邮件发送"
 
+#: src/wx/confirm_kdm_email_dialog.cc:49
+msgid "Send emails"
+msgstr "发送电子邮件"
+
 #: src/wx/report_problem_dialog.cc:61
 msgid "Send logs"
 msgstr "发送日志"
 
-#: src/wx/dolby_doremi_certificate_panel.cc:43
+#: src/wx/dolby_doremi_certificate_panel.cc:44
 msgid "Serial number"
 msgstr "序列号"
 
-#: src/wx/server_dialog.cc:29
+#: src/wx/server_dialog.cc:30
 msgid "Server"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:605
+#: src/wx/config_dialog.cc:621
 msgid "Servers"
 msgstr "服务器"
 
-#: src/wx/timecode.cc:63 src/wx/timing_panel.cc:119
+#: src/wx/timecode.cc:65 src/wx/timing_panel.cc:120
 msgid "Set"
 msgstr "设置"
 
@@ -1335,11 +1514,15 @@ msgstr "外置字体"
 msgid "Set from system font..."
 msgstr "系统字体"
 
-#: src/wx/config_dialog.cc:161
+#: src/wx/config_dialog.cc:163
 msgid "Set language"
 msgstr "设置语言"
 
-#: src/wx/dcp_panel.cc:768
+#: src/wx/text_subtitle_appearance_dialog.cc:90
+msgid "Shadow"
+msgstr "字幕阴影"
+
+#: src/wx/dcp_panel.cc:759
 msgid "Show audio..."
 msgstr "显示音频"
 
@@ -1347,27 +1530,37 @@ msgstr "显示音频"
 msgid "Show graph of audio levels..."
 msgstr "显示音频电平图"
 
-#: src/wx/dcp_panel.cc:116
+#: src/wx/dcp_panel.cc:117
 msgid "Signed"
 msgstr "签名"
 
-#: src/wx/config_dialog.cc:1030
+#: src/wx/config_dialog.cc:1046
 msgid "Signing DCPs and KDMs"
 msgstr "签名DCP和KDM"
 
-#: src/wx/dcp_panel.cc:182
+#: src/wx/colour_conversion_editor.cc:60
+#, fuzzy
+msgid "Simple gamma"
+msgstr "伽马值"
+
+#: src/wx/colour_conversion_editor.cc:61
+#, fuzzy
+msgid "Simple gamma, linearised for small values"
+msgstr "对齐低位的伽马值"
+
+#: src/wx/dcp_panel.cc:183
 msgid "Single reel"
 msgstr "签名卷"
 
-#: src/wx/audio_dialog.cc:110
+#: src/wx/audio_dialog.cc:123
 msgid "Smoothing"
 msgstr "平滑"
 
-#: src/wx/timeline_dialog.cc:42
+#: src/wx/timeline_dialog.cc:56
 msgid "Snap"
 msgstr "临时"
 
-#: src/wx/dcp_panel.cc:183
+#: src/wx/dcp_panel.cc:184
 msgid "Split by video content"
 msgstr "根据内容进行分割"
 
@@ -1375,7 +1568,7 @@ msgstr "根据内容进行分割"
 msgid "Stable version "
 msgstr "稳定版"
 
-#: src/wx/dcp_panel.cc:155
+#: src/wx/dcp_panel.cc:156
 msgid "Standard"
 msgstr "标准"
 
@@ -1385,17 +1578,17 @@ msgstr "开始"
 
 #: src/wx/move_to_dialog.cc:34
 msgid "Start of reel"
-msgstr ""
+msgstr "分卷数量"
 
-#: src/wx/subtitle_panel.cc:113
+#: src/wx/subtitle_panel.cc:123
 msgid "Stream"
 msgstr "流"
 
 #: src/wx/isdcf_metadata_dialog.cc:49
 msgid "Studio (e.g. TCF)"
-msgstr "工作室(例如:TCF)"
+msgstr "工作室(例如:ROV)"
 
-#: src/wx/config_dialog.cc:1239
+#: src/wx/config_dialog.cc:1279
 msgid "Subject"
 msgstr "类目"
 
@@ -1405,13 +1598,13 @@ msgstr "字幕"
 
 #: src/wx/isdcf_metadata_dialog.cc:40
 msgid "Subtitle Language (e.g. FR)"
-msgstr "字幕语言(例如:CN)"
+msgstr "字幕语言(例如:QMS)"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:30
+#: src/wx/text_subtitle_appearance_dialog.cc:37
 msgid "Subtitle appearance"
 msgstr "字幕外观"
 
-#: src/wx/image_subtitle_colour_dialog.cc:31
+#: src/wx/image_subtitle_colour_dialog.cc:33
 msgid "Subtitle colours"
 msgstr "字幕颜色"
 
@@ -1420,15 +1613,15 @@ msgstr "字幕颜色"
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/wx/about_dialog.cc:260
+#: src/wx/about_dialog.cc:288
 msgid "Supported by"
 msgstr "技术支持"
 
-#: src/wx/config_dialog.cc:1091
+#: src/wx/config_dialog.cc:1131
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:1116
+#: src/wx/config_dialog.cc:1156
 msgid "Target path"
 msgstr "目标路径"
 
@@ -1436,6 +1629,22 @@ msgstr "目标路径"
 msgid "Temp version"
 msgstr "临时版本"
 
+#: 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:43
 msgid "Territory (e.g. UK)"
 msgstr "国别地区(例如:CN)"
@@ -1444,48 +1653,53 @@ msgstr "国别地区(例如:CN)"
 msgid "Test version "
 msgstr "测试版"
 
-#: src/wx/about_dialog.cc:315
+#: src/wx/about_dialog.cc:345
 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:309
+#: src/wx/content_menu.cc:354
 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:198
+#: src/wx/hints_dialog.cc:89
 msgid "There are no hints: everything looks good!"
 msgstr "正常!"
 
-#: src/wx/film_viewer.cc:159
+#: 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:163
 msgid "There is not enough free memory to do that."
-msgstr "内存不够！"
+msgstr "内存不足！"
 
-#: src/wx/config_dialog.cc:781
+#: src/wx/config_dialog.cc:797
 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:194
+#: src/wx/config_dialog.cc:196
 msgid "Threads to use for encoding on this host"
 msgstr "线程数"
 
-#: src/wx/config_dialog.cc:698 src/wx/screen_dialog.cc:101
+#: src/wx/config_dialog.cc:713 src/wx/screen_dialog.cc:102
 msgid "Thumbprint"
 msgstr "指纹"
 
@@ -1493,7 +1707,7 @@ msgstr "指纹"
 msgid "Time"
 msgstr "时间"
 
-#: src/wx/timeline_dialog.cc:35
+#: src/wx/timeline_dialog.cc:38
 msgid "Timeline"
 msgstr "时间线"
 
@@ -1502,7 +1716,7 @@ msgid "Timeline..."
 msgstr "时间线"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
-#: src/wx/timing_panel.cc:49
+#: src/wx/timing_panel.cc:50
 msgid "Timing|Timing"
 msgstr "计时器"
 
@@ -1510,173 +1724,161 @@ msgstr "计时器"
 msgid "Top"
 msgstr "顶部"
 
-#: src/wx/about_dialog.cc:127
+#: src/wx/about_dialog.cc:128
 msgid "Translated by"
 msgstr "翻译"
 
-#: src/wx/timing_panel.cc:107
+#: src/wx/timing_panel.cc:108
 msgid "Trim after current position"
 msgstr "裁剪当前位置"
 
-#: src/wx/timing_panel.cc:104
+#: src/wx/timing_panel.cc:105
 msgid "Trim from end"
 msgstr "裁剪结束"
 
-#: src/wx/timing_panel.cc:98
+#: src/wx/timing_panel.cc:99
 msgid "Trim from start"
 msgstr "开始裁剪"
 
-#: src/wx/timing_panel.cc:101
+#: src/wx/timing_panel.cc:102
 msgid "Trim up to current position"
 msgstr "裁剪至当前位置"
 
-#: src/wx/audio_dialog.cc:321
+#: src/wx/audio_dialog.cc:337
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_dialog.cc:93 src/wx/config_dialog.cc:690
+#: src/wx/audio_dialog.cc:106 src/wx/config_dialog.cc:705
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "类型"
 
 #: src/wx/cinema_dialog.cc:99
 msgid "UTC"
-msgstr "UTC"
+msgstr "时区"
 
 #: src/wx/cinema_dialog.cc:55
 msgid "UTC offset (time zone)"
 msgstr "UTC偏差（时区）"
 
 #: src/wx/cinema_dialog.cc:100
-#, fuzzy
 msgid "UTC+1"
-msgstr "UTC+%d"
+msgstr "东1区"
 
-#: src/wx/cinema_dialog.cc:109
-#, fuzzy
+#: src/wx/cinema_dialog.cc:110
 msgid "UTC+10"
-msgstr "UTC+%d"
+msgstr "东10区"
 
-#: src/wx/cinema_dialog.cc:110
-#, fuzzy
+#: src/wx/cinema_dialog.cc:111
 msgid "UTC+11"
-msgstr "UTC+%d"
+msgstr "东11区"
 
-#: src/wx/cinema_dialog.cc:111
-#, fuzzy
+#: src/wx/cinema_dialog.cc:112
 msgid "UTC+12"
-msgstr "UTC+%d"
+msgstr "东12区"
 
 #: src/wx/cinema_dialog.cc:101
-#, fuzzy
 msgid "UTC+2"
-msgstr "UTC+%d"
+msgstr "东2区"
 
 #: src/wx/cinema_dialog.cc:102
-#, fuzzy
 msgid "UTC+3"
-msgstr "UTC+%d"
+msgstr "东3区"
 
 #: src/wx/cinema_dialog.cc:103
-#, fuzzy
 msgid "UTC+4"
-msgstr "UTC+%d"
+msgstr "东4区"
 
 #: src/wx/cinema_dialog.cc:104
-#, fuzzy
 msgid "UTC+5"
-msgstr "UTC+%d"
+msgstr "东5区"
 
 #: src/wx/cinema_dialog.cc:105
-#, fuzzy
-msgid "UTC+6"
-msgstr "UTC+%d"
+msgid "UTC+5:30"
+msgstr "东5:30区 (印度，斯里兰卡)"
 
 #: src/wx/cinema_dialog.cc:106
-#, fuzzy
-msgid "UTC+7"
-msgstr "UTC+%d"
+msgid "UTC+6"
+msgstr "东6区"
 
 #: src/wx/cinema_dialog.cc:107
-#, fuzzy
-msgid "UTC+8"
-msgstr "UTC+%d"
+msgid "UTC+7"
+msgstr "东7区"
 
 #: src/wx/cinema_dialog.cc:108
-#, fuzzy
+msgid "UTC+8"
+msgstr "东8区 (北京时间)"
+
+#: src/wx/cinema_dialog.cc:109
 msgid "UTC+9"
-msgstr "UTC+%d"
+msgstr "东9区"
 
 #: src/wx/cinema_dialog.cc:98
 msgid "UTC-1"
-msgstr ""
+msgstr "西1区"
 
 #: src/wx/cinema_dialog.cc:87
 msgid "UTC-10"
-msgstr ""
+msgstr "西10区"
 
 #: src/wx/cinema_dialog.cc:86
 msgid "UTC-11"
-msgstr ""
+msgstr "西11区"
 
 #: src/wx/cinema_dialog.cc:97
 msgid "UTC-2"
-msgstr ""
+msgstr "西2区"
 
 #: src/wx/cinema_dialog.cc:96
 msgid "UTC-3"
-msgstr ""
+msgstr "西3区"
 
 #: src/wx/cinema_dialog.cc:95
 msgid "UTC-3:30"
-msgstr ""
+msgstr "西3:30区"
 
 #: src/wx/cinema_dialog.cc:94
 msgid "UTC-4"
-msgstr ""
+msgstr "西4区"
 
 #: src/wx/cinema_dialog.cc:93
 msgid "UTC-4:30"
-msgstr ""
+msgstr "西4:30区"
 
 #: src/wx/cinema_dialog.cc:92
 msgid "UTC-5"
-msgstr ""
+msgstr "西5区"
 
 #: src/wx/cinema_dialog.cc:91
 msgid "UTC-6"
-msgstr ""
+msgstr "西6区"
 
 #: src/wx/cinema_dialog.cc:90
 msgid "UTC-7"
-msgstr ""
+msgstr "西7区"
 
 #: src/wx/cinema_dialog.cc:89
 msgid "UTC-8"
-msgstr ""
+msgstr "西8区"
 
 #: src/wx/cinema_dialog.cc:88
 msgid "UTC-9"
-msgstr ""
-
-#: src/wx/content_panel.cc:93
-msgid "Up"
-msgstr "上移"
+msgstr "西9区"
 
 #: src/wx/update_dialog.cc:29
 msgid "Update"
 msgstr "更新"
 
-#: src/wx/dcp_panel.cc:160
+#: src/wx/dcp_panel.cc:161
 msgid "Upload DCP to TMS after it is made"
 msgstr "制作好DCP后上传到TMS"
 
-#: src/wx/dcp_panel.cc:81
+#: src/wx/dcp_panel.cc:82
 msgid "Use ISDCF name"
 msgstr "使用ISDCF名称"
 
-#: src/wx/dcp_panel.cc:662
+#: src/wx/dcp_panel.cc:664
 msgid "Use best"
 msgstr "使用最佳"
 
@@ -1688,45 +1890,45 @@ msgstr "使用预设"
 msgid "Use subtitles"
 msgstr "使用字幕"
 
-#: src/wx/config_dialog.cc:1120
+#: src/wx/config_dialog.cc:1160
 msgid "User name"
 msgstr "用户名"
 
-#: src/wx/content_properties_dialog.cc:74 src/wx/dcp_panel.cc:113
+#: 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
 msgid "Video"
 msgstr "视频"
 
-#: src/wx/video_waveform_dialog.cc:35
+#: src/wx/video_waveform_dialog.cc:36
 msgid "Video Waveform"
 msgstr "视频波形"
 
-#: src/wx/timing_panel.cc:115
+#: src/wx/timing_panel.cc:116
 msgid "Video frame rate"
 msgstr "视频帧率"
 
-#: src/wx/subtitle_panel.cc:121
+#: src/wx/subtitle_panel.cc:131
 msgid "View..."
 msgstr "视图窗口"
 
-#: src/wx/config_dialog.cc:1417
+#: src/wx/config_dialog.cc:1490
 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:133
+#: src/wx/about_dialog.cc:135
 msgid "With help from"
 msgstr "帮助"
 
-#: src/wx/kdm_output_panel.cc:46 src/wx/self_dkdm_dialog.cc:75
+#: src/wx/kdm_output_panel.cc:75 src/wx/self_dkdm_dialog.cc:75
 msgid "Write to"
 msgstr "输出目录："
 
@@ -1736,114 +1938,89 @@ msgstr "撰稿"
 
 #: src/wx/subtitle_panel.cc:69
 msgid "X Offset"
-msgstr "X偏移"
+msgstr "X 偏移"
 
 #: src/wx/subtitle_panel.cc:89
 msgid "X Scale"
-msgstr "X缩放"
+msgstr "X 缩放"
 
 #: src/wx/subtitle_panel.cc:79
 msgid "Y Offset"
-msgstr "Y偏移"
+msgstr "Y 偏移"
 
 #: src/wx/subtitle_panel.cc:99
 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矩阵"
-
-#: src/wx/hints_dialog.cc:147
-msgid ""
-"You are set up for an Interop DCP at a frame rate which is not officially "
-"supported.  You are advised to make a SMPTE DCP instead."
-msgstr "为设置帧率进行DCP打包制作，建议参考SMPTE来制作DCP！"
+msgstr "YUV转换到RGB矩阵(色彩空间)"
 
-#: src/wx/hints_dialog.cc:173
-msgid ""
-"You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
-"you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
-msgstr "您使用的是3D内容，但是您DCP包设置为2D模式，请设置到3D模式。"
-
-#: src/wx/hints_dialog.cc:160
+#: src/wx/screens_panel.cc:217
 #, c-format
 msgid ""
-"You have %d files that look like they are VOB files from DVD. You should "
-"join them to ensure smooth joins between the files."
-msgstr "为了保持流畅播放，导入DVD的%dVOB文件，需要完整的加入到列队中。"
-
-#: src/wx/hints_dialog.cc:99
-msgid ""
-"You have specified a font file which is larger than 640kB.  This is very "
-"likely to cause problems on playback."
-msgstr "字体文件大小错误，字体文件限制在640KB以内！"
+"You cannot add a screen called '%s' as the cinema already has a screen with "
+"this name."
+msgstr ""
 
-#: src/wx/hints_dialog.cc:135
+#: src/wx/screens_panel.cc:258
 #, c-format
 msgid ""
-"Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
-"projectors.  Use 24 or 48 frames per second to be on the safe side."
+"You cannot change this screen's name to '%s' as the cinema already has a "
+"screen with this name."
 msgstr ""
-"您的DCP帧速率（%d 个帧）可能会导致在老放映设备中出现故障，请参照DCI标准设置帧"
-"频，参考24或48帧/秒！ "
 
-#: src/wx/hints_dialog.cc:104
-msgid ""
-"Your DCP has fewer than 6 audio channels.  This may cause problems on some "
-"projectors."
-msgstr "DCP音频数量少于6个！"
+#: src/wx/report_problem_dialog.cc:66
+msgid "Your email address"
+msgstr "您的邮箱地址"
 
-#: src/wx/hints_dialog.cc:189
-msgid ""
-"Your audio level is very close to clipping.  You should reduce the gain of "
-"your audio content."
-msgstr ""
-
-#: src/wx/hints_dialog.cc:185
-msgid ""
-"Your audio level is very high.  You should reduce the gain of your audio "
-"content."
-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
 msgid "dB"
 msgstr "dB"
 
+#: src/wx/name_format_editor.cc:67
+#, c-format
+msgid "e.g. %s"
+msgstr "例如 %s"
+
 #. // TRANSLATORS: this is an abbreviation for "frames"
-#: src/wx/timing_panel.cc:81
+#: src/wx/timing_panel.cc:82
 msgid "f"
 msgstr "帧"
 
 #. // TRANSLATORS: this is an abbreviation for "hours"
-#: src/wx/timing_panel.cc:59
+#: src/wx/timing_panel.cc:60
 msgid "h"
 msgstr "时"
 
 #. // TRANSLATORS: this is an abbreviation for "minutes"
-#: src/wx/timing_panel.cc:67
+#: src/wx/timing_panel.cc:68
 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:453
+#: src/wx/audio_panel.cc:94 src/wx/config_dialog.cc:455
 msgid "ms"
 msgstr "毫秒"
 
-#: src/wx/config_dialog.cc:1224
+#: src/wx/config_dialog.cc:1264
 msgid "port"
 msgstr "端口"
 
 #. // TRANSLATORS: this is an abbreviation for "seconds"
-#: src/wx/config_dialog.cc:411 src/wx/timing_panel.cc:74
+#: src/wx/config_dialog.cc:413 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 "最低"
 
@@ -1851,20 +2028,96 @@ 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 "Filename"
-#~ 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; "
+#~ "this is unlikely to have any visible effect on the image."
+#~ msgstr ""
+#~ "高码率打包不支持有些放映机,我们推荐使用200Mbit/s以内的码率来进行打包，这种"
+#~ "细微的调整是肉眼很难分辨的！"
+
+#~ msgid ""
+#~ "All of your content is at 1.85:1 or narrower but your DCP's container is "
+#~ "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
+#~ "frame.  You may prefer to set your DCP's container to Flat (1.85:1) in "
+#~ "the \"DCP\" tab."
+#~ msgstr "遮幅(1.85：1)左右去黑边。"
+
+#~ msgid ""
+#~ "All of your content is in Scope (2.39:1) but your DCP's container is Flat "
+#~ "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) "
+#~ "frame.  You may prefer to set your DCP's container to Scope (2.39:1) in "
+#~ "the \"DCP\" tab."
+#~ msgstr "宽幅(2.39：1)上下去黑边。"
+
+#~ msgid "Log:"
+#~ msgstr "日志:"
+
+#~ msgid ""
+#~ "You are set up for an Interop DCP at a frame rate which is not officially "
+#~ "supported.  You are advised to make a SMPTE DCP instead."
+#~ msgstr "为设置帧率进行DCP打包制作，建议参考SMPTE来制作DCP！"
+
+#~ msgid ""
+#~ "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
+#~ "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
+#~ msgstr "您使用的是3D内容，但是您DCP包设置为2D模式，请设置到3D模式。"
+
+#~ msgid ""
+#~ "You have %d files that look like they are VOB files from DVD. You should "
+#~ "join them to ensure smooth joins between the files."
+#~ msgstr "为了保持流畅播放，导入DVD的%dVOB文件，需要完整的加入到列队中。"
+
+#~ msgid ""
+#~ "You have specified a font file which is larger than 640kB.  This is very "
+#~ "likely to cause problems on playback."
+#~ msgstr "字体文件大小错误，字体文件限制在640KB以内！"
+
+#~ msgid ""
+#~ "Your DCP frame rate (%d fps) may cause problems in a few (mostly older) "
+#~ "projectors.  Use 24 or 48 frames per second to be on the safe side."
+#~ msgstr ""
+#~ "您的DCP帧速率（%d 个帧）可能会导致在老放映设备中出现故障，请参照DCI标准设"
+#~ "置帧频，参考24或48帧/秒！ "
+
+#~ msgid ""
+#~ "Your DCP has fewer than 6 audio channels.  This may cause problems on "
+#~ "some projectors."
+#~ msgstr "DCP音频数量少于6个！"
+
+#~ msgid ""
+#~ "Your audio level is very close to clipping.  You should reduce the gain "
+#~ "of your audio content."
+#~ msgstr "检测到你音频内容增益过大，你需要降低音频的增益。"
+
+#~ msgid ""
+#~ "Your audio level is very high.  You should reduce the gain of your audio "
+#~ "content."
+#~ msgstr "检测到你音频内容增益过高，你需要降低音频的增益。"
 
 #~ msgid "UTC%d"
 #~ msgstr "UTC%d"