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 7a21a1f00a994431bbe72ab7ba012c99e6607142..2ff1808d03c3f97fe2fa5805d5eaa87d19806578 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-10-25 10:43+0100\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"
@@ -32,8 +32,9 @@ 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"
@@ -115,11 +116,11 @@ msgstr "6声道—5.1声道"
 msgid "8 - 5.1/HI/VI"
 msgstr "8声道—5.1+听力障碍声道/视力障碍声道"
 
-#: src/wx/image_subtitle_colour_dialog.cc:41
+#: 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>"
 
@@ -139,7 +140,7 @@ msgid ""
 "i>"
 msgstr "<i>当帧率错误是进行此项设置。</i>"
 
-#: src/wx/colour_conversion_editor.cc:68
+#: src/wx/colour_conversion_editor.cc:79
 msgid "A"
 msgstr "A"
 
@@ -159,11 +160,11 @@ msgstr "添加影院"
 msgid "Add Cinema..."
 msgstr "添加影院..."
 
-#: src/wx/content_menu.cc:75
+#: src/wx/content_menu.cc:77
 msgid "Add KDM..."
 msgstr "添加 KDM..."
 
-#: src/wx/content_menu.cc:76
+#: src/wx/content_menu.cc:78
 msgid "Add OV..."
 msgstr "添加 OV..."
 
@@ -197,19 +198,19 @@ msgstr "添加图像序列"
 msgid "Add video, image or sound files to the film."
 msgstr "添加视频、图片或音频文件"
 
-#: src/wx/config_dialog.cc:710 src/wx/editable_list.h:74
+#: 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:1271
+#: 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/config_dialog.cc:1430
+#: src/wx/config_dialog.cc:1447
 msgid "Allow any DCP frame rate"
 msgstr "允许任何DCP帧速率"
 
@@ -217,7 +218,7 @@ msgstr "允许任何DCP帧速率"
 msgid "Alpha   0"
 msgstr "透明度 0"
 
-#: src/wx/kdm_dialog.cc:190
+#: src/wx/kdm_dialog.cc:201
 msgid "An unknown exception occurred."
 msgstr "出现未知错误。"
 
@@ -225,7 +226,7 @@ msgstr "出现未知错误。"
 msgid "Appearance..."
 msgstr "显示..."
 
-#: src/wx/job_view.cc:130
+#: src/wx/job_view.cc:134
 msgid "Are you sure you want to cancel this job?"
 msgstr "确定要取消当前任务吗？"
 
@@ -268,15 +269,15 @@ msgstr "音频将从 %d 传递到 DCP 通道 %d ，增益 %.1fdB."
 msgid "Automatically analyse content audio"
 msgstr "自动解析源内容中的音频"
 
-#: src/wx/colour_conversion_editor.cc:71
+#: src/wx/colour_conversion_editor.cc:82
 msgid "B"
 msgstr "B"
 
-#: src/wx/config_dialog.cc:1282
+#: src/wx/config_dialog.cc:1299
 msgid "BCC address"
 msgstr "抄送地址"
 
-#: src/wx/colour_conversion_editor.cc:133
+#: src/wx/colour_conversion_editor.cc:144
 msgid "Blue chromaticity"
 msgstr "蓝色色度"
 
@@ -304,11 +305,11 @@ msgstr "字幕以图像输出"
 msgid "But I have to use fader"
 msgstr "使用推子"
 
-#: src/wx/config_dialog.cc:1272
+#: src/wx/config_dialog.cc:1289
 msgid "CC addresses"
 msgstr "抄送地址 "
 
-#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:84
+#: src/wx/kdm_cpl_panel.cc:35 src/wx/kdm_dialog.cc:85
 #: src/wx/self_dkdm_dialog.cc:59
 msgid "CPL"
 msgstr "CPL"
@@ -321,7 +322,7 @@ msgstr "CPL ID"
 msgid "CPL annotation text"
 msgstr "CPL注释文本"
 
-#: src/wx/kdm_dialog.cc:186
+#: src/wx/kdm_dialog.cc:197
 msgid "CPL's content is not encrypted."
 msgstr "该内容没有加密"
 
@@ -329,11 +330,11 @@ msgstr "该内容没有加密"
 msgid "Calculate..."
 msgstr "计算..."
 
