X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fpo%2Fzh_CN.po;h=fc872d934dd96a53dee16e3489004fd65302f159;hb=fc41cf4dab17002622d5287a9c1801ba5e4c11f8;hp=f9a0c02aba4f4baca7347fe7a76c247d6da56abd;hpb=6433cf55c702939f564ce01c3877dd9296a7e6cf;p=dcpomatic.git

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index f9a0c02ab..fc872d934 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-O-MATIC_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-17 14:44+0100\n"
-"PO-Revision-Date: 2016-08-19 02:40+0800\n"
+"POT-Creation-Date: 2016-10-25 10:43+0100\n"
+"PO-Revision-Date: 2016-12-14 21:28+0800\n"
 "Last-Translator: Hanyuan\n"
 "Language-Team: Hanyuan\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
+"X-Generator: Poedit 1.8.11\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"
@@ -145,7 +145,7 @@ msgstr "A"
 
 #: src/wx/update_dialog.cc:36
 msgid "A new version of DCP-o-matic is available."
-msgstr "DCP-O-MATIC 有新版本"
+msgstr "发现 DCP-O-MATIC 新版本"
 
 #: src/wx/about_dialog.cc:35
 msgid "About DCP-o-matic"
@@ -159,10 +159,14 @@ msgstr "添加影院"
 msgid "Add Cinema..."
 msgstr "添加影院..."
 
-#: src/wx/content_menu.cc:68
+#: src/wx/content_menu.cc:75
 msgid "Add KDM..."
 msgstr "添加 KDM..."
 
+#: src/wx/content_menu.cc:76
+msgid "Add OV..."
+msgstr "添加 OV..."
+
 #: src/wx/screens_panel.cc:206
 msgid "Add Screen"
 msgstr "添加荧幕（放映服务器）"
@@ -193,7 +197,7 @@ msgstr "添加图像序列"
 msgid "Add video, image or sound files to the film."
 msgstr "添加视频、图片或音频文件"
 
-#: src/wx/config_dialog.cc:711 src/wx/editable_list.h:78
+#: src/wx/config_dialog.cc:710 src/wx/editable_list.h:74
 msgid "Add..."
 msgstr "添加..."
 
@@ -205,7 +209,7 @@ msgstr "地址"
 msgid "Adjust white point to"
 msgstr "调整白点"
 
-#: src/wx/config_dialog.cc:1431
+#: src/wx/config_dialog.cc:1430
 msgid "Allow any DCP frame rate"
 msgstr "允许任何DCP帧速率"
 
@@ -213,7 +217,7 @@ msgstr "允许任何DCP帧速率"
 msgid "Alpha   0"
 msgstr "透明度 0"
 
-#: src/wx/kdm_dialog.cc:166
+#: src/wx/kdm_dialog.cc:190
 msgid "An unknown exception occurred."
 msgstr "出现未知错误。"
 
@@ -221,11 +225,23 @@ msgstr "出现未知错误。"
 msgid "Appearance..."
 msgstr "显示..."
 
+#: src/wx/job_view.cc:130
+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 "全景声"
 
-#: src/wx/audio_dialog.cc:47 src/wx/audio_panel.cc:48
+#: 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"
@@ -256,7 +272,7 @@ msgstr "自动解析源内容中的音频"
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1283
+#: src/wx/config_dialog.cc:1282
 msgid "BCC address"
 msgstr "抄送地址"
 
@@ -292,7 +308,7 @@ msgstr "使用推子"
 msgid "CC addresses"
 msgstr "抄送地址 "
 
-#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:81
+#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:84
 #: src/wx/self_dkdm_dialog.cc:59
 msgid "CPL"
 msgstr "CPL"
@@ -305,7 +321,7 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL注释文本"
 
-#: src/wx/kdm_dialog.cc:162
+#: src/wx/kdm_dialog.cc:186
 msgid "CPL's content is not encrypted."
 msgstr "该内容没有加密"
 
@@ -313,7 +329,7 @@ msgstr "该内容没有加密"
 msgid "Calculate..."
 msgstr "计算..."
 
