pot/merge.v2.13.155

1 files changed, 200 insertions, 128 deletions

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 8c4d7861c..469dc3151 100644
--- 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: 2019-03-24 00:53+0000\n"
+"POT-Creation-Date: 2019-04-28 21:18+0100\n"
 "PO-Revision-Date: 2019-04-21 23:17+0800\n"
 "Last-Translator: Hanyuan\n"
 "Language-Team: Hanyuan\n"
@@ -62,6 +62,11 @@ msgstr "%d KDM 保存到 %s"
 msgid "%d KDMs written to %s"
 msgstr "%d KDMs 保存到 %s"
 
+#: src/wx/config_dialog.cc:289
+#, fuzzy, c-format
+msgid "%d channels on %s"
+msgstr "音频通道: %d"
+
 #: src/wx/about_dialog.cc:84
 msgid ""
 "(C) 2012-2019 Carl Hetherington, Terrence Meiczinger\n"
@@ -74,15 +79,21 @@ msgstr ""
 msgid "(None)"
 msgstr "(无)"
 
-#: src/wx/full_config_dialog.cc:1373
+#: src/wx/full_config_dialog.cc:1415
 msgid "(restart DCP-o-matic to see all ratios)"
 msgstr "(重启DCP-o-matic查看变化)"
 
-#: src/wx/config_dialog.cc:143
+#: src/wx/config_dialog.cc:145
 msgid "(restart DCP-o-matic to see language changes)"
 msgstr "(重启DCP-O-MATIC查看语言变化)"
 
-#: src/wx/audio_mapping_view.cc:171
+#: src/wx/isdcf_metadata_dialog.cc:47
+msgid ""
+"(use this to override languages specified\n"
+"in the 'timed text' tab)"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:71
 msgid "-6dB"
 msgstr "-6db"
 
@@ -90,11 +101,11 @@ msgstr "-6db"
 msgid "0 is best, 51 is worst"
 msgstr "0 为最好，51 为最差"
 
-#: src/wx/wx_util.cc:444
+#: src/wx/wx_util.cc:447
 msgid "12 - 7.1/HI/VI"
 msgstr "12声道—7.1+听力障碍声道/视力障碍声道"
 
-#: src/wx/wx_util.cc:436
+#: src/wx/wx_util.cc:439
 msgid "2 - stereo"
 msgstr "2声道—立体声"
 
@@ -106,7 +117,7 @@ msgstr "255"
 msgid "2D"
 msgstr "2D"
 
-#: src/wx/isdcf_metadata_dialog.cc:71
+#: src/wx/isdcf_metadata_dialog.cc:78
 msgid "2D version of content available in 3D"
 msgstr "伪3D"
 
@@ -138,7 +149,7 @@ msgstr "仅右眼(3D)"
 msgid "3D top/bottom"
 msgstr "上下眼(3D)"
 
-#: src/wx/wx_util.cc:438
+#: src/wx/wx_util.cc:441
 msgid "4 - L/C/R/Lfe"
 msgstr "4声道—左/中/右/低音"
 
@@ -146,11 +157,11 @@ msgstr "4声道—左/中/右/低音"
 msgid "4K"
 msgstr "4K"
 
-#: src/wx/wx_util.cc:440
+#: src/wx/wx_util.cc:443
 msgid "6 - 5.1"
 msgstr "6声道—5.1声道"
 
-#: src/wx/wx_util.cc:442
+#: src/wx/wx_util.cc:445
 msgid "8 - 5.1/HI/VI"
 msgstr "8声道—5.1+听力障碍声道/视力障碍声道"
 
@@ -209,11 +220,19 @@ msgstr "A"
 msgid "A new version of DCP-o-matic is available."
 msgstr "发现新版本的DCP-o-matic可用."
 
+#: src/wx/config_dialog.cc:273
+msgid "ALSA"
+msgstr ""
+
+#: src/wx/config_dialog.cc:269
+msgid "ASIO"
+msgstr ""
+
 #: src/wx/about_dialog.cc:36
 msgid "About DCP-o-matic"
 msgstr "关于 DCP-o-matic"
 
-#: src/wx/full_config_dialog.cc:952
+#: src/wx/full_config_dialog.cc:994
 msgid "Accounts"
 msgstr "账户"
 
@@ -275,7 +294,7 @@ msgstr "添加文件夹..."
 msgid "Add image sequence"
 msgstr "添加图像序列"
 
-#: src/wx/text_panel.cc:262
+#: src/wx/text_panel.cc:267
 msgid "Add new..."
 msgstr "添加新的..."
 
@@ -283,11 +302,11 @@ msgstr "添加新的..."
 msgid "Add video, image, sound or subtitle files to the film."
 msgstr "添加视频、图片、音频或字幕文件。"
 
-#: src/wx/config_dialog.cc:383 src/wx/editable_list.h:76
+#: src/wx/config_dialog.cc:421 src/wx/editable_list.h:76
 msgid "Add..."
 msgstr "添加..."
 
-#: src/wx/config_dialog.cc:481
+#: src/wx/config_dialog.cc:519
 msgid ""
 "Adding this certificate would make the chain inconsistent, so it will not be "
 "added. Add certificates in order from root to intermediate to leaf."
@@ -295,8 +314,8 @@ msgstr ""
 "添加此证书将使链不一致，因此不会添加。 请按照root到intermediate到leaf顺序添加"
 "证书。"
 