-#: src/wx/job_view.cc:57
+#: 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"
 
@@ -361,11 +362,11 @@ msgstr "启动时检查软件更新"
 msgid "Check for updates on startup"
 msgstr "启动时检查软件更新"
 
-#: src/wx/content_menu.cc:78
+#: src/wx/content_menu.cc:80
 msgid "Choose CPL..."
 msgstr "选择CPL"
 
-#: src/wx/content_menu.cc:297
+#: src/wx/content_menu.cc:294
 msgid "Choose a file"
 msgstr "选择一个文件"
 
@@ -373,7 +374,7 @@ msgstr "选择一个文件"
 msgid "Choose a file or files"
 msgstr "选择一个或多个文件"
 
-#: src/wx/content_menu.cc:292 src/wx/content_panel.cc:304
+#: src/wx/content_menu.cc:289 src/wx/content_panel.cc:304
 msgid "Choose a folder"
 msgstr "选择一个文件夹"
 
@@ -411,7 +412,7 @@ msgid "Component"
 msgstr "结构"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
-#: src/wx/config_dialog.cc:1478
+#: src/wx/config_dialog.cc:1495
 msgid "Config|Timing"
 msgstr "时间设置"
 
@@ -457,18 +458,18 @@ msgstr "无法分析音频。"
 msgid "Could not get video for view (%s)"
 msgstr "无法获取视频 (%s)"
 
-#: src/wx/content_menu.cc:375
+#: src/wx/content_menu.cc:374
 #, 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/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:947
+#: src/wx/config_dialog.cc:964
 #, c-format
 msgid "Could not read key file; file is too long (%s)"
 msgstr "无法读取Key文件，因为文件过长 (%s)"
@@ -490,7 +491,7 @@ msgstr "裁剪"
 msgid "DCP"
 msgstr "DCP"
 
-#: src/wx/config_dialog.cc:1451
+#: src/wx/config_dialog.cc:1468
 msgid "DCP asset filename format"
 msgstr "DCP内容的文件名格式"
 
@@ -498,7 +499,7 @@ msgstr "DCP内容的文件名格式"
 msgid "DCP directory"
 msgstr "DCP目录"
 
-#: src/wx/config_dialog.cc:1439
+#: src/wx/config_dialog.cc:1456
 msgid "DCP metadata filename format"
 msgstr "DCP元数据的文件名格式"
 
@@ -511,19 +512,19 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic audio"
 msgstr "DCP-o-matic音频"
 
-#: src/wx/config_dialog.cc:1480
+#: src/wx/config_dialog.cc:1497
 msgid "Debug: decode"
 msgstr "解码"
 
-#: src/wx/config_dialog.cc:1484
+#: src/wx/config_dialog.cc:1501
 msgid "Debug: email sending"
 msgstr "发送到邮箱"
 
-#: src/wx/config_dialog.cc:1482
+#: src/wx/config_dialog.cc:1499
 msgid "Debug: encode"
 msgstr "编码"
 
-#: src/wx/config_dialog.cc:1037
+#: src/wx/config_dialog.cc:1054
 msgid "Decrypting DCPs"
 msgstr "解密DCP"
 
@@ -539,6 +540,11 @@ msgstr "默认ISDCF名称的详细信息"
 msgid "Default JPEG2000 bandwidth"
 msgstr "默认JPEG2000码率"
 
+#: src/wx/config_dialog.cc:463
+#, fuzzy
+msgid "Default KDM directory"
+msgstr "新工程默认目录"
+
 #: src/wx/config_dialog.cc:451
 msgid "Default audio delay"
 msgstr "默认音频延迟"
@@ -571,7 +577,7 @@ msgstr "默认"
 msgid "Delay"
 msgstr "延迟"
 
-#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:61
+#: src/wx/dcp_panel.cc:87 src/wx/job_view.cc:62
 msgid "Details..."
 msgstr "详细..."
 
@@ -623,7 +629,7 @@ msgstr "编辑放映厅服务器（证书）"
 msgid "Edit cinema"
 msgstr "编辑影院"
 
-#: src/wx/screens_panel.cc:232
+#: src/wx/screens_panel.cc:246
 msgid "Edit screen"
 msgstr "编辑放映厅服务器（证书）"
 