-#: src/wx/job_view.cc:47
+#: src/wx/job_view.cc:57
 msgid "Cancel"
 msgstr "取消"
 
@@ -333,7 +349,7 @@ msgstr "链接"
 msgid "Channel gain"
 msgstr "信道增益"
 
-#: src/wx/audio_dialog.cc:81 src/wx/dcp_panel.cc:744
+#: src/wx/audio_dialog.cc:90 src/wx/dcp_panel.cc:744
 msgid "Channels"
 msgstr "通道"
 
@@ -345,7 +361,11 @@ msgstr "启动时检查更新（包括测试版）"
 msgid "Check for updates on startup"
 msgstr "启动时检查更新"
 
-#: src/wx/content_menu.cc:251
+#: src/wx/content_menu.cc:78
+msgid "Choose CPL..."
+msgstr "选择CPL"
+
+#: src/wx/content_menu.cc:297
 msgid "Choose a file"
 msgstr "选择一个文件"
 
@@ -353,7 +373,7 @@ msgstr "选择一个文件"
 msgid "Choose a file or files"
 msgstr "选择一个或多个文件"
 
-#: src/wx/content_menu.cc:246 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:292 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "选择一个文件夹"
 
@@ -373,7 +393,7 @@ msgstr "放映厅和荧幕数据库文件"
 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 "色彩空间"
 
@@ -386,25 +406,25 @@ msgstr "色彩转换"
 msgid "Colour|Custom"
 msgstr "自定义"
 
-#: src/wx/video_waveform_dialog.cc:51
+#: src/wx/video_waveform_dialog.cc:58
 msgid "Component"
 msgstr "结构"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
-#: src/wx/config_dialog.cc:1479
+#: src/wx/config_dialog.cc:1478
 msgid "Config|Timing"
 msgstr "时间设置"
 
-#: src/wx/report_problem_dialog.cc:66
-msgid "Contact email"
-msgstr "邮箱地址"
+#: src/wx/confirm_kdm_email_dialog.cc:31
+msgid "Confirm KDM email"
+msgstr "确认 KDM 电子邮件地址"
 
 #: src/wx/dcp_panel.cc:645
 msgid "Container"
 msgstr "格式"
 
 #: src/wx/audio_mapping_view.cc:437 src/wx/audio_mapping_view.cc:439
-#: src/wx/film_editor.cc:52
+#: src/wx/film_editor.cc:54
 msgid "Content"
 msgstr "内容"
 
@@ -420,7 +440,7 @@ msgstr "内容类型"
 msgid "Content version"
 msgstr "内容版本"
 
-#: src/wx/video_waveform_dialog.cc:54
+#: src/wx/video_waveform_dialog.cc:61
 msgid "Contrast"
 msgstr "对比度"
 
@@ -428,7 +448,7 @@ msgstr "对比度"
 msgid "Copy as name"
 msgstr "复制名称"
 
-#: src/wx/audio_dialog.cc:234
+#: src/wx/audio_dialog.cc:247
 msgid "Could not analyse audio."
 msgstr "无法分析音频。"
 
@@ -437,13 +457,13 @@ msgstr "无法分析音频。"
 msgid "Could not get video for view (%s)"
 msgstr "无法获取视频 (%s)"
 
-#: src/wx/content_menu.cc:327
+#: src/wx/content_menu.cc:375
 #, c-format
 msgid "Could not load KDM (%s)"
 msgstr "无法加载 KDM (%s)"
 
 #: src/wx/config_dialog.cc:788 src/wx/config_dialog.cc:956
-#: src/wx/download_certificate_panel.cc:56 src/wx/screen_dialog.cc:156
+#: src/wx/download_certificate_panel.cc:56 src/wx/screen_dialog.cc:158
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "无法读取证书文件 (%s)"
@@ -453,7 +473,7 @@ msgstr "无法读取证书文件 (%s)"
 msgid "Could not read key file; file is too long (%s)"
 msgstr "无法读取Key文件，因为文件过长 (%s)"
 
-#: src/wx/new_film_dialog.cc:41
+#: src/wx/new_film_dialog.cc:42
 msgid "Create in folder"
 msgstr "创建文件夹"
 