-#: src/wx/cinema_dialog.cc:71 src/wx/full_config_dialog.cc:863
-#: src/wx/full_config_dialog.cc:1134
+#: src/wx/cinema_dialog.cc:71 src/wx/full_config_dialog.cc:905
+#: src/wx/full_config_dialog.cc:1176
 msgid "Address"
 msgstr "地址"
 
@@ -308,16 +327,16 @@ msgstr "调整白点"
 msgid "Advanced KDM options"
 msgstr "高级KDM选项"
 
-#: src/wx/config_dialog.cc:770 src/wx/config_dialog.cc:784
+#: src/wx/config_dialog.cc:813 src/wx/config_dialog.cc:827
 #: src/wx/kdm_output_panel.cc:70
 msgid "Advanced..."
 msgstr "高级…"
 
-#: src/wx/full_config_dialog.cc:1365
+#: src/wx/full_config_dialog.cc:1407
 msgid "Allow any DCP frame rate"
 msgstr "允许任何DCP帧速率"
 
-#: src/wx/full_config_dialog.cc:1369
+#: src/wx/full_config_dialog.cc:1411
 msgid "Allow non-standard container ratios"
 msgstr ""
 
@@ -325,7 +344,7 @@ msgstr ""
 msgid "Alpha   0"
 msgstr "透明度 0"
 
-#: src/wx/about_dialog.cc:149
+#: src/wx/about_dialog.cc:150
 #, fuzzy
 msgid "Also supported by"
 msgstr "技术支持"
@@ -369,19 +388,23 @@ msgstr "音频语言 (例如 CMN)"
 msgid "Audio channels: %d"
 msgstr "音频通道: %d"
 
-#: src/wx/audio_mapping_view.cc:348
+#: src/wx/audio_mapping_view.cc:518
 #, 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:351
+#: src/wx/audio_mapping_view.cc:521
 #, 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/full_config_dialog.cc:772
+msgid "Auto"
+msgstr ""
+
 #: src/wx/full_config_dialog.cc:126
 msgid "Automatically analyse content audio"
 msgstr "自动解析源内容中的音频"
@@ -390,7 +413,7 @@ msgstr "自动解析源内容中的音频"
 msgid "B"
 msgstr "B"
 
-#: src/wx/full_config_dialog.cc:874 src/wx/full_config_dialog.cc:1145
+#: src/wx/full_config_dialog.cc:916 src/wx/full_config_dialog.cc:1187
 msgid "BCC address"
 msgstr "抄送地址"
 
@@ -422,7 +445,7 @@ msgstr "字幕以图像输出"
 msgid "But I have to use fader"
 msgstr "使用推子"
 
-#: src/wx/full_config_dialog.cc:864 src/wx/full_config_dialog.cc:1135
+#: src/wx/full_config_dialog.cc:906 src/wx/full_config_dialog.cc:1177
 msgid "CC addresses"
 msgstr "抄送地址"
 
@@ -485,7 +508,7 @@ msgstr "证书秘钥"
 msgid "Certificate downloaded"
 msgstr "证书下载"
 
-#: src/wx/isdcf_metadata_dialog.cc:68
+#: src/wx/isdcf_metadata_dialog.cc:75
 msgid "Chain"
 msgstr "链接"
 
@@ -497,11 +520,11 @@ msgstr "信道增益"
 msgid "Channels"
 msgstr "通道"
 
-#: src/wx/config_dialog.cc:183
+#: src/wx/config_dialog.cc:194
 msgid "Check for testing updates on startup"
 msgstr "启动时检查软件更新"
 
-#: src/wx/config_dialog.cc:179
+#: src/wx/config_dialog.cc:190
 msgid "Check for updates on startup"
 msgstr "启动时检查软件更新"
 
@@ -545,7 +568,7 @@ msgstr "放映厅和银幕数据库文件"
 msgid "Click the button to set all selected content to the same value."
 msgstr "单击该按钮可将所有选定的内容为相同的值。"
 
-#: src/wx/closed_captions_dialog.cc:37
+#: src/wx/closed_captions_dialog.cc:40
 msgid "Closed captions"
 msgstr "隐藏式字幕"
 
@@ -571,7 +594,7 @@ msgid "Configuration file"
 msgstr "配置文件"
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
-#: src/wx/full_config_dialog.cc:1432
+#: src/wx/full_config_dialog.cc:1474
 msgid "Config|Timing"
 msgstr "时间设置"
 
@@ -583,7 +606,7 @@ msgstr "确认接收KDM的电子邮件地址"
 msgid "Container"
 msgstr "封装格式"
 
-#: src/wx/audio_mapping_view.cc:454 src/wx/audio_mapping_view.cc:456
+#: src/wx/audio_mapping_view.cc:165 src/wx/audio_mapping_view.cc:167
 #: src/wx/film_editor.cc:54
 msgid "Content"
 msgstr "内容"
@@ -616,11 +639,16 @@ msgstr "坐标轴|Y"
 msgid "Copy as name"
 msgstr "复制名称"
 
+#: src/wx/config_dialog.cc:268
+#, fuzzy
+msgid "CoreAudio"
+msgstr "音频"
+
 #: src/wx/audio_dialog.cc:278
 msgid "Could not analyse audio."
 msgstr "无法分析音频。"
 
-#: src/wx/config_dialog.cc:464
+#: src/wx/config_dialog.cc:502
 #, c-format
 msgid "Could not import certificate (%s)"
 msgstr "无法导入证书文件 (%s)"