@@ -666,31 +672,31 @@ msgstr "结束"
 msgid "Enter your email address for the contact, not %s"
 msgstr "请输入您的电子邮件地址，不是 %s"
 
-#: src/wx/config_dialog.cc:1475
+#: src/wx/config_dialog.cc:1492
 msgid "Errors"
 msgstr "错误"
 
-#: src/wx/config_dialog.cc:714
+#: src/wx/config_dialog.cc:731
 msgid "Export"
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1044
+#: src/wx/config_dialog.cc:1061
 msgid ""
 "Export DCP decryption\n"
 "certificate..."
 msgstr "导出DCP证书"
 
-#: src/wx/config_dialog.cc:1046
+#: src/wx/config_dialog.cc:1063
 msgid ""
 "Export DCP decryption\n"
 "chain..."
 msgstr "导出DCP密匙"
 
-#: src/wx/config_dialog.cc:731
+#: src/wx/config_dialog.cc:748
 msgid "Export..."
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:1152
+#: src/wx/config_dialog.cc:1169
 msgid "FTP (for Dolby)"
 msgstr "FTP (Dolby)"
 
@@ -714,7 +720,12 @@ msgstr "淡出"
 msgid "Fade out time"
 msgstr "淡出时间"
 
-#: src/wx/kdm_output_panel.cc:50
+#: src/wx/kdm_dialog.cc:132
+#, fuzzy, c-format
+msgid "File %s already exists.  Do you want to overwrite it?"
+msgstr "已存在同名模板，是否覆盖？"
+
+#: src/wx/kdm_output_panel.cc:51
 msgid "Filename format"
 msgstr "文件名格式"
 
@@ -731,7 +742,7 @@ msgid ""
 "Find integrated loudness, true peak and loudness range when analysing audio"
 msgstr "分析音频时，发现综合响度，真实峰值和响度范围！"
 
-#: src/wx/content_menu.cc:71
+#: src/wx/content_menu.cc:73
 msgid "Find missing..."
 msgstr "查询失败..."
 
@@ -762,7 +773,7 @@ msgstr ""
 msgid "From"
 msgstr "起始"
 
-#: src/wx/config_dialog.cc:1266
+#: src/wx/config_dialog.cc:1283
 msgid "From address"
 msgstr "发件人地址"
 
@@ -795,7 +806,7 @@ msgstr "增益计算"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "从内容通道  %d 到DCP %d 通道进行增益调整"
 
-#: src/wx/config_dialog.cc:1471 src/wx/content_properties_dialog.cc:70
+#: src/wx/config_dialog.cc:1488 src/wx/content_properties_dialog.cc:70
 msgid "General"
 msgstr "普通"
 
@@ -820,10 +831,14 @@ msgstr "跳转到帧"
 msgid "Go to timecode"
 msgstr "跳转到时间码"
 
-#: src/wx/colour_conversion_editor.cc:126
+#: src/wx/colour_conversion_editor.cc:137
 msgid "Green chromaticity"
 msgstr "绿色色度"
 
+#: src/wx/batch_job_view.cc:44
+msgid "Higher prioirity"
+msgstr ""
+
 #: src/wx/hints_dialog.cc:37
 msgid "Hints"
 msgstr "温馨提示"
@@ -844,11 +859,11 @@ msgstr "使用推子"
 msgid "ID"
 msgstr "ID"
 
-#: src/wx/config_dialog.cc:1135
+#: src/wx/config_dialog.cc:1152
 msgid "IP address"
 msgstr "IP地址"
 
-#: src/wx/config_dialog.cc:621
+#: src/wx/config_dialog.cc:638
 msgid "IP address / host name"
 msgstr "IP地址/服务器地址"
 
@@ -860,24 +875,28 @@ msgstr "ISDCF名称"
 msgid "Image X position"
 msgstr "画面 X 轴位置"
 
-#: src/wx/colour_conversion_editor.cc:55
+#: 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/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:858
+#: src/wx/config_dialog.cc:875
 msgid "Intermediate"
 msgstr "公钥"
 
@@ -885,10 +904,15 @@ msgstr "公钥"
 msgid "Intermediate common name"
 msgstr "公钥名称"
 