@@ -466,11 +486,11 @@ msgid "Crop"
 msgstr "裁剪"
 
 #: src/wx/audio_mapping_view.cc:472 src/wx/audio_mapping_view.cc:474
-#: src/wx/film_editor.cc:54
+#: src/wx/film_editor.cc:56
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/config_dialog.cc:1452
+#: src/wx/config_dialog.cc:1451
 msgid "DCP asset filename format"
 msgstr "DCP内容的文件名格式"
 
@@ -478,7 +498,7 @@ msgstr "DCP内容的文件名格式"
 msgid "DCP directory"
 msgstr "DCP目录"
 
-#: src/wx/config_dialog.cc:1440
+#: src/wx/config_dialog.cc:1439
 msgid "DCP metadata filename format"
 msgstr "DCP元数据的文件名格式"
 
@@ -487,19 +507,19 @@ msgstr "DCP元数据的文件名格式"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:139
+#: src/wx/audio_dialog.cc:148
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic音频"
 
-#: src/wx/config_dialog.cc:1481
+#: src/wx/config_dialog.cc:1480
 msgid "Debug: decode"
 msgstr "解码"
 
-#: src/wx/config_dialog.cc:1485
+#: src/wx/config_dialog.cc:1484
 msgid "Debug: email sending"
 msgstr "发送到邮箱"
 
-#: src/wx/config_dialog.cc:1483
+#: src/wx/config_dialog.cc:1482
 msgid "Debug: encode"
 msgstr "编码"
 
@@ -551,7 +571,7 @@ msgstr "默认"
 msgid "Delay"
 msgstr "延迟"
 
-#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:57
+#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:61
 msgid "Details..."
 msgstr "详细..."
 
@@ -559,14 +579,18 @@ msgstr "详细..."
 msgid "Dolby / Doremi"
 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/content_panel.cc:97
-msgid "Down"
-msgstr "下移"
-
 #: src/wx/download_certificate_dialog.cc:39
 msgid "Download"
 msgstr "下载"
@@ -575,7 +599,7 @@ msgstr "下载"
 msgid "Download certificate"
 msgstr "下载证书"
 
-#: src/wx/screen_dialog.cc:90
+#: src/wx/screen_dialog.cc:91
 msgid "Download..."
 msgstr "下载..."
 
@@ -583,6 +607,10 @@ msgstr "下载..."
 msgid "Downloading certificate"
 msgstr "下载证书"
 
+#: src/wx/content_panel.cc:93
+msgid "Earlier"
+msgstr "以前的"
+
 #: src/wx/screens_panel.cc:59
 msgid "Edit Cinema..."
 msgstr "编辑影城..."
@@ -601,11 +629,19 @@ msgstr "编辑荧幕（放映服务器）"
 
 #: src/wx/audio_mapping_view.cc:168 src/wx/config_dialog.cc:426
 #: src/wx/dcp_panel.cc:134 src/wx/fonts_dialog.cc:78 src/wx/video_panel.cc:188
-#: src/wx/video_panel.cc:209 src/wx/editable_list.h:81
+#: src/wx/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 "发件人地址 "
 
@@ -625,11 +661,16 @@ msgstr "加密"
 msgid "End"
 msgstr "结束"
 
-#: src/wx/config_dialog.cc:1476
+#: 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:1475
 msgid "Errors"
 msgstr "错误"
 
-#: src/wx/config_dialog.cc:715
+#: src/wx/config_dialog.cc:714
 msgid "Export"
 msgstr "导出"
 
@@ -645,7 +686,7 @@ msgid ""
 "chain..."
 msgstr "导出DCP密匙"
 
-#: src/wx/config_dialog.cc:732
+#: src/wx/config_dialog.cc:731
 msgid "Export..."
 msgstr "导出"
 
@@ -661,7 +702,7 @@ msgstr "设备(例如:DLA)"
 msgid "Fade in"
 msgstr "淡入"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:53
+#: src/wx/text_subtitle_appearance_dialog.cc:69
 msgid "Fade in time"
 msgstr "淡入时间"
 
@@ -669,7 +710,7 @@ msgstr "淡入时间"
 msgid "Fade out"
 msgstr "淡出"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:57