@@ -639,13 +667,13 @@ msgstr "无法导入证书文件 (%s)"
 msgid "Could not load image file."
 msgstr "无法读取证书文件."
 
-#: src/wx/config_dialog.cc:490 src/wx/config_dialog.cc:708
+#: src/wx/config_dialog.cc:528 src/wx/config_dialog.cc:751
 #: src/wx/download_certificate_panel.cc:60 src/wx/screen_dialog.cc:201
 #: src/wx/screen_dialog.cc:206
 msgid "Could not read certificate file."
 msgstr "无法读取证书文件."
 
-#: src/wx/config_dialog.cc:698
+#: src/wx/config_dialog.cc:741
 #, c-format
 msgid "Could not read key file; file is too long (%s)"
 msgstr "无法读取Key文件，因为文件过长 (%s)"
@@ -655,7 +683,7 @@ msgid ""
 "Could not set up audio output.  There will be no audio during the preview."
 msgstr "不能设置音频输出 (%s)。因此预览时将没有音频输出."
 
-#: src/wx/full_config_dialog.cc:1267
+#: src/wx/full_config_dialog.cc:1309
 msgid "Cover Sheet"
 msgstr "封面"
 
@@ -676,7 +704,7 @@ msgstr ""
 msgid "Cursor: none"
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:492 src/wx/audio_mapping_view.cc:494
+#: src/wx/audio_mapping_view.cc:160 src/wx/audio_mapping_view.cc:161
 #: src/wx/film_editor.cc:56 src/wx/player_information.cc:55
 msgid "DCP"
 msgstr "DCP"
@@ -685,7 +713,7 @@ msgstr "DCP"
 msgid "DCP Text Track"
 msgstr "DCP文字轨道"
 
-#: src/wx/full_config_dialog.cc:1405
+#: src/wx/full_config_dialog.cc:1447
 msgid "DCP asset filename format"
 msgstr "DCP内容的文件名格式"
 
@@ -693,7 +721,7 @@ msgstr "DCP内容的文件名格式"
 msgid "DCP directory"
 msgstr "DCP目录"
 
-#: src/wx/full_config_dialog.cc:1393
+#: src/wx/full_config_dialog.cc:1435
 msgid "DCP metadata filename format"
 msgstr "DCP元数据的文件名格式"
 
@@ -727,15 +755,15 @@ msgstr "DCP-o-matic 设置"
 msgid "Debug log file"
 msgstr "Debug文件"
 
-#: src/wx/full_config_dialog.cc:1434
+#: src/wx/full_config_dialog.cc:1476
 msgid "Debug: decode"
 msgstr "解码"
 
-#: src/wx/full_config_dialog.cc:1438
+#: src/wx/full_config_dialog.cc:1480
 msgid "Debug: email sending"
 msgstr "发送到邮箱"
 
-#: src/wx/full_config_dialog.cc:1436
+#: src/wx/full_config_dialog.cc:1478
 msgid "Debug: encode"
 msgstr "编码"
 
@@ -744,7 +772,7 @@ msgstr "编码"
 msgid "Decode resolution: %dx%d"
 msgstr "解码分辨率: %dx%d"
 
-#: src/wx/config_dialog.cc:759 src/wx/config_dialog.cc:793
+#: src/wx/config_dialog.cc:802 src/wx/config_dialog.cc:836
 msgid "Decrypting KDMs"
 msgstr "解密KDMs中"
 
@@ -816,6 +844,10 @@ msgstr "设备"
 msgid "Devices"
 msgstr "设备"
 
+#: src/wx/config_dialog.cc:270
+msgid "Direct Sound"
+msgstr ""
+
 #: src/wx/recreate_chain_dialog.cc:33
 msgid "Do nothing"
 msgstr "不做更改"
@@ -836,7 +868,7 @@ msgstr "不发送电子邮件"
 msgid "Don't show hints again"
 msgstr "不再显示小提示"
 
-#: src/wx/nag_dialog.cc:38
+#: src/wx/nag_dialog.cc:37
 msgid "Don't show this message again"
 msgstr "不再显示小提示"
 
@@ -865,6 +897,10 @@ msgstr "丢帧: %d"
 msgid "Dual-screen displays"
 msgstr "双屏幕显示"
 
+#: src/wx/config_dialog.cc:276
+msgid "Dummy"
+msgstr ""
+
 #: src/wx/player_config_dialog.cc:385
 msgid "Duration"
 msgstr "时长"
@@ -889,7 +925,7 @@ msgstr "编辑影院"
 msgid "Edit screen"
 msgstr "编辑放映厅服务器（证书）"
 
-#: src/wx/audio_mapping_view.cc:172 src/wx/dcp_panel.cc:103
+#: src/wx/audio_mapping_view.cc:72 src/wx/dcp_panel.cc:103
 #: src/wx/fonts_dialog.cc:63 src/wx/full_config_dialog.cc:337
 #: src/wx/video_panel.cc:164 src/wx/video_panel.cc:175
 #: src/wx/editable_list.h:79
@@ -904,7 +940,7 @@ msgstr "效果"
 msgid "Effect colour"
 msgstr "效果颜色"
 
-#: src/wx/full_config_dialog.cc:743 src/wx/full_config_dialog.cc:1117
+#: src/wx/full_config_dialog.cc:743 src/wx/full_config_dialog.cc:1159
 msgid "Email"
 msgstr "邮件"
 