-#: src/wx/config_dialog.cc:494 src/wx/dcp_panel.cc:191
+#: src/wx/config_dialog.cc:503 src/wx/dcp_panel.cc:191
 msgid "Interop"
 msgstr "Interop"
 
+#: 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 "发行"
@@ -907,11 +931,11 @@ msgid ""
 "for newly-encoded data"
 msgstr "JPEG2000码率"
 
-#: src/wx/content_menu.cc:70
+#: src/wx/content_menu.cc:72
 msgid "Join"
 msgstr "创建"
 
-#: src/wx/config_dialog.cc:1225
+#: src/wx/config_dialog.cc:1242
 msgid "KDM Email"
 msgstr "邮件发送 KDM"
 
@@ -920,7 +944,7 @@ msgid "KDM type"
 msgstr "KDM类型"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/wx/kdm_dialog.cc:77
+#: src/wx/kdm_dialog.cc:78
 msgid "KDM|Timing"
 msgstr "KDM有效期"
 
@@ -932,7 +956,7 @@ msgstr "保持视频序列和字幕序列"
 msgid "Key"
 msgstr "键值"
 
-#: src/wx/config_dialog.cc:1014
+#: src/wx/config_dialog.cc:1031
 msgid "Keys"
 msgstr "键值"
 
@@ -944,7 +968,7 @@ msgstr "语言"
 msgid "Later"
 msgstr "下移"
 
-#: src/wx/config_dialog.cc:856
+#: src/wx/config_dialog.cc:873
 msgid "Leaf"
 msgstr "私钥"
 
@@ -952,7 +976,7 @@ msgstr "私钥"
 msgid "Leaf common name"
 msgstr "私钥名称"
 
-#: src/wx/config_dialog.cc:723
+#: src/wx/config_dialog.cc:740
 msgid "Leaf private key"
 msgstr "私钥"
 
@@ -972,15 +996,11 @@ msgstr "长度"
 msgid "Line spacing"
 msgstr "行间距"
 
-#: src/wx/colour_conversion_editor.cc:51
-msgid "Linearise input gamma curve for small values"
-msgstr "对齐低位的伽马值"
-
-#: src/wx/config_dialog.cc:729
+#: src/wx/config_dialog.cc:746
 msgid "Load..."
 msgstr "加载..."
 
-#: src/wx/config_dialog.cc:1469
+#: src/wx/config_dialog.cc:1486
 msgid "Log"
 msgstr "日志"
 
@@ -989,15 +1009,19 @@ msgstr "日志"
 msgid "Loudness range %.2f LU"
 msgstr "响度范围 %.2f LU"
 
-#: src/wx/content_panel.cc:526
+#: 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:1258
+#: src/wx/config_dialog.cc:1275
 msgid "Mail password"
 msgstr "邮箱登录密码"
 
-#: src/wx/config_dialog.cc:1254
+#: src/wx/config_dialog.cc:1271
 msgid "Mail user name"
 msgstr "邮箱用户名"
 
@@ -1009,7 +1033,7 @@ msgstr "强制制作DCP"
 msgid "Make DKDM for DCP-o-matic"
 msgstr "制作 KDM(DCP-o-matic)"
 
-#: src/wx/kdm_dialog.cc:53 src/wx/kdm_dialog.cc:97
+#: src/wx/kdm_dialog.cc:54 src/wx/kdm_dialog.cc:98
 msgid "Make KDMs"
 msgstr "创建KDM"
 
@@ -1021,15 +1045,15 @@ 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:1422
+#: src/wx/config_dialog.cc:1439
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "最大JPEG2000码率"
 
-#: src/wx/config_dialog.cc:446 src/wx/config_dialog.cc:1426
+#: src/wx/config_dialog.cc:446 src/wx/config_dialog.cc:1443
 #: src/wx/dcp_panel.cc:684
 msgid "Mbit/s"
 msgstr "Mbit/s"
@@ -1066,11 +1090,11 @@ msgstr "我的文档"
 msgid "My problem is"
 msgstr "错误内容"
 
-#: src/wx/content_panel.cc:530
+#: src/wx/content_panel.cc:532
 msgid "NEEDS KDM: "
 msgstr "需要KDM:"
 