+#: src/wx/text_subtitle_appearance_dialog.cc:74
 msgid "Fade out time"
 msgstr "淡出时间"
 
@@ -677,7 +718,7 @@ msgstr "淡出时间"
 msgid "Filename format"
 msgstr "文件名格式"
 
-#: src/wx/new_film_dialog.cc:38
+#: src/wx/new_film_dialog.cc:39
 msgid "Film name"
 msgstr "工程名称"
 
@@ -690,7 +731,7 @@ msgid ""
 "Find integrated loudness, true peak and loudness range when analysing audio"
 msgstr "分析音频时，发现综合响度，真实峰值和响度范围！"
 
-#: src/wx/content_menu.cc:65
+#: src/wx/content_menu.cc:71
 msgid "Find missing..."
 msgstr "寻找丢失..."
 
@@ -723,6 +764,10 @@ msgstr "起始"
 msgid "From address"
 msgstr "发件人地址"
 
+#: src/wx/new_film_dialog.cc:57
+msgid "From template"
+msgstr "从模板"
+
 #: src/wx/audio_mapping_view.cc:166
 msgid "Full"
 msgstr "总"
@@ -748,11 +793,11 @@ msgstr "增益计算"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "从内容通道  %d 到DCP %d 通道进行增益调整"
 
-#: src/wx/config_dialog.cc:1472 src/wx/content_properties_dialog.cc:70
+#: src/wx/config_dialog.cc:1471 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 "外置字体 "
 
@@ -785,7 +830,7 @@ msgstr "温馨提示"
 msgid "Host"
 msgstr "服务器"
 
-#: src/wx/server_dialog.cc:39
+#: src/wx/server_dialog.cc:40
 msgid "Host name or IP address"
 msgstr "服务器名称或IP地址"
 
@@ -809,7 +854,7 @@ msgstr "IP地址/服务器名称"
 msgid "ISDCF name"
 msgstr "ISDCF名称"
 
-#: src/wx/video_waveform_dialog.cc:61
+#: src/wx/video_waveform_dialog.cc:68
 msgid "Image X position"
 msgstr "画面X轴位置"
 
@@ -825,7 +870,7 @@ msgstr "伽玛校正"
 msgid "Input power"
 msgstr "功率"
 
-#: src/wx/audio_dialog.cc:339
+#: src/wx/audio_dialog.cc:351
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "平均响度 %.2f LUFS"
@@ -860,24 +905,24 @@ msgid ""
 "for newly-encoded data"
 msgstr "上次使用的JPEG2000码率"
 
-#: src/wx/content_menu.cc:64
+#: src/wx/content_menu.cc:70
 msgid "Join"
 msgstr "创建"
 
 #: src/wx/config_dialog.cc:1225
 msgid "KDM Email"
-msgstr "Email KDM"
+msgstr "邮件发送 KDM"
 
 #: 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:74
+#: src/wx/kdm_dialog.cc:77
 msgid "KDM|Timing"
 msgstr "时间窗口"
 
-#: src/wx/timeline_dialog.cc:44
+#: src/wx/timeline_dialog.cc:58
 msgid "Keep video and subtitles in sequence"
 msgstr "保持视频序列和字幕序列"
 
@@ -893,6 +938,10 @@ msgstr "键值"
 msgid "Language"
 msgstr "语言"
 
+#: src/wx/content_panel.cc:97
+msgid "Later"
+msgstr "以后"
+
 #: src/wx/config_dialog.cc:856
 msgid "Leaf"
 msgstr "私钥"
@@ -901,7 +950,7 @@ msgstr "私钥"
 msgid "Leaf common name"
 msgstr "私钥名称"
 
-#: src/wx/config_dialog.cc:724
+#: src/wx/config_dialog.cc:723
 msgid "Leaf private key"
 msgstr "私钥"
 
@@ -925,20 +974,20 @@ msgstr "行间距"
 msgid "Linearise input gamma curve for small values"
 msgstr "对齐低位的伽马值"
 
-#: src/wx/config_dialog.cc:730
+#: src/wx/config_dialog.cc:729
 msgid "Load..."
 msgstr "加载..."
 