@@ -933,23 +969,23 @@ msgstr "结束"
 msgid "Enter your email address for the contact, not %s"
 msgstr "请输入您的电子邮件地址，不是 %s"
 
-#: src/wx/full_config_dialog.cc:1429
+#: src/wx/full_config_dialog.cc:1471
 msgid "Errors"
 msgstr "错误"
 
-#: src/wx/config_dialog.cc:387
+#: src/wx/config_dialog.cc:425
 msgid "Export"
 msgstr "导出"
 
-#: src/wx/config_dialog.cc:764
+#: src/wx/config_dialog.cc:807
 msgid "Export KDM decryption certificate..."
 msgstr "导出KDM解密证书…"
 
-#: src/wx/config_dialog.cc:766
+#: src/wx/config_dialog.cc:809
 msgid "Export all KDM decryption settings..."
 msgstr "导出所有KDM加密设置…"
 
-#: src/wx/config_dialog.cc:411
+#: src/wx/config_dialog.cc:449
 msgid "Export chain..."
 msgstr "导出密匙…"
 
@@ -957,7 +993,7 @@ msgstr "导出密匙…"
 msgid "Export film"
 msgstr "导出工程"
 
-#: src/wx/config_dialog.cc:404 src/wx/full_config_dialog.cc:114
+#: src/wx/config_dialog.cc:442 src/wx/full_config_dialog.cc:114
 msgid "Export..."
 msgstr "导出…"
 
@@ -965,7 +1001,7 @@ msgstr "导出…"
 msgid "FTP (for Dolby)"
 msgstr "FTP (Dolby)"
 
-#: src/wx/isdcf_metadata_dialog.cc:56
+#: src/wx/isdcf_metadata_dialog.cc:63
 msgid "Facility (e.g. DLA)"
 msgstr "设备(例如:DLA)"
 
@@ -1068,7 +1104,7 @@ msgstr "免费的DCP打包软件."
 msgid "From"
 msgstr "起始"
 
-#: src/wx/full_config_dialog.cc:858 src/wx/full_config_dialog.cc:1125
+#: src/wx/full_config_dialog.cc:900 src/wx/full_config_dialog.cc:1167
 msgid "From address"
 msgstr "发件人地址"
 
@@ -1076,7 +1112,7 @@ msgstr "发件人地址"
 msgid "From template"
 msgstr "从模板"
 
-#: src/wx/audio_mapping_view.cc:170 src/wx/full_config_dialog.cc:150
+#: src/wx/audio_mapping_view.cc:70 src/wx/full_config_dialog.cc:150
 msgid "Full"
 msgstr "总"
 
@@ -1096,11 +1132,11 @@ msgstr "GB"
 msgid "GDC"
 msgstr "GDC"
 
-#: src/wx/full_config_dialog.cc:988
+#: src/wx/full_config_dialog.cc:1030
 msgid "GDC password"
 msgstr "GDC 密码"
 
-#: src/wx/full_config_dialog.cc:984
+#: src/wx/full_config_dialog.cc:1026
 msgid "GDC user name"
 msgstr "GDC 用户名"
 
@@ -1117,7 +1153,7 @@ msgstr "增益计算"
 msgid "Gain for content channel %d in DCP channel %d"
 msgstr "从内容通道  %d 到DCP %d 通道进行增益调整"
 
-#: src/wx/content_properties_dialog.cc:71 src/wx/full_config_dialog.cc:1425
+#: src/wx/content_properties_dialog.cc:71 src/wx/full_config_dialog.cc:1467
 msgid "General"
 msgstr "普通"
 
@@ -1186,7 +1222,7 @@ msgstr "IP地址/服务器地址"
 msgid "ISDCF name"
 msgstr "ISDCF名称"
 
-#: src/wx/config_dialog.cc:847
+#: src/wx/config_dialog.cc:890
 #, fuzzy
 msgid ""
 "If you continue with this operation you will no longer be able to use any "
@@ -1197,7 +1233,7 @@ msgstr ""
 "如果继续您将无法使用之前生成的所有数字母版DKDM和KDM。\n"
 "谨慎操作!"
 
-#: src/wx/config_dialog.cc:897
+#: src/wx/config_dialog.cc:940
 #, fuzzy
 msgid ""
 "If you continue with this operation you will no longer be able to use any "
@@ -1219,15 +1255,15 @@ msgstr "主屏幕显示画面，副屏幕显示控制器"
 msgid "Image on secondary, controls on primary"
 msgstr "主屏幕显示控制器，副屏幕显示画面"
 
-#: src/wx/config_dialog.cc:768
+#: src/wx/config_dialog.cc:811
 msgid "Import all KDM decryption settings..."
 msgstr "导入所有KDM解密设置…"
 
-#: src/wx/config_dialog.cc:402
+#: src/wx/config_dialog.cc:440
 msgid "Import..."
 msgstr "导入…"
 
-#: src/wx/nag_dialog.cc:31
+#: src/wx/nag_dialog.cc:30
 msgid "Important notice"
 msgstr "重要提示"
 
@@ -1260,7 +1296,7 @@ msgstr "平均响度 %.2f LUFS"
 msgid "Interface complexity"
 msgstr ""
 
-#: src/wx/config_dialog.cc:588
+#: src/wx/config_dialog.cc:631
 msgid "Intermediate"
 msgstr "公钥"
 
@@ -1272,7 +1308,7 @@ msgstr "公钥名称"
 msgid "Interop"
 msgstr "Interop"
 
