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 21b4ea97cb57c657980a84d449df227842019a45..1c77e780250de9736c6bc766818d8fd38cb3b487 100644 (file)
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCP-O-MATIC_CN\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-14 20:35+0100\n"
+"POT-Creation-Date: 2016-04-28 23:28+0100\n"
 "PO-Revision-Date: 2016-03-27 22:12+0800\n"
 "Last-Translator: Rov(若文)\n"
 "Language-Team: Rov(若文) <lojy2009@qq.com>\n"
@@ -54,7 +54,7 @@ msgstr "-6db"
 msgid "255"
 msgstr "255"
 
-#: src/wx/video_panel.cc:224
+#: src/wx/video_panel.cc:226
 msgid "2D"
 msgstr "2D"
 
@@ -62,35 +62,35 @@ msgstr "2D"
 msgid "2D version of content available in 3D"
 msgstr "伪3D"
 
-#: src/wx/dcp_panel.cc:696
+#: src/wx/dcp_panel.cc:700
 msgid "2K"
 msgstr "2K"
 
-#: src/wx/dcp_panel.cc:654
+#: src/wx/dcp_panel.cc:658
 msgid "3D"
 msgstr "3D"
 
-#: src/wx/video_panel.cc:227
+#: src/wx/video_panel.cc:229
 msgid "3D alternate"
 msgstr "左右交叉(3D)"
 
-#: src/wx/video_panel.cc:228
+#: src/wx/video_panel.cc:230
 msgid "3D left only"
 msgstr "仅左眼(3D)"
 
-#: src/wx/video_panel.cc:225
+#: src/wx/video_panel.cc:227
 msgid "3D left/right"
 msgstr "左右眼(3D)"
 
-#: src/wx/video_panel.cc:229
+#: src/wx/video_panel.cc:231
 msgid "3D right only"
 msgstr "仅右眼(3D)"
 
-#: src/wx/video_panel.cc:226
+#: src/wx/video_panel.cc:228
 msgid "3D top/bottom"
 msgstr "上下眼(3D)"
 
-#: src/wx/dcp_panel.cc:697
+#: src/wx/dcp_panel.cc:701
 msgid "4K"
 msgstr "4K"
 
@@ -104,7 +104,15 @@ msgstr "<b>原色彩空间</b>"
 
 #. //trac.wxwidgets.org/ticket/13389
 #.
-#: src/wx/timing_panel.cc:123
+#: src/wx/report_problem_dialog.cc:74
+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 ""
+
+#. //trac.wxwidgets.org/ticket/13389
+#.
+#: src/wx/timing_panel.cc:125
 msgid ""
 "<i>Only change this if it the content's frame rate has been read incorrectly."
 "</i>"
@@ -131,6 +139,11 @@ msgstr "DCP-O-MATIC 新版本"
 msgid "About DCP-o-matic"
 msgstr "关于 DCP-o-matic"
 
+#: src/wx/screens_panel.cc:149
+#, fuzzy
+msgid "Add Cinema"
+msgstr "添加影院"
+
 #: src/wx/screens_panel.cc:56
 msgid "Add Cinema..."
 msgstr "添加影院"
@@ -139,7 +152,12 @@ msgstr "添加影院"
 msgid "Add KDM..."
 msgstr "添加 KDM..."
 
-#: src/wx/screens_panel.cc:63
+#: src/wx/screens_panel.cc:204
+#, fuzzy
+msgid "Add Screen"
+msgstr "添加新服务器"
+
+#: src/wx/screens_panel.cc:58
 msgid "Add Screen..."
 msgstr "添加新服务器"
 
@@ -169,7 +187,7 @@ msgstr "添加视频、图片或音频文件"
 msgid "Add..."
 msgstr "添加..."
 
-#: src/wx/cinema_dialog.cc:65 src/wx/config_dialog.cc:1215
+#: src/wx/cinema_dialog.cc:65 src/wx/config_dialog.cc:1225
 msgid "Address"
 msgstr "地址"
 
@@ -193,7 +211,7 @@ msgid ""
 "tab."
 msgstr "宽幅(2.39：1)上下去黑边。"
 
-#: src/wx/config_dialog.cc:1364
+#: src/wx/config_dialog.cc:1374
 msgid "Allow any DCP frame rate"
 msgstr "允许任何DCP帧速率"
 
@@ -205,7 +223,7 @@ msgstr "透明度 0"
 msgid "Appearance..."
 msgstr "显示"
 