-#: src/wx/config_dialog.cc:1470
+#: src/wx/config_dialog.cc:1469
 msgid "Log"
 msgstr "日志"
 
-#: src/wx/audio_dialog.cc:348
+#: src/wx/audio_dialog.cc:360
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "响度范围 %.2f LU"
 
-#: src/wx/content_panel.cc:506
+#: src/wx/content_panel.cc:526
 msgid "MISSING: "
 msgstr "丢失:"
 
@@ -958,7 +1007,7 @@ msgstr "无论如何制作DCP"
 msgid "Make DKDM for DCP-o-matic"
 msgstr "制作DCP-o-matic DKDM"
 
-#: src/wx/kdm_dialog.cc:50 src/wx/kdm_dialog.cc:94
+#: src/wx/kdm_dialog.cc:53 src/wx/kdm_dialog.cc:97
 msgid "Make KDMs"
 msgstr "创建KDM"
 
@@ -974,11 +1023,11 @@ msgstr "要求亮度(例如:14FL)"
 msgid "Matrix"
 msgstr "矩阵"
 
-#: src/wx/config_dialog.cc:1423
+#: src/wx/config_dialog.cc:1422
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "最大JPEG2000码率"
 
-#: src/wx/config_dialog.cc:446 src/wx/config_dialog.cc:1427
+#: src/wx/config_dialog.cc:446 src/wx/config_dialog.cc:1426
 #: src/wx/dcp_panel.cc:684
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -999,7 +1048,7 @@ msgstr "移动选择部分之后内容"
 msgid "Move to start of reel"
 msgstr "分卷设置"
 
-#: src/wx/video_panel.cc:375
+#: src/wx/video_panel.cc:378
 msgid "Multiple content selected"
 msgstr "选择多个文件"
 
@@ -1015,21 +1064,29 @@ msgstr "我的文档"
 msgid "My problem is"
 msgstr "错误内容"
 
-#: src/wx/content_panel.cc:510
+#: src/wx/content_panel.cc:530
 msgid "NEEDS KDM: "
 msgstr "用KDM:"
 
-#: src/wx/cinema_dialog.cc:50 src/wx/dcp_panel.cc:72 src/wx/screen_dialog.cc:67
+#: src/wx/content_panel.cc:534
+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
 msgid "No DCP selected."
@@ -1044,12 +1101,10 @@ msgstr "视频中没有音频，从 %d 到 %d 通道的DCP."
 msgid "No content found in this folder."
 msgstr "没有找到文件！"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:37
-msgid "No effect"
-msgstr "无效果"
-
-#: src/wx/dcp_panel.cc:752 src/wx/video_panel.cc:186 src/wx/video_panel.cc:200
-#: src/wx/video_panel.cc:304
+#. /OUTLINE/SHADOW variables
+#: src/wx/dcp_panel.cc: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 "无"
 
@@ -1061,7 +1116,7 @@ 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 "记录"
 
@@ -1069,11 +1124,11 @@ msgstr "记录"
 msgid "Off"
 msgstr "关闭"
 
-#: src/wx/config_dialog.cc:1435
+#: src/wx/config_dialog.cc:1434
 msgid "Only servers encode"
 msgstr "仅在编码服务器编码"
 
-#: src/wx/config_dialog.cc:1491
+#: src/wx/config_dialog.cc:1490
 msgid "Open console window"
 msgstr "打开控制台窗口"
 
@@ -1089,7 +1144,7 @@ msgstr "团队"
 msgid "Organisational unit"
 msgstr "组织"
 
-#: src/wx/screen_dialog.cc:97
+#: src/wx/screen_dialog.cc:98
 msgid "Other trusted devices"
 msgstr "其它可信设备"
 
@@ -1097,19 +1152,23 @@ msgstr "其它可信设备"
 msgid "Outgoing mail server"
 msgstr "发送邮件服务器"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:41
+#: src/wx/text_subtitle_appearance_dialog.cc:89
 msgid "Outline"
 msgstr "缩略视图"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:49