-#: src/wx/config_dialog.cc:885
+#: src/wx/config_dialog.cc:928
 msgid "Invalid DCP-o-matic export file"
 msgstr "DCP-o-matic无法输出此类格式"
 
@@ -1284,6 +1320,10 @@ msgstr "输出时添加反转的2.6伽马值"
 msgid "Issuer"
 msgstr "发行"
 
+#: src/wx/config_dialog.cc:272
+msgid "JACK"
+msgstr ""
+
 #: src/wx/dcp_panel.cc:767
 msgid ""
 "JPEG2000 bandwidth\n"
@@ -1298,7 +1338,7 @@ msgstr "创建"
 msgid "Jump to selected content"
 msgstr "跳转到已选择的内容"
 
-#: src/wx/full_config_dialog.cc:837
+#: src/wx/full_config_dialog.cc:879
 msgid "KDM Email"
 msgstr "邮件发送 KDM"
 
@@ -1327,7 +1367,7 @@ msgstr "保持视频序列和字幕序列"
 msgid "Key"
 msgstr "键值"
 
-#: src/wx/config_dialog.cc:747
+#: src/wx/config_dialog.cc:790
 msgid "Keys"
 msgstr "键值"
 
@@ -1340,7 +1380,7 @@ msgstr "语言"
 msgid "Later"
 msgstr "下移"
 
-#: src/wx/config_dialog.cc:586
+#: src/wx/config_dialog.cc:629
 msgid "Leaf"
 msgstr "私钥"
 
@@ -1348,11 +1388,11 @@ msgstr "私钥"
 msgid "Leaf common name"
 msgstr "私钥名称"
 
-#: src/wx/config_dialog.cc:396
+#: src/wx/config_dialog.cc:434
 msgid "Leaf private key"
 msgstr "私钥"
 
-#: src/wx/config_dialog.cc:416
+#: src/wx/config_dialog.cc:454
 msgid "Leaf private key does not match leaf certificate!"
 msgstr "私人秘钥private key与提供的证书certificate不匹配!"
 
@@ -1389,7 +1429,7 @@ msgstr "位置"
 msgid "Lock file"
 msgstr "字体文件"
 
-#: src/wx/full_config_dialog.cc:1423
+#: src/wx/full_config_dialog.cc:1465
 msgid "Log"
 msgstr "日志"
 
@@ -1450,7 +1490,7 @@ msgstr "制造商 ID"
 msgid "Manufacturer product code"
 msgstr "制造商的产品编码"
 
-#: src/wx/isdcf_metadata_dialog.cc:78
+#: src/wx/isdcf_metadata_dialog.cc:85
 msgid "Mastered luminance (e.g. 14fl)"
 msgstr "要求亮度(例如:14FL)"
 
@@ -1458,20 +1498,20 @@ msgstr "要求亮度(例如:14FL)"
 msgid "Matrix"
 msgstr "矩阵"
 
-#: src/wx/full_config_dialog.cc:1357
+#: src/wx/full_config_dialog.cc:1399
 msgid "Maximum JPEG2000 bandwidth"
 msgstr "最大JPEG2000码率"
 
-#: src/wx/full_config_dialog.cc:1385
+#: src/wx/full_config_dialog.cc:1427
 msgid "Maximum number of frames to store per thread"
 msgstr "设置每个线程处理的最大帧数"
 
 #: src/wx/dcp_panel.cc:769 src/wx/full_config_dialog.cc:361
-#: src/wx/full_config_dialog.cc:1361
+#: src/wx/full_config_dialog.cc:1403
 msgid "Mbit/s"
 msgstr "Mbit/s"
 
-#: src/wx/full_config_dialog.cc:1113
+#: src/wx/full_config_dialog.cc:1155
 msgid "Message box"
 msgstr "信箱"
 
@@ -1566,7 +1606,7 @@ msgid ""
 "Accounts page in Preferences."
 msgstr ""
 
-#: src/wx/audio_mapping_view.cc:346
+#: src/wx/audio_mapping_view.cc:516
 #, c-format
 msgid "No audio will be passed from content channel %d to DCP channel %d."
 msgstr "视频中没有音频，从 %d 到 %d 通道的DCP."
@@ -1586,7 +1626,7 @@ msgstr "无"
 msgid "Notes"
 msgstr "记录"
 
-#: src/wx/full_config_dialog.cc:1096
+#: src/wx/full_config_dialog.cc:1138
 msgid "Notifications"
 msgstr "提醒"
 
@@ -1602,7 +1642,11 @@ msgstr "多个DCP-o-matic 编码服务器将被使用"
 msgid "Number of threads DCP-o-matic should use"
 msgstr "多个DCP-o-matic 将被使用"
 
-#: src/wx/audio_mapping_view.cc:169
+#: src/wx/config_dialog.cc:275
+msgid "OSS"
+msgstr ""
+
+#: src/wx/audio_mapping_view.cc:69
 msgid "Off"
 msgstr "关闭"
 
@@ -1610,11 +1654,11 @@ msgstr "关闭"
 msgid "Offset"
 msgstr "偏移"
 
-#: src/wx/full_config_dialog.cc:1380
+#: src/wx/full_config_dialog.cc:1422
 msgid "Only servers encode"
 msgstr "仅在编码服务器编码"
 
-#: src/wx/full_config_dialog.cc:1444
+#: src/wx/full_config_dialog.cc:1486
 msgid "Open console window"
 msgstr "打开控制台窗口"
 