-#: src/wx/audio_dialog.cc:41 src/wx/audio_panel.cc:45 src/wx/dcp_panel.cc:110
+#: src/wx/audio_dialog.cc:43 src/wx/audio_panel.cc:45 src/wx/dcp_panel.cc:110
 #: src/wx/timeline_labels_view.cc:35 src/wx/timeline_labels_view.cc:63
 msgid "Audio"
 msgstr "音频"
@@ -235,7 +253,7 @@ msgstr "自动解析内容中的音频"
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1227
+#: src/wx/config_dialog.cc:1237
 msgid "BCC address"
 msgstr "密送地址"
 
@@ -267,11 +285,11 @@ msgstr "字幕以图像输出"
 msgid "But I have to use fader"
 msgstr "使用推子"
 
-#: src/wx/config_dialog.cc:1216
+#: src/wx/config_dialog.cc:1226
 msgid "CC addresses"
 msgstr "抄送地址 "
 
-#: src/wx/kdm_cpl_panel.cc:34 src/wx/kdm_dialog.cc:71
+#: src/wx/kdm_cpl_panel.cc:34 src/wx/kdm_dialog.cc:72
 #: src/wx/self_dkdm_dialog.cc:52
 msgid "CPL"
 msgstr "CPL"
@@ -308,7 +326,7 @@ msgstr "链接"
 msgid "Channel gain"
 msgstr "信道增益"
 
-#: src/wx/audio_dialog.cc:70 src/wx/dcp_panel.cc:739
+#: src/wx/audio_dialog.cc:73 src/wx/dcp_panel.cc:743
 msgid "Channels"
 msgstr "通道"
 
@@ -357,7 +375,8 @@ msgstr "色彩空间"
 msgid "Colour conversion"
 msgstr "色彩转换"
 
-#: src/wx/video_panel.cc:196
+#. / TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
+#: src/wx/video_panel.cc:198
 #, fuzzy
 msgid "Colour|Custom"
 msgstr "色彩空间"
@@ -366,7 +385,8 @@ msgstr "色彩空间"
 msgid "Component"
 msgstr "构成"
 
-#: src/wx/config_dialog.cc:1388
+#. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
+#: src/wx/config_dialog.cc:1399
 msgid "Config|Timing"
 msgstr "同步"
 
@@ -374,7 +394,7 @@ msgstr "同步"
 msgid "Contact email"
 msgstr "邮箱地址"
 
-#: src/wx/dcp_panel.cc:629
+#: src/wx/dcp_panel.cc:633
 msgid "Container"
 msgstr "格式"
 
@@ -402,7 +422,7 @@ msgstr "对比"
 msgid "Copy as name"
 msgstr "复制名称"
 
-#: src/wx/audio_dialog.cc:201
+#: src/wx/audio_dialog.cc:219
 msgid "Could not analyse audio."
 msgstr "无法分析音频。"
 
@@ -416,15 +436,15 @@ msgstr "无法获取视频 (%s)"
 msgid "Could not load KDM (%s)"
 msgstr "无法加载 KDM (%s)"
 
-#: src/wx/config_dialog.cc:759 src/wx/config_dialog.cc:924
+#: src/wx/config_dialog.cc:766 src/wx/config_dialog.cc:934
 #: src/wx/download_certificate_panel.cc:55 src/wx/screen_dialog.cc:142
 #, c-format
 msgid "Could not read certificate file (%s)"
 msgstr "无法读取证书文件 (%s)"
 
-#: src/wx/config_dialog.cc:916
-#, c-format
-msgid "Could not read key file (%s)"
+#: src/wx/config_dialog.cc:925
+#, fuzzy, c-format
+msgid "Could not read key file; file is too long (%s)"
 msgstr "无法读取密钥文件 (%s)"
 
 #: src/wx/new_film_dialog.cc:40
@@ -452,23 +472,23 @@ msgstr "DCP目录"
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/wx/audio_dialog.cc:124
+#: src/wx/audio_dialog.cc:127
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic音频"
 
-#: src/wx/config_dialog.cc:1390
+#: src/wx/config_dialog.cc:1401
 msgid "Debug: decode"
 msgstr "解码"
 
-#: src/wx/config_dialog.cc:1394
+#: src/wx/config_dialog.cc:1405
 msgid "Debug: email sending"
 msgstr "发送到邮箱"
 