-#: src/wx/content_panel.cc:534
+#: src/wx/content_panel.cc:536
 msgid "NEEDS OV: "
 msgstr "需要OV:"
 
@@ -1090,7 +1114,7 @@ msgstr "新名称"
 msgid "New versions of DCP-o-matic are available."
 msgstr "DCP-o-Matic有新版！"
 
-#: src/wx/content_sub_panel.cc:47
+#: src/wx/content_sub_panel.cc:62
 msgid "No DCP selected."
 msgstr "没有选择DCP"
 
@@ -1126,11 +1150,11 @@ msgstr "记录"
 msgid "Off"
 msgstr "关闭"
 
-#: src/wx/config_dialog.cc:1434
+#: src/wx/config_dialog.cc:1451
 msgid "Only servers encode"
 msgstr "仅在编码服务器编码"
 
-#: src/wx/config_dialog.cc:1490
+#: src/wx/config_dialog.cc:1507
 msgid "Open console window"
 msgstr "打开控制台窗口"
 
@@ -1150,7 +1174,7 @@ msgstr "组织"
 msgid "Other trusted devices"
 msgstr "其它可信设备(服务器设备)"
 
-#: src/wx/config_dialog.cc:1242
+#: src/wx/config_dialog.cc:1259
 msgid "Outgoing mail server"
 msgstr "发送邮件服务器地址"
 
@@ -1170,11 +1194,16 @@ msgstr "轮廓线宽度"
 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
+#: src/wx/kdm_dialog.cc:92 src/wx/self_dkdm_dialog.cc:66
 msgid "Output"
 msgstr "输出"
 
-#: src/wx/config_dialog.cc:1147
+#: src/wx/colour_conversion_editor.cc:203
+#, fuzzy
+msgid "Output gamma correction"
+msgstr "伽玛校正"
+
+#: src/wx/config_dialog.cc:1164
 msgid "Password"
 msgstr "密码"
 
@@ -1225,15 +1254,15 @@ msgstr "预发布(点映版)"
 msgid "Processor"
 msgstr "处理类型"
 
-#: src/wx/content_menu.cc:72
+#: src/wx/content_menu.cc:74
 msgid "Properties..."
 msgstr "属性..."
 
-#: src/wx/config_dialog.cc:1131
+#: 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(色彩空间)"
 
@@ -1249,21 +1278,21 @@ msgstr "随机"
 msgid "Rating (e.g. 15)"
 msgstr "评级 (例如:15)"
 
-#: src/wx/content_menu.cc:73
+#: src/wx/content_menu.cc:75
 msgid "Re-examine..."
 msgstr "重新制作..."
 
-#: src/wx/config_dialog.cc:736
+#: 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"
 
@@ -1275,7 +1304,7 @@ msgstr "接受证书(设备)"
 msgid "Red band"
 msgstr "限制"
 
-#: src/wx/colour_conversion_editor.cc:119
+#: src/wx/colour_conversion_editor.cc:130
 msgid "Red chromaticity"
 msgstr "红色色度"
 
@@ -1302,7 +1331,7 @@ msgstr "分卷|自定义"
 msgid "Refer to existing DCP"
 msgstr "参考现有的DCP"
 
-#: src/wx/config_dialog.cc:712 src/wx/content_menu.cc:80
+#: 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"
@@ -1336,7 +1365,7 @@ msgstr "重复"
 msgid "Repeat Content"
 msgstr "重复内容"
 
-#: src/wx/content_menu.cc:69
+#: src/wx/content_menu.cc:71
 msgid "Repeat..."
 msgstr "重复..."
 
@@ -1344,7 +1373,7 @@ msgstr "重复..."
 msgid "Report A Problem"
 msgstr "报告问题"
 
-#: src/wx/config_dialog.cc:1289
+#: src/wx/config_dialog.cc:1306
 msgid "Reset to default subject and text"
 msgstr "恢复到默认"
 
@@ -1352,6 +1381,10 @@ msgstr "恢复到默认"
 msgid "Resolution"
 msgstr "解析度"
 
+#: src/wx/image_subtitle_colour_dialog.cc:70
+msgid "Restore to original colours"
+msgstr ""
+
 #: src/wx/normal_job_view.cc:56
 msgid "Resume"
 msgstr "恢复"