@@ -1671,7 +1715,7 @@ msgstr "输出伽玛校正"
 msgid "Overwrite this file with current configuration"
 msgstr "使用正确的设置改写这个文件"
 
-#: src/wx/full_config_dialog.cc:671 src/wx/full_config_dialog.cc:776
+#: src/wx/full_config_dialog.cc:671 src/wx/full_config_dialog.cc:784
 msgid "Password"
 msgstr "密码"
 
@@ -1716,6 +1760,10 @@ msgstr "偏好设置"
 msgid "Period"
 msgstr "时段"
 
+#: src/wx/full_config_dialog.cc:773
+msgid "Plain"
+msgstr ""
+
 #: src/wx/standard_controls.cc:30
 msgid "Play"
 msgstr "播放"
@@ -1724,7 +1772,7 @@ msgstr "播放"
 msgid "Play length"
 msgstr "播放长度"
 
-#: src/wx/config_dialog.cc:158
+#: src/wx/config_dialog.cc:160
 msgid "Play sound via"
 msgstr "声音播放设备"
 
@@ -1746,7 +1794,7 @@ msgstr "请稍等，正在解析音频..."
 msgid "Position"
 msgstr "位置"
 
-#: src/wx/isdcf_metadata_dialog.cc:62
+#: src/wx/isdcf_metadata_dialog.cc:69
 msgid "Pre-release"
 msgstr "预发布(点映版)"
 
@@ -1770,6 +1818,11 @@ msgstr "属性..."
 msgid "Protocol"
 msgstr "协议"
 
+#: src/wx/config_dialog.cc:274
+#, fuzzy
+msgid "Pulseaudio"
+msgstr "音频"
+
 #: src/wx/export_dialog.cc:64
 msgid "Quality"
 msgstr "质量"
@@ -1786,7 +1839,7 @@ msgstr "RMS"
 msgid "Random"
 msgstr "随机"
 
-#: src/wx/isdcf_metadata_dialog.cc:50
+#: src/wx/isdcf_metadata_dialog.cc:57
 msgid "Rating (e.g. 15)"
 msgstr "评级 (例如:15)"
 
@@ -1798,7 +1851,7 @@ msgstr "对输入内容重新进行JPEG2000编码"
 msgid "Re-examine..."
 msgstr "重新制作..."
 
-#: src/wx/config_dialog.cc:409
+#: src/wx/config_dialog.cc:447
 msgid "Re-make certificates and key..."
 msgstr "重新创建证书和密钥..."
 
@@ -1826,7 +1879,7 @@ msgstr "接受证书(设备)"
 msgid "Recreate signing certificates"
 msgstr "重新创建登录证书"
 
-#: src/wx/isdcf_metadata_dialog.cc:65
+#: src/wx/isdcf_metadata_dialog.cc:72
 msgid "Red band"
 msgstr "限制"
 
@@ -1852,7 +1905,7 @@ msgstr "卷"
 msgid "Reel|Custom"
 msgstr "分卷|自定义"
 
-#: src/wx/config_dialog.cc:385 src/wx/content_menu.cc:83
+#: src/wx/config_dialog.cc:423 src/wx/content_menu.cc:83
 #: src/wx/content_panel.cc:128 src/wx/templates_dialog.cc:53
 #: src/wx/editable_list.h:82
 msgid "Remove"
@@ -1894,11 +1947,11 @@ msgstr "重复..."
 msgid "Report A Problem"
 msgstr "报告问题"
 
-#: src/wx/full_config_dialog.cc:881 src/wx/full_config_dialog.cc:1152
+#: src/wx/full_config_dialog.cc:923 src/wx/full_config_dialog.cc:1194
 msgid "Reset to default subject and text"
 msgstr "恢复到默认"
 
-#: src/wx/full_config_dialog.cc:1283
+#: src/wx/full_config_dialog.cc:1325
 msgid "Reset to default text"
 msgstr "恢复到默认"
 
@@ -1922,7 +1975,7 @@ msgstr "恢复"
 msgid "Right"
 msgstr "右边"
 
-#: src/wx/audio_mapping_view.cc:354
+#: src/wx/audio_mapping_view.cc:524
 msgid "Right click to change gain."
 msgstr "右键单击要更改增益。"
 
@@ -1930,7 +1983,7 @@ msgstr "右键单击要更改增益。"
 msgid "Right crop"
 msgstr "右裁切"
 
-#: src/wx/config_dialog.cc:584
+#: src/wx/config_dialog.cc:627
 msgid "Root"
 msgstr "根"
 
@@ -1950,6 +2003,14 @@ msgstr "SCP (用于AAM和Doremi)"
 msgid "SMPTE"
 msgstr "SMPTE"
 
+#: src/wx/full_config_dialog.cc:775
+msgid "SSL"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:774
+msgid "STARTTLS"
+msgstr ""
+
 #: src/wx/audio_dialog.cc:371
 #, c-format
 msgid "Sample peak is %.2fdB at %s on %s"
@@ -1987,12 +2048,12 @@ msgstr "选择"
 msgid "Select CPL XML file"
 msgstr "选择CPL文件"
 
-#: src/wx/config_dialog.cc:455 src/wx/config_dialog.cc:524
-#: src/wx/config_dialog.cc:906 src/wx/screen_dialog.cc:213
+#: src/wx/config_dialog.cc:493 src/wx/config_dialog.cc:567
+#: src/wx/config_dialog.cc:949 src/wx/screen_dialog.cc:213
 msgid "Select Certificate File"
 msgstr "选择证书文件"
 