-#: src/wx/config_dialog.cc:1392
+#: src/wx/config_dialog.cc:1403
 msgid "Debug: encode"
 msgstr "编码"
 
-#: src/wx/config_dialog.cc:1005
+#: src/wx/config_dialog.cc:1015
 msgid "Decrypting DCPs"
 msgstr "解密DCP"
 
@@ -540,17 +560,27 @@ msgstr "下载..."
 msgid "Downloading certificate"
 msgstr "下载证书"
 
-#: src/wx/screens_panel.cc:58
+#: src/wx/screens_panel.cc:60
 msgid "Edit Cinema..."
 msgstr "编辑影城..."
 
-#: src/wx/screens_panel.cc:65
+#: src/wx/screens_panel.cc:62
 msgid "Edit Screen..."
 msgstr "编辑服务器..."
 
+#: src/wx/screens_panel.cc:169
+#, fuzzy
+msgid "Edit cinema"
+msgstr "编辑影城..."
+
+#: src/wx/screens_panel.cc:230
+#, fuzzy
+msgid "Edit screen"
+msgstr "编辑服务器..."
+
 #: src/wx/audio_mapping_view.cc:143 src/wx/config_dialog.cc:423
 #: src/wx/dcp_panel.cc:129 src/wx/fonts_dialog.cc:76 src/wx/video_panel.cc:180
-#: src/wx/video_panel.cc:199 src/wx/editable_list.h:84
+#: src/wx/video_panel.cc:201 src/wx/editable_list.h:84
 msgid "Edit..."
 msgstr "编辑..."
 
@@ -574,7 +604,7 @@ msgstr "加密"
 msgid "End"
 msgstr "结束"
 
-#: src/wx/config_dialog.cc:1386
+#: src/wx/config_dialog.cc:1396
 msgid "Errors"
 msgstr "错误"
 
@@ -582,7 +612,7 @@ msgstr "错误"
 msgid "Export"
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1012
+#: src/wx/config_dialog.cc:1022
 msgid "Export DCP decryption certificate..."
 msgstr "导出DCP证书"
 
@@ -590,7 +620,7 @@ msgstr "导出DCP证书"
 msgid "Export..."
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1096
+#: src/wx/config_dialog.cc:1106
 msgid "FTP (for Dolby)"
 msgstr "FTP (Dolby)"
 
@@ -636,7 +666,7 @@ msgstr "字体..."
 msgid "Fonts..."
 msgstr "字体..."
 
-#: src/wx/dcp_panel.cc:640
+#: src/wx/dcp_panel.cc:644
 msgid "Frame Rate"
 msgstr "帧速率"
 
@@ -650,11 +680,11 @@ msgstr ""
 "免费的DCP打包软件。 - Rov 汉化\n"
 "汉化下载：www.rov8.com ( 放映员资料库)"
 
-#: src/wx/kdm_timing_panel.cc:29
+#: src/wx/kdm_timing_panel.cc:34
 msgid "From"
 msgstr "起始"
 
-#: src/wx/config_dialog.cc:1210
+#: src/wx/config_dialog.cc:1220
 msgid "From address"
 msgstr "发件人地址"
 
@@ -662,7 +692,7 @@ msgstr "发件人地址"
 msgid "Full"
 msgstr "总"
 
-#: src/wx/timing_panel.cc:87
+#: src/wx/timing_panel.cc:89
 msgid "Full length"
 msgstr "总长度"
 
@@ -683,7 +713,7 @@ msgstr "增益计算"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "从内容通道  %d 到DCP %d 通道进行增益调整"
 
-#: src/wx/config_dialog.cc:1382
+#: src/wx/config_dialog.cc:1392
 msgid "General"
 msgstr "普通"
 
@@ -715,7 +745,7 @@ msgstr "主机名或IP地址"
 msgid "ID"
 msgstr "ID"
 
-#: src/wx/config_dialog.cc:1079
+#: src/wx/config_dialog.cc:1089
 msgid "IP address"
 msgstr "IP地址"
 
@@ -739,12 +769,12 @@ msgstr "伽玛校正"
 msgid "Input power"
 msgstr "功率"
 
-#: src/wx/audio_dialog.cc:306
+#: src/wx/audio_dialog.cc:324
 #, c-format
 msgid "Integrated loudness %.2f LUFS"
 msgstr "平均响度 %.2f LUFS"
 
-#: src/wx/config_dialog.cc:829
+#: src/wx/config_dialog.cc:836
 msgid "Intermediate"
 msgstr "公钥"
 