-msgid "Outline / shadow colour"
-msgstr "缩略视图轮廓颜色"
-
 #: src/wx/film_viewer.cc:69
 msgid "Outline content"
 msgstr "缩略视图内容"
 
-#: src/wx/kdm_dialog.cc:88 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:91 src/wx/self_dkdm_dialog.cc:66
 msgid "Output"
 msgstr "输出"
 
@@ -1117,20 +1176,20 @@ msgstr "输出"
 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:103
+#: src/wx/audio_dialog.cc:112
 msgid "Peak"
 msgstr "最佳"
 
-#: src/wx/audio_panel.cc:328
+#: src/wx/audio_panel.cc:327
 #, c-format
 msgid "Peak: %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_panel.cc:330 src/wx/audio_panel.cc:333
+#: src/wx/audio_panel.cc:329
 msgid "Peak: unknown"
 msgstr "最佳值: 未知"
 
@@ -1164,7 +1223,7 @@ msgstr "预发布(点映版)"
 msgid "Processor"
 msgstr "处理类型"
 
-#: src/wx/content_menu.cc:66
+#: src/wx/content_menu.cc:72
 msgid "Properties..."
 msgstr "属性..."
 
@@ -1176,7 +1235,7 @@ msgstr "协议"
 msgid "RGB to XYZ conversion"
 msgstr "转换RGB 到 XYZ"
 
-#: src/wx/audio_dialog.cc:104
+#: src/wx/audio_dialog.cc:113
 msgid "RMS"
 msgstr "RMS"
 
@@ -1188,11 +1247,11 @@ msgstr "随机"
 msgid "Rating (e.g. 15)"
 msgstr "评级 (例如:15)"
 
-#: src/wx/content_menu.cc:67
+#: src/wx/content_menu.cc:73
 msgid "Re-examine..."
 msgstr "重新制作..."
 
-#: src/wx/config_dialog.cc:737
+#: src/wx/config_dialog.cc:736
 msgid ""
 "Re-make certificates\n"
 "and key..."
@@ -1206,7 +1265,7 @@ msgstr "Rec. 601"
 msgid "Rec. 709"
 msgstr "Rec. 709"
 
-#: src/wx/screen_dialog.cc:84
+#: src/wx/screen_dialog.cc:85
 msgid "Recipient certificate"
 msgstr "收件人证书"
 
@@ -1241,8 +1300,9 @@ msgstr "分卷|自定义"
 msgid "Refer to existing DCP"
 msgstr "参考现有的DCP"
 
-#: src/wx/config_dialog.cc:713 src/wx/content_menu.cc:70
-#: src/wx/content_panel.cc:89 src/wx/editable_list.h:84
+#: src/wx/config_dialog.cc:712 src/wx/content_menu.cc:80
+#: src/wx/content_panel.cc:89 src/wx/templates_dialog.cc:52
+#: src/wx/editable_list.h:80
 msgid "Remove"
 msgstr "移除"
 
@@ -1258,6 +1318,14 @@ msgstr "移除荧幕（放映服务器）"
 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 "重复"
@@ -1266,7 +1334,7 @@ msgstr "重复"
 msgid "Repeat Content"
 msgstr "重复内容"
 
-#: src/wx/content_menu.cc:63
+#: src/wx/content_menu.cc:69
 msgid "Repeat..."
 msgstr "重复..."
 
@@ -1274,7 +1342,7 @@ msgstr "重复..."
 msgid "Report A Problem"
 msgstr "报告问题"
 
-#: src/wx/config_dialog.cc:1290
+#: src/wx/config_dialog.cc:1289
 msgid "Reset to default subject and text"
 msgstr "恢复到默认"
 
@@ -1282,7 +1350,7 @@ msgstr "恢复到默认"
 msgid "Resolution"
 msgstr "解析度"
 
-#: src/wx/job_view.cc:135
+#: src/wx/normal_job_view.cc:56
 msgid "Resume"
 msgstr "恢复"
 
@@ -1314,10 +1382,14 @@ msgstr "SCP (AAM-Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:309
+#: 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"
@@ -1327,7 +1399,7 @@ msgstr "保存到KDM创建的工具列表"
 msgid "Scale to"
 msgstr "缩放"
 