-#: src/wx/config_dialog.cc:552
+#: src/wx/config_dialog.cc:595
 msgid "Select Chain File"
 msgstr "选择私钥文件"
 
@@ -2000,11 +2061,11 @@ msgstr "选择私钥文件"
 msgid "Select Cinemas File"
 msgstr "选择影院文件"
 
-#: src/wx/config_dialog.cc:819
+#: src/wx/config_dialog.cc:862
 msgid "Select Export File"
 msgstr "选择文件以输出"
 
-#: src/wx/config_dialog.cc:854
+#: src/wx/config_dialog.cc:897
 msgid "Select File To Import"
 msgstr "选择文件以导入"
 
@@ -2012,7 +2073,7 @@ msgstr "选择文件以导入"
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/wx/config_dialog.cc:690 src/wx/config_dialog.cc:726
+#: src/wx/config_dialog.cc:733 src/wx/config_dialog.cc:769
 msgid "Select Key File"
 msgstr "选择密钥文件"
 
@@ -2092,7 +2153,7 @@ msgstr "服务器"
 msgid "Set"
 msgstr "设置"
 
-#: src/wx/config_dialog.cc:118
+#: src/wx/config_dialog.cc:119
 msgid "Set language"
 msgstr "设置语言"
 
@@ -2116,7 +2177,7 @@ msgstr "显示音频电平图…"
 msgid "Signed"
 msgstr "签名"
 
-#: src/wx/config_dialog.cc:779 src/wx/config_dialog.cc:806
+#: src/wx/config_dialog.cc:822 src/wx/config_dialog.cc:849
 msgid "Signing DCPs and KDMs"
 msgstr "签名DCP和KDM"
 
@@ -2181,21 +2242,22 @@ msgstr "启动播放器为"
 msgid "Stream"
 msgstr "流"
 
-#: src/wx/isdcf_metadata_dialog.cc:53
+#: src/wx/isdcf_metadata_dialog.cc:60
 msgid "Studio (e.g. TCF)"
 msgstr "工作室(例如:ROV)"
 
-#: src/wx/full_config_dialog.cc:854 src/wx/full_config_dialog.cc:1121
+#: src/wx/full_config_dialog.cc:896 src/wx/full_config_dialog.cc:1163
 msgid "Subject"
 msgstr "类目"
 
-#: src/wx/about_dialog.cc:145
+#: src/wx/about_dialog.cc:146
 #, fuzzy
 msgid "Subscribers"
 msgstr "订阅者"
 
 #: src/wx/isdcf_metadata_dialog.cc:44
-msgid "Subtitle Language (e.g. FR)"
+#, fuzzy
+msgid "Subtitle language (e.g. FR)"
 msgstr "字幕语言(例如:QMS)"
 
 #: src/wx/timeline_labels_view.cc:41 src/wx/timeline_labels_view.cc:75
@@ -2218,7 +2280,7 @@ msgstr "TMS"
 msgid "Target path"
 msgstr "目标路径"
 
-#: src/wx/isdcf_metadata_dialog.cc:59
+#: src/wx/isdcf_metadata_dialog.cc:66
 msgid "Temp version"
 msgstr "临时版本"
 
@@ -2238,7 +2300,7 @@ msgstr "模板名称不能为空."
 msgid "Templates"
 msgstr "模板"
 
-#: src/wx/isdcf_metadata_dialog.cc:47
+#: src/wx/isdcf_metadata_dialog.cc:54
 msgid "Territory (e.g. UK)"
 msgstr "国别地区(例如:CN)"
 
@@ -2246,7 +2308,7 @@ msgstr "国别地区(例如:CN)"
 msgid "Test version "
 msgstr "测试版 "
 
-#: src/wx/about_dialog.cc:207
+#: src/wx/about_dialog.cc:208
 msgid "Tested by"
 msgstr "测试"
 
@@ -2342,13 +2404,13 @@ msgstr "内存不足."
 msgid "This CPL contains no encrypted assets."
 msgstr "该CPL没有包含加密内容."
 
-#: src/wx/config_dialog.cc:472
+#: src/wx/config_dialog.cc:510
 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:142
+#: src/wx/kdm_cpl_panel.cc:147
 msgid "This is not a valid CPL file"
 msgstr "CPL文件无效"
 
@@ -2356,7 +2418,7 @@ msgstr "CPL文件无效"
 msgid "Threads"
 msgstr "线程"
 
-#: src/wx/config_dialog.cc:369 src/wx/screen_dialog.cc:54
+#: src/wx/config_dialog.cc:407 src/wx/screen_dialog.cc:54
 #: src/wx/screen_dialog.cc:146
 msgid "Thumbprint"
 msgstr "指纹"
@@ -2379,7 +2441,7 @@ msgstr "计时器"
 msgid "Timing|Timing"
 msgstr "计时器"
 
-#: src/wx/full_config_dialog.cc:1129
+#: src/wx/full_config_dialog.cc:1171
 msgid "To address"
 msgstr "发送到地址"
 
@@ -2387,11 +2449,15 @@ msgstr "发送到地址"
 msgid "Top crop"
 msgstr "顶端裁切"
 
+#: src/wx/closed_captions_dialog.cc:61
+msgid "Track"
+msgstr ""
+
 #: src/wx/instant_i18n_dialog.cc:28
 msgid "Translate"
 msgstr "翻译"
 