@@ -752,7 +782,7 @@ msgstr "公钥"
 msgid "Intermediate common name"
 msgstr "公钥名称"
 
-#: src/wx/config_dialog.cc:484 src/wx/dcp_panel.cc:185
+#: src/wx/config_dialog.cc:484 src/wx/dcp_panel.cc:186
 msgid "Interop"
 msgstr "Interop"
 
@@ -768,7 +798,7 @@ msgstr "斜体文件"
 msgid "Italic font"
 msgstr "斜体"
 
-#: src/wx/dcp_panel.cc:664
+#: src/wx/dcp_panel.cc:668
 msgid "JPEG2000 bandwidth"
 msgstr "JPEG2000码率"
 
@@ -776,7 +806,7 @@ msgstr "JPEG2000码率"
 msgid "Join"
 msgstr "创建"
 
-#: src/wx/config_dialog.cc:1169
+#: src/wx/config_dialog.cc:1179
 msgid "KDM Email"
 msgstr "Email KDM"
 
@@ -784,7 +814,8 @@ msgstr "Email KDM"
 msgid "KDM type"
 msgstr "KDM类型"
 
-#: src/wx/kdm_dialog.cc:64
+#. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
+#: src/wx/kdm_dialog.cc:65
 msgid "KDM|Timing"
 msgstr "时间窗口"
 
@@ -796,7 +827,7 @@ msgstr "保持视频序列和字幕序列"
 msgid "Key"
 msgstr "键值"
 
-#: src/wx/config_dialog.cc:982
+#: src/wx/config_dialog.cc:992
 msgid "Keys"
 msgstr "键值"
 
@@ -804,7 +835,7 @@ msgstr "键值"
 msgid "Language"
 msgstr "语言"
 
-#: src/wx/config_dialog.cc:827
+#: src/wx/config_dialog.cc:834
 msgid "Leaf"
 msgstr "私钥"
 
@@ -833,28 +864,28 @@ msgstr "对齐低位的伽马值"
 msgid "Load..."
 msgstr "加载..."
 
-#: src/wx/config_dialog.cc:1376
+#: src/wx/config_dialog.cc:1386
 msgid "Log"
 msgstr "日志"
 
-#: src/wx/config_dialog.cc:1373
+#: src/wx/config_dialog.cc:1383
 msgid "Log:"
 msgstr "日志:"
 
-#: src/wx/audio_dialog.cc:315
+#: src/wx/audio_dialog.cc:333
 #, c-format
 msgid "Loudness range %.2f LU"
 msgstr "响度范围 %.2f LU"
 
-#: src/wx/content_panel.cc:503
+#: src/wx/content_panel.cc:505
 msgid "MISSING: "
 msgstr "丢失:"
 
-#: src/wx/config_dialog.cc:1202
+#: src/wx/config_dialog.cc:1212
 msgid "Mail password"
 msgstr "邮箱登录密码"
 
-#: src/wx/config_dialog.cc:1198
+#: src/wx/config_dialog.cc:1208
 msgid "Mail user name"
 msgstr "邮箱用户名"
 
@@ -878,12 +909,12 @@ msgstr "要求亮度(例如:14FL)"
 msgid "Matrix"
 msgstr "矩阵"
 
-#: src/wx/config_dialog.cc:1356
+#: src/wx/config_dialog.cc:1366
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "最大JPEG2000码率"
 
-#: src/wx/config_dialog.cc:439 src/wx/config_dialog.cc:1360
-#: src/wx/dcp_panel.cc:668
+#: src/wx/config_dialog.cc:439 src/wx/config_dialog.cc:1370
+#: src/wx/dcp_panel.cc:672
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
@@ -895,7 +926,7 @@ msgstr "移动选择部分之前内容"
 msgid "Move the selected piece of content later in the film."
 msgstr "移动选择部分之后内容"
 
-#: src/wx/video_panel.cc:359
+#: src/wx/video_panel.cc:361
 msgid "Multiple content selected"
 msgstr "选择多个文件"
 
@@ -911,7 +942,7 @@ msgstr "我的文档"
 msgid "My problem is"
 msgstr "错误内容"
 
-#: src/wx/content_panel.cc:507
+#: src/wx/content_panel.cc:509
 msgid "NEEDS KDM: "
 msgstr "用KDM:"
 