-#: src/wx/kdm_dialog.cc:66
+#: src/wx/kdm_dialog.cc:69
 msgid "Screens"
 msgstr "服务器"
 
@@ -1339,8 +1411,8 @@ msgstr "搜索网络服务器"
 msgid "Select CPL XML file"
 msgstr "选择CPL文件"
 
-#: src/wx/config_dialog.cc:772 src/wx/config_dialog.cc:819
-#: src/wx/config_dialog.cc:1056 src/wx/screen_dialog.cc:163
+#: src/wx/config_dialog.cc:771 src/wx/config_dialog.cc:819
+#: src/wx/config_dialog.cc:1056 src/wx/screen_dialog.cc:165
 msgid "Select Certificate File"
 msgstr "选择证书文件"
 
@@ -1348,7 +1420,7 @@ msgstr "选择证书文件"
 msgid "Select Chain File"
 msgstr "选择密钥文件"
 
-#: src/wx/content_menu.cc:321
+#: src/wx/content_menu.cc:369
 msgid "Select KDM"
 msgstr "选择KDM"
 
@@ -1356,7 +1428,11 @@ msgstr "选择KDM"
 msgid "Select Key File"
 msgstr "选择密钥文件"
 
-#: src/wx/screen_dialog.cc:48
+#: src/wx/content_menu.cc:395
+msgid "Select OV"
+msgstr "选择OV"
+
+#: src/wx/screen_dialog.cc:49
 msgid "Select certificate file"
 msgstr "选择证书文件"
 
@@ -1368,6 +1444,10 @@ msgstr "选择电影和屏幕的数据库文件"
 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 "发送日志"
@@ -1376,7 +1456,7 @@ msgstr "发送日志"
 msgid "Serial number"
 msgstr "序列号"
 
-#: src/wx/server_dialog.cc:29
+#: src/wx/server_dialog.cc:30
 msgid "Server"
 msgstr "服务器"
 
@@ -1400,7 +1480,7 @@ msgstr "系统字体"
 msgid "Set language"
 msgstr "设置语言"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:45
+#: src/wx/text_subtitle_appearance_dialog.cc:90
 msgid "Shadow"
 msgstr "字幕阴影"
 
@@ -1424,11 +1504,11 @@ msgstr "签名DCP和KDM"
 msgid "Single reel"
 msgstr "签名卷"
 
-#: src/wx/audio_dialog.cc:114
+#: src/wx/audio_dialog.cc:123
 msgid "Smoothing"
 msgstr "平滑"
 
-#: src/wx/timeline_dialog.cc:42
+#: src/wx/timeline_dialog.cc:56
 msgid "Snap"
 msgstr "临时"
 
@@ -1472,7 +1552,7 @@ msgstr "字幕"
 msgid "Subtitle Language (e.g. FR)"
 msgstr "字幕语言(例如:CN)"
 
-#: src/wx/text_subtitle_appearance_dialog.cc:30
+#: src/wx/text_subtitle_appearance_dialog.cc:37
 msgid "Subtitle appearance"
 msgstr "字幕外观"
 
@@ -1485,7 +1565,7 @@ msgstr "字幕颜色"
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/wx/about_dialog.cc:268
+#: src/wx/about_dialog.cc:279
 msgid "Supported by"
 msgstr "技术支持"
 
@@ -1501,6 +1581,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)"
@@ -1509,7 +1605,7 @@ msgstr "国别地区(例如:CN)"
 msgid "Test version "
 msgstr "测试版"
 
-#: src/wx/about_dialog.cc:323
+#: src/wx/about_dialog.cc:335
 msgid "Tested by"
 msgstr "测试"
 
@@ -1517,7 +1613,7 @@ msgstr "测试"
 msgid "The 'until' time must be after the 'from' time."
 msgstr "结束时间必须大于开始时间！"
 
-#: src/wx/content_menu.cc:307
+#: src/wx/content_menu.cc:355
 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 "
@@ -1526,7 +1622,12 @@ msgstr "文件不匹配，请删除不规范的文件或添加正确的文件"
 
 #: src/wx/hints_dialog.cc:89
 msgid "There are no hints: everything looks good!"