@@ -1368,7 +1401,7 @@ msgstr "右键单击要更改增益。"
 msgid "Right eye"
 msgstr "右眼"
 
-#: src/wx/config_dialog.cc:854
+#: src/wx/config_dialog.cc:871
 msgid "Root"
 msgstr "根"
 
@@ -1376,11 +1409,15 @@ msgstr "根"
 msgid "Root common name"
 msgstr "根名称"
 
-#: src/wx/config_dialog.cc:1151
+#: src/wx/colour_conversion_editor.cc:62
+msgid "S-Gamut3"
+msgstr ""
+
+#: src/wx/config_dialog.cc:1168
 msgid "SCP (for AAM and Doremi)"
 msgstr "SCP (用于AAM和Doremi)"
 
-#: src/wx/config_dialog.cc:493 src/wx/dcp_panel.cc:190
+#: src/wx/config_dialog.cc:502 src/wx/dcp_panel.cc:190
 msgid "SMPTE"
 msgstr "SMPTE"
 
@@ -1401,11 +1438,11 @@ msgstr "保存到创建KDM的工具列表"
 msgid "Scale to"
 msgstr "缩放"
 
-#: src/wx/kdm_dialog.cc:69
+#: src/wx/kdm_dialog.cc:70
 msgid "Screens"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:617
+#: src/wx/config_dialog.cc:634
 msgid "Search network for servers"
 msgstr "搜索网络服务器（局域网）"
 
@@ -1413,24 +1450,24 @@ msgstr "搜索网络服务器（局域网）"
 msgid "Select CPL XML file"
 msgstr "选择CPL文件"
 
-#: src/wx/config_dialog.cc:771 src/wx/config_dialog.cc:819
-#: src/wx/config_dialog.cc:1056 src/wx/screen_dialog.cc:165
+#: 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/config_dialog.cc:1076
+#: src/wx/config_dialog.cc:1093
 msgid "Select Chain File"
 msgstr "选择私钥文件"
 
-#: src/wx/content_menu.cc:369
+#: src/wx/content_menu.cc:368
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/wx/config_dialog.cc:939 src/wx/config_dialog.cc:973
+#: src/wx/config_dialog.cc:956 src/wx/config_dialog.cc:990
 msgid "Select Key File"
 msgstr "选择密钥文件"
 
-#: src/wx/content_menu.cc:395
+#: src/wx/content_menu.cc:394
 msgid "Select OV"
 msgstr "选择OV"
 
@@ -1442,7 +1479,7 @@ msgstr "选择证书文件"
 msgid "Select cinema and screen database file"
 msgstr "选择电影和银幕的数据库文件"
 
-#: src/wx/kdm_output_panel.cc:87
+#: src/wx/kdm_output_panel.cc:93
 msgid "Send by email"
 msgstr "通过电子邮件发送"
 
@@ -1462,7 +1499,7 @@ msgstr "序列号"
 msgid "Server"
 msgstr "服务器"
 
-#: src/wx/config_dialog.cc:604
+#: src/wx/config_dialog.cc:621
 msgid "Servers"
 msgstr "服务器"
 
@@ -1498,10 +1535,20 @@ msgstr "显示音频电平图"
 msgid "Signed"
 msgstr "签名"
 
-#: src/wx/config_dialog.cc:1029
+#: src/wx/config_dialog.cc:1046
 msgid "Signing DCPs and KDMs"
 msgstr "签名DCP和KDM"
 
+#: 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 "签名卷"
@@ -1542,7 +1589,7 @@ msgstr "流"
 msgid "Studio (e.g. TCF)"
 msgstr "工作室(例如:ROV)"
 
-#: src/wx/config_dialog.cc:1262
+#: src/wx/config_dialog.cc:1279
 msgid "Subject"
 msgstr "类目"
 
@@ -1558,7 +1605,7 @@ msgstr "字幕语言(例如:QMS)"
 msgid "Subtitle appearance"
 msgstr "字幕外观"
 
-#: src/wx/image_subtitle_colour_dialog.cc:31
+#: src/wx/image_subtitle_colour_dialog.cc:33
 msgid "Subtitle colours"
 msgstr "字幕颜色"
 
@@ -1567,15 +1614,15 @@ msgstr "字幕颜色"
 msgid "Subtitles"
 msgstr "字幕"
 