@@ -941,8 +972,8 @@ msgstr "视频中没有音频，从 %d 到 %d 通道的DCP."
 msgid "No content found in this folder."
 msgstr "没有找到文件！"
 
-#: src/wx/dcp_panel.cc:747 src/wx/video_panel.cc:178 src/wx/video_panel.cc:192
-#: src/wx/video_panel.cc:294
+#: src/wx/dcp_panel.cc:751 src/wx/video_panel.cc:178 src/wx/video_panel.cc:192
+#: src/wx/video_panel.cc:296
 msgid "None"
 msgstr "无"
 
@@ -958,11 +989,11 @@ msgstr "普通字体"
 msgid "Off"
 msgstr "关闭"
 
-#: src/wx/config_dialog.cc:1368
+#: src/wx/config_dialog.cc:1378
 msgid "Only servers encode"
 msgstr "仅服务器编码"
 
-#: src/wx/config_dialog.cc:1400
+#: src/wx/config_dialog.cc:1411
 msgid "Open console window"
 msgstr "打开控制台窗口"
 
@@ -982,7 +1013,7 @@ msgstr "组织"
 msgid "Other trusted devices"
 msgstr "其它可信设备"
 
-#: src/wx/config_dialog.cc:1186
+#: src/wx/config_dialog.cc:1196
 msgid "Outgoing mail server"
 msgstr "发送邮件服务器"
 
@@ -998,11 +1029,11 @@ msgstr "缩略视图轮廓颜色"
 msgid "Outline content"
 msgstr "缩略视图内容"
 
-#: src/wx/kdm_dialog.cc:78
+#: src/wx/kdm_dialog.cc:79
 msgid "Output"
 msgstr "输出"
 
-#: src/wx/config_dialog.cc:1091
+#: src/wx/config_dialog.cc:1101
 msgid "Password"
 msgstr "密码"
 
@@ -1010,16 +1041,16 @@ msgstr "密码"
 msgid "Pause"
 msgstr "暂停"
 
-#: src/wx/audio_dialog.cc:88
+#: src/wx/audio_dialog.cc:91
 msgid "Peak"
 msgstr "最佳"
 
-#: src/wx/audio_panel.cc:300
+#: src/wx/audio_panel.cc:302
 #, c-format
 msgid "Peak: %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_panel.cc:302 src/wx/audio_panel.cc:305
+#: src/wx/audio_panel.cc:304 src/wx/audio_panel.cc:307
 msgid "Peak: unknown"
 msgstr "最佳值: 未知"
 
@@ -1027,11 +1058,11 @@ msgstr "最佳值: 未知"
 msgid "Play"
 msgstr "播放"
 
-#: src/wx/timing_panel.cc:102
+#: src/wx/timing_panel.cc:104
 msgid "Play length"
 msgstr "播放长度"
 
-#: src/wx/report_problem_dialog.cc:78
+#: src/wx/report_problem_dialog.cc:101
 msgid ""
 "Please enter an email address so that we can contact you with any queries "
 "about the problem."
@@ -1041,7 +1072,7 @@ msgstr "请输入您的电子邮件，以便我们可以与您取得联系。"
 msgid "Please wait; audio is being analysed..."
 msgstr "请稍等，正在解析音频..."
 
-#: src/wx/timing_panel.cc:84
+#: src/wx/timing_panel.cc:86
 msgid "Position"
 msgstr "位置"
 
@@ -1049,7 +1080,7 @@ msgstr "位置"
 msgid "Pre-release"
 msgstr "预发布(点映版)"
 
-#: src/wx/dcp_panel.cc:745
+#: src/wx/dcp_panel.cc:749
 msgid "Processor"
 msgstr "处理类型"
 
@@ -1057,7 +1088,7 @@ msgstr "处理类型"
 msgid "Properties..."
 msgstr "属性..."
 
-#: src/wx/config_dialog.cc:1075
+#: src/wx/config_dialog.cc:1085
 msgid "Protocol"
 msgstr "协议"
 
@@ -1065,7 +1096,7 @@ msgstr "协议"
 msgid "RGB to XYZ conversion"
 msgstr "RGB 转换到 XYZ"
 
-#: src/wx/audio_dialog.cc:89
+#: src/wx/audio_dialog.cc:92
 msgid "RMS"
 msgstr "RMS"
 
@@ -1118,7 +1149,8 @@ msgstr "卷大小"
 msgid "Reels"
 msgstr "卷"
 