-msgstr "正常!"
+msgstr "一切正常!"
+
+#: 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."
@@ -1550,7 +1651,7 @@ msgstr "线程"
 msgid "Threads to use for encoding on this host"
 msgstr "线程数"
 
-#: src/wx/config_dialog.cc:697 src/wx/screen_dialog.cc:101
+#: src/wx/config_dialog.cc:696 src/wx/screen_dialog.cc:102
 msgid "Thumbprint"
 msgstr "指纹"
 
@@ -1558,7 +1659,7 @@ msgstr "指纹"
 msgid "Time"
 msgstr "时间"
 
-#: src/wx/timeline_dialog.cc:35
+#: src/wx/timeline_dialog.cc:38
 msgid "Timeline"
 msgstr "时间线"
 
@@ -1595,12 +1696,12 @@ msgstr "开始裁剪"
 msgid "Trim up to current position"
 msgstr "裁剪至当前位置"
 
-#: src/wx/audio_dialog.cc:325
+#: src/wx/audio_dialog.cc:337
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_dialog.cc:97 src/wx/config_dialog.cc:689
+#: src/wx/audio_dialog.cc:106 src/wx/config_dialog.cc:688
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "类型"
@@ -1617,15 +1718,15 @@ msgstr "UTC偏差（时区）"
 msgid "UTC+1"
 msgstr "东1区"
 
-#: src/wx/cinema_dialog.cc:109
+#: src/wx/cinema_dialog.cc:110
 msgid "UTC+10"
 msgstr "东10区"
 
-#: src/wx/cinema_dialog.cc:110
+#: src/wx/cinema_dialog.cc:111
 msgid "UTC+11"
 msgstr "东11区"
 
-#: src/wx/cinema_dialog.cc:111
+#: src/wx/cinema_dialog.cc:112
 msgid "UTC+12"
 msgstr "东12区"
 
@@ -1646,18 +1747,22 @@ msgid "UTC+5"
 msgstr "东5区"
 
 #: src/wx/cinema_dialog.cc:105
+msgid "UTC+5:30"
+msgstr "东5:30区 (印度，斯里兰卡)"
+
+#: src/wx/cinema_dialog.cc:106
 msgid "UTC+6"
 msgstr "东6区"
 
-#: src/wx/cinema_dialog.cc:106
+#: src/wx/cinema_dialog.cc:107
 msgid "UTC+7"
 msgstr "东7区"
 
-#: src/wx/cinema_dialog.cc:107
+#: src/wx/cinema_dialog.cc:108
 msgid "UTC+8"
-msgstr "东8区(北京时间)"
+msgstr "东8区 (北京时间)"
 
-#: src/wx/cinema_dialog.cc:108
+#: src/wx/cinema_dialog.cc:109
 msgid "UTC+9"
 msgstr "东9区"
 
@@ -1713,10 +1818,6 @@ msgstr "西8区"
 msgid "UTC-9"
 msgstr "西9区"
 
-#: src/wx/content_panel.cc:93
-msgid "Up"
-msgstr "上移"
-
 #: src/wx/update_dialog.cc:29
 msgid "Update"
 msgstr "更新"
@@ -1763,7 +1864,7 @@ msgstr "视频帧率"
 msgid "View..."
 msgstr "视图窗口"
 
-#: src/wx/config_dialog.cc:1474
+#: src/wx/config_dialog.cc:1473
 msgid "Warnings"
 msgstr "警告"
 
@@ -1811,7 +1912,11 @@ msgstr "YUV转换到RGB"
 msgid "YUV to RGB matrix"
 msgstr "YUV转换到RGB矩阵"
 
-#: src/wx/video_waveform_dialog.cc:65
+#: src/wx/report_problem_dialog.cc:66
+msgid "Your email address"
+msgstr "您的邮箱地址"
+
+#: src/wx/video_waveform_dialog.cc:72
 msgid "component value"
 msgstr "结构"
 
@@ -1873,6 +1978,18 @@ msgstr "x"
 msgid "y"
 msgstr "y"
 
+#~ 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; "