-#: src/wx/about_dialog.cc:279
+#: src/wx/about_dialog.cc:288
 msgid "Supported by"
 msgstr "技术支持"
 
-#: src/wx/config_dialog.cc:1114
+#: src/wx/config_dialog.cc:1131
 msgid "TMS"
 msgstr "TMS"
 
-#: src/wx/config_dialog.cc:1139
+#: src/wx/config_dialog.cc:1156
 msgid "Target path"
 msgstr "目标路径"
 
@@ -1607,15 +1654,15 @@ msgstr "国别地区(例如:CN)"
 msgid "Test version "
 msgstr "测试版"
 
-#: src/wx/about_dialog.cc:335
+#: 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 "结束时间必须大于开始时间！"
 
-#: src/wx/content_menu.cc:355
+#: 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 "
@@ -1635,7 +1682,7 @@ msgstr "已存在同名模板，是否覆盖？"
 msgid "There is not enough free memory to do that."
 msgstr "内存不足！"
 
-#: src/wx/config_dialog.cc:780
+#: 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."
@@ -1653,7 +1700,7 @@ msgstr "线程"
 msgid "Threads to use for encoding on this host"
 msgstr "线程数"
 
-#: src/wx/config_dialog.cc:696 src/wx/screen_dialog.cc:102
+#: src/wx/config_dialog.cc:713 src/wx/screen_dialog.cc:102
 msgid "Thumbprint"
 msgstr "指纹"
 
@@ -1703,7 +1750,7 @@ msgstr "裁剪至当前位置"
 msgid "True peak is %.2fdB"
 msgstr "最佳值 %.2fdB"
 
-#: src/wx/audio_dialog.cc:106 src/wx/config_dialog.cc:688
+#: src/wx/audio_dialog.cc:106 src/wx/config_dialog.cc:705
 #: src/wx/video_panel.cc:86
 msgid "Type"
 msgstr "类型"
@@ -1844,7 +1891,7 @@ msgstr "使用预设"
 msgid "Use subtitles"
 msgstr "使用字幕"
 
-#: src/wx/config_dialog.cc:1143
+#: src/wx/config_dialog.cc:1160
 msgid "User name"
 msgstr "用户名"
 
@@ -1866,23 +1913,23 @@ msgstr "视频帧率"
 msgid "View..."
 msgstr "视图窗口"
 
-#: src/wx/config_dialog.cc:1473
+#: 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:134
+#: src/wx/about_dialog.cc:135
 msgid "With help from"
 msgstr "帮助"
 
-#: src/wx/kdm_output_panel.cc:74 src/wx/self_dkdm_dialog.cc:75
+#: src/wx/kdm_output_panel.cc:75 src/wx/self_dkdm_dialog.cc:75
 msgid "Write to"
 msgstr "输出目录："
 
@@ -1906,14 +1953,28 @@ msgstr "Y 偏移"
 msgid "Y Scale"
 msgstr "Y 缩放"
 
-#: src/wx/colour_conversion_editor.cc:95
+#: src/wx/colour_conversion_editor.cc:106
 msgid "YUV to RGB conversion"
 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/screens_panel.cc:217
+#, c-format
+msgid ""
+"You cannot add a screen called '%s' as the cinema already has a screen with "
+"this name."
+msgstr ""
+
+#: src/wx/screens_panel.cc:258
+#, c-format
+msgid ""
+"You cannot change this screen's name to '%s' as the cinema already has a "
+"screen with this name."
+msgstr ""
+
 #: src/wx/report_problem_dialog.cc:66
 msgid "Your email address"
 msgstr "您的邮箱地址"
@@ -1951,7 +2012,7 @@ msgstr "分"
 msgid "ms"
 msgstr "毫秒"
 
-#: src/wx/config_dialog.cc:1247
+#: src/wx/config_dialog.cc:1264
 msgid "port"
 msgstr "端口"
 
@@ -1960,7 +2021,7 @@ msgstr "端口"
 msgid "s"
 msgstr "秒"
 
-#: src/wx/colour_conversion_editor.cc:65
+#: src/wx/colour_conversion_editor.cc:76
 msgid "threshold"
 msgstr "最低"
 
@@ -1968,15 +2029,15 @@ 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"