-#: src/wx/dcp_panel.cc:180
+#. / TRANSLATORS: translate the word "Custom" here; do not include the "Reel|" prefix
+#: src/wx/dcp_panel.cc:181
 #, fuzzy
 msgid "Reel|Custom"
 msgstr "自定义"
@@ -1133,11 +1165,11 @@ msgstr "参考现有的DCP"
 msgid "Remove"
 msgstr "移除"
 
-#: src/wx/screens_panel.cc:60
+#: src/wx/screens_panel.cc:64
 msgid "Remove Cinema"
 msgstr "移除影院"
 
-#: src/wx/screens_panel.cc:67
+#: src/wx/screens_panel.cc:66
 msgid "Remove Screen"
 msgstr "移除服务器"
 
@@ -1161,11 +1193,11 @@ msgstr "重复..."
 msgid "Report A Problem"
 msgstr "报告问题"
 
-#: src/wx/config_dialog.cc:1234
+#: src/wx/config_dialog.cc:1244
 msgid "Reset to default subject and text"
 msgstr "恢复到默认"
 
-#: src/wx/dcp_panel.cc:658
+#: src/wx/dcp_panel.cc:662
 msgid "Resolution"
 msgstr "解析度"
 
@@ -1186,7 +1218,7 @@ msgstr "右键单击要更改增益。"
 msgid "Right eye"
 msgstr "右边"
 
-#: src/wx/config_dialog.cc:825
+#: src/wx/config_dialog.cc:832
 msgid "Root"
 msgstr "Root"
 
@@ -1194,15 +1226,15 @@ msgstr "Root"
 msgid "Root common name"
 msgstr "Root名称"
 
-#: src/wx/config_dialog.cc:1095
+#: src/wx/config_dialog.cc:1105
 msgid "SCP (for AAM and Doremi)"
 msgstr "SCP (AAM-Doremi)"
 
-#: src/wx/config_dialog.cc:483 src/wx/dcp_panel.cc:184
+#: src/wx/config_dialog.cc:483 src/wx/dcp_panel.cc:185
 msgid "SMPTE"
 msgstr "SMPTE"
 
-#: src/wx/audio_dialog.cc:276
+#: src/wx/audio_dialog.cc:294
 #, c-format
 msgid "Sample peak is %.2fdB at %s"
 msgstr "最佳值 %.2fdB 到 %s "
@@ -1223,8 +1255,8 @@ msgstr "搜索网络服务器"
 msgid "Select CPL XML file"
 msgstr "选择CPL文件"
 
-#: src/wx/config_dialog.cc:750 src/wx/config_dialog.cc:790
-#: src/wx/config_dialog.cc:1021 src/wx/screen_dialog.cc:149
+#: src/wx/config_dialog.cc:750 src/wx/config_dialog.cc:797
+#: src/wx/config_dialog.cc:1031 src/wx/screen_dialog.cc:149
 msgid "Select Certificate File"
 msgstr "选择证书文件"
 
@@ -1232,7 +1264,7 @@ msgstr "选择证书文件"
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/wx/config_dialog.cc:910 src/wx/config_dialog.cc:941
+#: src/wx/config_dialog.cc:917 src/wx/config_dialog.cc:951
 msgid "Select Key File"
 msgstr "选择密钥文件"
 
@@ -1264,7 +1296,7 @@ msgstr "服务器"
 msgid "Servers"
 msgstr "服务器"
 
-#: src/wx/timecode.cc:62 src/wx/timing_panel.cc:111
+#: src/wx/timecode.cc:62 src/wx/timing_panel.cc:113
 msgid "Set"
 msgstr "设置"
 
@@ -1280,7 +1312,7 @@ msgstr "系统字体"
 msgid "Set language"
 msgstr "设置语言"
 
-#: src/wx/dcp_panel.cc:754
+#: src/wx/dcp_panel.cc:758
 msgid "Show audio..."
 msgstr "显示音频"
 
@@ -1292,7 +1324,7 @@ msgstr "显示音频电平图"
 msgid "Signed"
 msgstr "签名"
 
-#: src/wx/config_dialog.cc:997
+#: src/wx/config_dialog.cc:1007
 msgid "Signing DCPs and KDMs"
 msgstr "签名DCP和KDM"
 
@@ -1300,7 +1332,7 @@ msgstr "签名DCP和KDM"
 msgid "Single reel"
 msgstr "签名卷"
 
-#: src/wx/audio_dialog.cc:99
+#: src/wx/audio_dialog.cc:102
 msgid "Smoothing"
 msgstr "平滑"
 