-#: src/wx/about_dialog.cc:141
+#: src/wx/about_dialog.cc:142
 msgid "Translated by"
 msgstr "翻译"
 
@@ -2424,7 +2490,7 @@ msgstr "信任的设备"
 msgid "Trusted Device certificate"
 msgstr "信任的设备证书"
 
-#: src/wx/audio_dialog.cc:110 src/wx/config_dialog.cc:361
+#: src/wx/audio_dialog.cc:110 src/wx/config_dialog.cc:399
 #: src/wx/video_panel.cc:88
 msgid "Type"
 msgstr "类型"
@@ -2589,7 +2655,7 @@ msgstr "将此DCP中的视频作为OV然后制作VF"
 msgid "Use this file as new configuration"
 msgstr "将这个文件作为新设置"
 
-#: src/wx/full_config_dialog.cc:667 src/wx/full_config_dialog.cc:772
+#: src/wx/full_config_dialog.cc:667 src/wx/full_config_dialog.cc:780
 msgid "User name"
 msgstr "用户名"
 
@@ -2611,7 +2677,11 @@ msgstr "视频帧率"
 msgid "View..."
 msgstr "视图窗口…"
 
-#: src/wx/full_config_dialog.cc:1427
+#: src/wx/config_dialog.cc:271
+msgid "WASAPI"
+msgstr ""
+
+#: src/wx/full_config_dialog.cc:1469
 msgid "Warnings"
 msgstr "警告"
 
@@ -2733,19 +2803,19 @@ msgstr "放大/缩小"
 msgid "Zoom out to whole film"
 msgstr "缩放以适应"
 
-#: src/wx/full_config_dialog.cc:972
+#: src/wx/full_config_dialog.cc:1014
 msgid "certificates.barco.com password"
 msgstr "certificates.barco.com 密码"
 
-#: src/wx/full_config_dialog.cc:968
+#: src/wx/full_config_dialog.cc:1010
 msgid "certificates.barco.com user name"
 msgstr "certificates.barco.com 用户名"
 
-#: src/wx/full_config_dialog.cc:980
+#: src/wx/full_config_dialog.cc:1022
 msgid "certificates.christiedigital.com password"
 msgstr "certificates.christiedigital.com 密码"
 
-#: src/wx/full_config_dialog.cc:976
+#: src/wx/full_config_dialog.cc:1018
 msgid "certificates.christiedigital.com user name"
 msgstr "certificates.christiedigital.com 用户名"
 
@@ -2754,7 +2824,7 @@ msgstr "certificates.christiedigital.com 用户名"
 msgid "cinema"
 msgstr "影院"
 
-#: src/wx/text_panel.cc:75 src/wx/text_panel.cc:475
+#: src/wx/text_panel.cc:75 src/wx/text_panel.cc:485
 msgid "closed captions"
 msgstr "隐藏式字幕"
 
@@ -2762,7 +2832,7 @@ msgstr "隐藏式字幕"
 msgid "component value"
 msgstr "结构"
 
-#: src/wx/full_config_dialog.cc:1410
+#: src/wx/full_config_dialog.cc:1452
 msgid "content filename"
 msgstr "内容文件名"
 
@@ -2770,7 +2840,7 @@ msgstr "内容文件名"
 msgid "dB"
 msgstr "dB"
 
-#: src/wx/config_dialog.cc:906
+#: src/wx/config_dialog.cc:949
 msgid "dcpomatic_kdm_decryption_cert.pem"
 msgstr "dcpomatic_kdm_decryption_cert.pem"
 
@@ -2823,11 +2893,11 @@ msgstr "分钟"
 msgid "ms"
 msgstr "毫秒"
 
-#: src/wx/full_config_dialog.cc:1409
+#: src/wx/full_config_dialog.cc:1451
 msgid "number of reels"
 msgstr "分卷数量"
 
-#: src/wx/text_panel.cc:74 src/wx/text_panel.cc:473
+#: src/wx/text_panel.cc:74 src/wx/text_panel.cc:483
 #, fuzzy
 msgid "open subtitles"
 msgstr "使用字幕"
@@ -2836,7 +2906,12 @@ msgstr "使用字幕"
 msgid "port"
 msgstr "端口"
 
-#: src/wx/full_config_dialog.cc:1408
+#: src/wx/full_config_dialog.cc:769
+#, fuzzy
+msgid "protocol"
+msgstr "协议"
+
+#: src/wx/full_config_dialog.cc:1450
 msgid "reel number"
 msgstr "卷号"
 
@@ -2861,11 +2936,11 @@ msgstr "时间"
 msgid "to date/time"
 msgstr "到 日期/时间"
 
-#: src/wx/full_config_dialog.cc:1395
+#: src/wx/full_config_dialog.cc:1437
 msgid "type (cpl/pkl)"
 msgstr "类型（cpl/pkl）"
 
-#: src/wx/full_config_dialog.cc:1407
+#: src/wx/full_config_dialog.cc:1449
 msgid "type (j2c/pcm/sub)"
 msgstr "类型（j2c/pcm/sub）"
 
@@ -3114,9 +3189,6 @@ msgstr "y"
 #~ "playback."
 #~ msgstr "DCP无音频！"
 
-#~ msgid "audio"
-#~ msgstr "音频"
-
 #~ msgid "still"
 #~ msgstr "静止"