@@ -1332,7 +1364,7 @@ msgstr "流"
 msgid "Studio (e.g. TCF)"
 msgstr "工作室(例如:TCF)"
 
-#: src/wx/config_dialog.cc:1206
+#: src/wx/config_dialog.cc:1216
 msgid "Subject"
 msgstr "类目"
 
@@ -1357,15 +1389,15 @@ msgstr "字幕颜色"
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/wx/about_dialog.cc:249
+#: src/wx/about_dialog.cc:252
 msgid "Supported by"
 msgstr "技术支持"
 
-#: src/wx/config_dialog.cc:1058
+#: src/wx/config_dialog.cc:1068
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:1083
+#: src/wx/config_dialog.cc:1093
 msgid "Target path"
 msgstr "目标路径"
 
@@ -1381,10 +1413,14 @@ msgstr "国别地区(例如:CN)"
 msgid "Test version "
 msgstr "测试版"
 
-#: src/wx/about_dialog.cc:303
+#: src/wx/about_dialog.cc:306
 msgid "Tested by"
 msgstr "测试"
 
+#: src/wx/kdm_timing_panel.cc:104
+msgid "The 'until' time must be after the 'from' time."
+msgstr ""
+
 #: src/wx/content_menu.cc:307
 msgid ""
 "The content file(s) you specified are not the same as those that are "
@@ -1400,6 +1436,12 @@ msgstr "正常!"
 msgid "There is not enough free memory to do that."
 msgstr "内存不够！"
 
+#: src/wx/config_dialog.cc:758
+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:119
 msgid "This is not a valid CPL file"
 msgstr "不是有效的CPL文件！"
@@ -1428,7 +1470,8 @@ msgstr "时间线"
 msgid "Timeline..."
 msgstr "时间线"
 
-#: src/wx/timing_panel.cc:44
+#. / TRANSLATORS: translate the word "Timing" here; do not include the "Timing|" prefix
+#: src/wx/timing_panel.cc:46
 msgid "Timing|Timing"
 msgstr "计时器"
 
@@ -1440,33 +1483,33 @@ msgstr "顶部"
 msgid "Translated by"
 msgstr "翻译"
 
-#: src/wx/timing_panel.cc:99
+#: src/wx/timing_panel.cc:101
 msgid "Trim after current position"
 msgstr "裁剪当前位置"
 
-#: src/wx/timing_panel.cc:96
+#: src/wx/timing_panel.cc:98
 msgid "Trim from end"
 msgstr "裁剪结束"
 
-#: src/wx/timing_panel.cc:90
+#: src/wx/timing_panel.cc:92
 msgid "Trim from start"
 msgstr "开始裁剪"
 
-#: src/wx/timing_panel.cc:93
+#: src/wx/timing_panel.cc:95
 msgid "Trim up to current position"
 msgstr "裁剪至当前位置"
 
-#: src/wx/audio_dialog.cc:292
+#: src/wx/audio_dialog.cc:310
 #, c-format
 msgid "True peak is %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_dialog.cc:82 src/wx/config_dialog.cc:667
+#: src/wx/audio_dialog.cc:85 src/wx/config_dialog.cc:667
 #: src/wx/video_panel.cc:84
 msgid "Type"
 msgstr "类型"
 
-#: src/wx/cinema_dialog.cc:92
+#: src/wx/cinema_dialog.cc:93
 msgid "UTC"
 msgstr "UTC"
 
@@ -1474,67 +1517,67 @@ msgstr "UTC"
 msgid "UTC offset (time zone)"
 msgstr "UTC偏差（时区）"
 
-#: src/wx/cinema_dialog.cc:93
+#: src/wx/cinema_dialog.cc:94
 #, fuzzy
 msgid "UTC+1"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:102
+#: src/wx/cinema_dialog.cc:103
 #, fuzzy
 msgid "UTC+10"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:103
+#: src/wx/cinema_dialog.cc:104
 #, fuzzy
 msgid "UTC+11"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:104
+#: src/wx/cinema_dialog.cc:105
 #, fuzzy
 msgid "UTC+12"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:94
+#: src/wx/cinema_dialog.cc:95
 #, fuzzy
 msgid "UTC+2"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:95
+#: src/wx/cinema_dialog.cc:96
 #, fuzzy
 msgid "UTC+3"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:96
+#: src/wx/cinema_dialog.cc:97
 #, fuzzy
 msgid "UTC+4"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:97
+#: src/wx/cinema_dialog.cc:98
 #, fuzzy
 msgid "UTC+5"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:98
+#: src/wx/cinema_dialog.cc:99
 #, fuzzy
 msgid "UTC+6"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:99
+#: src/wx/cinema_dialog.cc:100
 #, fuzzy
 msgid "UTC+7"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:100
+#: src/wx/cinema_dialog.cc:101
 #, fuzzy
 msgid "UTC+8"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:101
+#: src/wx/cinema_dialog.cc:102
 #, fuzzy
 msgid "UTC+9"
 msgstr "UTC+%d"
 
-#: src/wx/cinema_dialog.cc:91
+#: src/wx/cinema_dialog.cc:92
 msgid "UTC-1"
 msgstr ""
 
@@ -1546,22 +1589,26 @@ msgstr ""
 msgid "UTC-11"
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:90
+#: src/wx/cinema_dialog.cc:91
 msgid "UTC-2"
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:89
+#: src/wx/cinema_dialog.cc:90
 msgid "UTC-3"
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:88
+#: src/wx/cinema_dialog.cc:89
 msgid "UTC-3:30"
 msgstr ""
 
-#: src/wx/cinema_dialog.cc:87
+#: src/wx/cinema_dialog.cc:88
 msgid "UTC-4"
 msgstr ""
 
+#: src/wx/cinema_dialog.cc:87
+msgid "UTC-4:30"
+msgstr ""
+
 #: src/wx/cinema_dialog.cc:86
 msgid "UTC-5"
 msgstr ""
@@ -1598,7 +1645,7 @@ msgstr "制作好DCP后上传到TMS"
 msgid "Use ISDCF name"
 msgstr "使用ISDCF名称"
 
-#: src/wx/dcp_panel.cc:648
+#: src/wx/dcp_panel.cc:652
 msgid "Use best"
 msgstr "使用最佳"
 
@@ -1610,7 +1657,7 @@ msgstr "使用预设"
 msgid "Use subtitles"
 msgstr "使用字幕"
 
-#: src/wx/config_dialog.cc:1087
+#: src/wx/config_dialog.cc:1097
 msgid "User name"
 msgstr "用户名"
 
@@ -1623,7 +1670,7 @@ msgstr "视频"
 msgid "Video Waveform"
 msgstr "视频波形"
 
-#: src/wx/timing_panel.cc:107
+#: src/wx/timing_panel.cc:109
 msgid "Video frame rate"
 msgstr "视频帧率"
 
@@ -1631,7 +1678,7 @@ msgstr "视频帧率"
 msgid "View..."
 msgstr "视图窗口"
 
-#: src/wx/config_dialog.cc:1384
+#: src/wx/config_dialog.cc:1394
 msgid "Warnings"
 msgstr "警告"
 
@@ -1724,17 +1771,17 @@ msgid "dB"
 msgstr "dB"
 
 #. // TRANSLATORS: this is an abbreviation for "frames"
-#: src/wx/timing_panel.cc:76
+#: src/wx/timing_panel.cc:78
 msgid "f"
 msgstr "帧"
 
 #. // TRANSLATORS: this is an abbreviation for "hours"
-#: src/wx/timing_panel.cc:54
+#: src/wx/timing_panel.cc:56
 msgid "h"
 msgstr "时"
 
 #. // TRANSLATORS: this is an abbreviation for "minutes"
-#: src/wx/timing_panel.cc:62
+#: src/wx/timing_panel.cc:64
 msgid "m"
 msgstr "分"
 
@@ -1743,12 +1790,12 @@ msgstr "分"
 msgid "ms"
 msgstr "毫秒"
 
-#: src/wx/config_dialog.cc:1191
+#: src/wx/config_dialog.cc:1201
 msgid "port"
 msgstr "端口"
 
 #. // TRANSLATORS: this is an abbreviation for "seconds"
-#: src/wx/config_dialog.cc:410 src/wx/timing_panel.cc:69
+#: src/wx/config_dialog.cc:410 src/wx/timing_panel.cc:71
 msgid "s"
 msgstr "秒"
 
@@ -1760,7 +1807,7 @@ msgstr "最低"
 msgid "times"
 msgstr "时间"
 
-#: src/wx/kdm_timing_panel.cc:37
+#: src/wx/kdm_timing_panel.cc:42
 msgid "until"
 msgstr "终止"