X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftools%2Fpo%2Fzh_CN.po;h=9cd7e31fb0d11124f19510b9070e157b3a0095de;hb=5ba7d3d85f597122a711b7e80f43230972a624fe;hp=ece33c3237ace91e089bd84edbe85008e016abae;hpb=eb3301dbdf655a36c98f50eb9b4adcfe4d1dad0c;p=dcpomatic.git

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index ece33c323..9cd7e31fb 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-01-15 19:59+0100\n"
+"POT-Creation-Date: 2023-03-29 01:56+0200\n"
 "PO-Revision-Date: 2023-03-11 19:30+0800\n"
 "Last-Translator: Dian Li <xslidian@gmail.com>\n"
 "Language-Team: Chinese Simplified (Rov8 branch)\n"
@@ -24,12 +24,17 @@ msgstr ""
 "X-Generator: Poedit 3.2.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/tools/dcpomatic_kdm.cc:430
+#: src/tools/dcpomatic_combiner.cc:171
+#, fuzzy
+msgid "%1 already exists as a file, so you cannot use it for a DCP."
+msgstr "%1文件已存在！"
+
+#: src/tools/dcpomatic_kdm.cc:451
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d 导出KDM 到 %s"
 
-#: src/tools/dcpomatic_kdm.cc:430
+#: src/tools/dcpomatic_kdm.cc:451
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d 导出KDMs 到 %s"
@@ -46,61 +51,62 @@ msgstr "添加OV(&A)…"
 msgid "&Close"
 msgstr "关闭(&C)"
 
-#: src/tools/dcpomatic.cc:1348
+#: src/tools/dcpomatic.cc:1320
 msgid "&Close\tCtrl-W"
 msgstr "关闭(&C)\tCtrl+W"
 
-#: src/tools/dcpomatic.cc:1430 src/tools/dcpomatic_batch.cc:105
+#: src/tools/dcpomatic_batch.cc:105 src/tools/dcpomatic.cc:1402
 #: src/tools/dcpomatic_kdm.cc:308 src/tools/dcpomatic_player.cc:607
 #: src/tools/dcpomatic_playlist.cc:599
 msgid "&Edit"
 msgstr "编辑(&E)"
 
-#: src/tools/dcpomatic.cc:1355 src/tools/dcpomatic_batch.cc:85
-#: src/tools/dcpomatic_kdm.cc:286 src/tools/dcpomatic_player.cc:559
-#: src/tools/dcpomatic_playlist.cc:580
+#: src/tools/dcpomatic_batch.cc:85 src/tools/dcpomatic.cc:1327
+#: src/tools/dcpomatic_editor.cc:346 src/tools/dcpomatic_kdm.cc:286
+#: src/tools/dcpomatic_player.cc:559 src/tools/dcpomatic_playlist.cc:580
 msgid "&Exit"
 msgstr "退出(&E)"
 
-#: src/tools/dcpomatic.cc:1429 src/tools/dcpomatic_batch.cc:103
-#: src/tools/dcpomatic_kdm.cc:306 src/tools/dcpomatic_player.cc:605
-#: src/tools/dcpomatic_playlist.cc:597
+#: src/tools/dcpomatic_batch.cc:103 src/tools/dcpomatic.cc:1401
+#: src/tools/dcpomatic_editor.cc:358 src/tools/dcpomatic_kdm.cc:306
+#: src/tools/dcpomatic_player.cc:605 src/tools/dcpomatic_playlist.cc:597
 msgid "&File"
 msgstr "文件(&F)"
 
-#: src/tools/dcpomatic.cc:1434 src/tools/dcpomatic_batch.cc:108
-#: src/tools/dcpomatic_kdm.cc:310 src/tools/dcpomatic_player.cc:611
-#: src/tools/dcpomatic_playlist.cc:601
+#: src/tools/dcpomatic_batch.cc:108 src/tools/dcpomatic.cc:1406
+#: src/tools/dcpomatic_editor.cc:359 src/tools/dcpomatic_kdm.cc:310
+#: src/tools/dcpomatic_player.cc:611 src/tools/dcpomatic_playlist.cc:601
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: src/tools/dcpomatic.cc:1431
+#: src/tools/dcpomatic.cc:1403
 msgid "&Jobs"
 msgstr "任务(&J)"
 
-#: src/tools/dcpomatic.cc:1379
+#: src/tools/dcpomatic.cc:1351
 msgid "&Make DCP\tCtrl-M"
 msgstr "创建 DCP(&M)\tCtrl+M"
 
-#: src/tools/dcpomatic.cc:1335 src/tools/dcpomatic_player.cc:546
+#: src/tools/dcpomatic.cc:1307 src/tools/dcpomatic_editor.cc:341
+#: src/tools/dcpomatic_player.cc:546
 msgid "&Open...\tCtrl-O"
 msgstr "打开(&O)...\tCtrl+O"
 
-#: src/tools/dcpomatic.cc:1370 src/tools/dcpomatic.cc:1374
 #: src/tools/dcpomatic_batch.cc:91 src/tools/dcpomatic_batch.cc:94
+#: src/tools/dcpomatic.cc:1342 src/tools/dcpomatic.cc:1346
 #: src/tools/dcpomatic_kdm.cc:292 src/tools/dcpomatic_kdm.cc:295
 #: src/tools/dcpomatic_player.cc:565 src/tools/dcpomatic_player.cc:568
-#: src/tools/dcpomatic_playlist.cc:587
+#: src/tools/dcpomatic_playlist.cc:579 src/tools/dcpomatic_playlist.cc:587
 msgid "&Preferences...\tCtrl-P"
 msgstr "设置(&P)...\tCtrl+P"
 
-#: src/tools/dcpomatic.cc:1357 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:288 src/tools/dcpomatic_player.cc:561
-#: src/tools/dcpomatic_playlist.cc:582
+#: src/tools/dcpomatic_batch.cc:87 src/tools/dcpomatic.cc:1329
+#: src/tools/dcpomatic_editor.cc:348 src/tools/dcpomatic_kdm.cc:288
+#: src/tools/dcpomatic_player.cc:561 src/tools/dcpomatic_playlist.cc:582
 msgid "&Quit"
 msgstr "退出(&Q)"
 
-#: src/tools/dcpomatic.cc:1338
+#: src/tools/dcpomatic.cc:1310 src/tools/dcpomatic_editor.cc:343
 msgid "&Save\tCtrl-S"
 msgstr "保存(&S)\tCtrl+S"
 
@@ -108,16 +114,16 @@ msgstr "保存(&S)\tCtrl+S"
 msgid "&Save frame to file...\tCtrl-S"
 msgstr "保存场景（帧）到文件...\tCtrl-S"
 
-#: src/tools/dcpomatic.cc:1393
+#: src/tools/dcpomatic.cc:1365
 msgid "&Send DCP to TMS"
 msgstr "发送 DCP 到 TMS(&S)"
 
-#: src/tools/dcpomatic.cc:1433 src/tools/dcpomatic_batch.cc:107
+#: src/tools/dcpomatic_batch.cc:107 src/tools/dcpomatic.cc:1405
 #: src/tools/dcpomatic_player.cc:610
 msgid "&Tools"
 msgstr "工具(&T)"
 
-#: src/tools/dcpomatic.cc:1432 src/tools/dcpomatic_player.cc:609
+#: src/tools/dcpomatic.cc:1404 src/tools/dcpomatic_player.cc:609
 msgid "&View"
 msgstr "查看(&V)"
 
@@ -129,14 +135,15 @@ msgstr "<b>播放列表：</b>"
 msgid "<b>Playlists</b>"
 msgstr "<b>播放列表</b>"
 
-#: src/tools/dcpomatic.cc:1425 src/tools/dcpomatic_batch.cc:101
-#: src/tools/dcpomatic_kdm.cc:302 src/tools/dcpomatic_player.cc:601
-#: src/tools/dcpomatic_playlist.cc:594
+#: src/tools/dcpomatic_batch.cc:101 src/tools/dcpomatic.cc:1397
+#: src/tools/dcpomatic_editor.cc:355 src/tools/dcpomatic_kdm.cc:302
+#: src/tools/dcpomatic_player.cc:601 src/tools/dcpomatic_playlist.cc:594
 msgid "About"
 msgstr "关于"
 
-#: src/tools/dcpomatic.cc:1423 src/tools/dcpomatic_kdm.cc:300
-#: src/tools/dcpomatic_player.cc:599 src/tools/dcpomatic_playlist.cc:592
+#: src/tools/dcpomatic.cc:1395 src/tools/dcpomatic_editor.cc:353
+#: src/tools/dcpomatic_kdm.cc:300 src/tools/dcpomatic_player.cc:599
+#: src/tools/dcpomatic_playlist.cc:592
 msgid "About DCP-o-matic"
 msgstr "关于 DCP-o-matic"
 
@@ -168,8 +175,10 @@ msgstr "添加工程文件夹..."
 msgid "Add..."
 msgstr "添加..."
 
-#: src/tools/dcpomatic.cc:1785 src/tools/dcpomatic_kdm.cc:849
-#: src/tools/dcpomatic_player.cc:1294 src/tools/dcpomatic_playlist.cc:704
+#: src/tools/dcpomatic.cc:1757 src/tools/dcpomatic_combiner.cc:297
+#: src/tools/dcpomatic_disk.cc:552 src/tools/dcpomatic_editor.cc:517
+#: src/tools/dcpomatic_kdm.cc:877 src/tools/dcpomatic_player.cc:1294
+#: src/tools/dcpomatic_playlist.cc:704
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -178,7 +187,7 @@ msgstr ""
 "出现未知错误: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1794
+#: src/tools/dcpomatic.cc:1766
 #, c-format
 msgid ""
 "An exception occurred: %s (%s) (%s)\n"
@@ -187,8 +196,10 @@ msgstr ""
 "发生异常: %s (%s) (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1804 src/tools/dcpomatic_kdm.cc:858
-#: src/tools/dcpomatic_player.cc:1303 src/tools/dcpomatic_playlist.cc:713
+#: src/tools/dcpomatic.cc:1776 src/tools/dcpomatic_combiner.cc:306
+#: src/tools/dcpomatic_disk.cc:561 src/tools/dcpomatic_editor.cc:526
+#: src/tools/dcpomatic_kdm.cc:886 src/tools/dcpomatic_player.cc:1303
+#: src/tools/dcpomatic_playlist.cc:713
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -201,67 +212,100 @@ msgstr ""
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "DCP-o-matic 服务出现未知错误。"
 
-#: src/tools/dcpomatic.cc:999 src/tools/dcpomatic.cc:1809
-#: src/tools/dcpomatic_kdm.cc:441 src/tools/dcpomatic_kdm.cc:863
-#: src/tools/dcpomatic_kdm.cc:872 src/tools/dcpomatic_player.cc:1308
-#: src/tools/dcpomatic_playlist.cc:718 src/tools/dcpomatic_playlist.cc:727
+#: src/tools/dcpomatic.cc:986 src/tools/dcpomatic.cc:1781
+#: src/tools/dcpomatic_combiner.cc:311 src/tools/dcpomatic_disk.cc:566
+#: src/tools/dcpomatic_editor.cc:531 src/tools/dcpomatic_kdm.cc:469
+#: src/tools/dcpomatic_kdm.cc:891 src/tools/dcpomatic_kdm.cc:900
+#: src/tools/dcpomatic_player.cc:1308 src/tools/dcpomatic_playlist.cc:718
+#: src/tools/dcpomatic_playlist.cc:727
 msgid "An unknown exception occurred."
 msgstr "出现未知错误."
 
-#: src/tools/dcpomatic.cc:770
+#: src/tools/dcpomatic_combiner.cc:116 src/tools/dcpomatic_editor.cc:78
+#: src/tools/dcpomatic_editor.cc:193
+msgid "Annotation text"
+msgstr "注释文本"
+
+#: src/tools/dcpomatic.cc:760
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
 msgstr "确定要恢复默认设置？ 该操作不能撤销."
 
-#: src/tools/dcpomatic.cc:844
+#: src/tools/dcpomatic.cc:834
 #, c-format
 msgid "Bad setting for %s."
 msgstr "%s的配置错误。"
 
-#: src/tools/dcpomatic_player.cc:577 src/tools/dcpomatic_playlist.cc:327
+#: src/tools/dcpomatic_editor.cc:319 src/tools/dcpomatic_player.cc:577
+#: src/tools/dcpomatic_playlist.cc:327
 msgid "CPL"
 msgstr "CPL"
 
-#: src/tools/dcpomatic.cc:995 src/tools/dcpomatic_kdm.cc:437
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_kdm.cc:465
 msgid "CPL's content is not encrypted."
 msgstr "该CPL未加密."
 
-#: src/tools/dcpomatic.cc:1413 src/tools/dcpomatic_player.cc:593
+#: src/tools/dcpomatic.cc:1385 src/tools/dcpomatic_player.cc:593
 msgid "Check for updates"
 msgstr "检查更新"
 
-#: src/tools/dcpomatic.cc:1902 src/tools/dcpomatic.cc:1917
+#: src/tools/dcpomatic_combiner.cc:64 src/tools/dcpomatic_disk.cc:80
+msgid "Choose a DCP folder"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1874 src/tools/dcpomatic.cc:1889
 msgid "Close DCP-o-matic"
 msgstr "关闭 DCP-o-matic"
 
-#: src/tools/dcpomatic.cc:158
+#: src/tools/dcpomatic.cc:156
 msgid "Close without saving film"
 msgstr "关闭但不保存"
 
-#: src/tools/dcpomatic.cc:1406 src/tools/dcpomatic_player.cc:583
+#: src/tools/dcpomatic.cc:1378 src/tools/dcpomatic_player.cc:583
 msgid "Closed captions..."
 msgstr "隐藏式字幕..."
 
-#: src/tools/dcpomatic.cc:1362
+#: src/tools/dcpomatic_combiner.cc:124
+msgid "Combine"
+msgstr "组合DCP"
+
+#: src/tools/dcpomatic_combiner.cc:178
+msgid "Combining DCPs"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:208
+msgid "Content title text"
+msgstr "内容标题文本"
+
+#: src/tools/dcpomatic_disk.cc:160
+msgid "Copy DCP"
+msgstr "写入DCP"
+
+#: src/tools/dcpomatic.cc:1334
 msgid "Copy settings\tCtrl-C"
 msgstr "拷贝设置\tCtrl-C"
 
-#: src/tools/dcpomatic.cc:599 src/tools/dcpomatic.cc:608
+#: src/tools/dcpomatic.cc:577 src/tools/dcpomatic.cc:586
 msgid "Could not create folder to store film."
 msgstr "无法创建目录来存储影片."
 
-#: src/tools/dcpomatic_kdm.cc:549
+#: src/tools/dcpomatic_kdm.cc:577
 msgid ""
 "Could not decrypt the DKDM.  Perhaps it was not created with the correct "
 "certificate."
 msgstr "不能解开DKDM. 也许它不是用选定的证书所加密的."
 
-#: src/tools/dcpomatic.cc:935
+#: src/tools/dcpomatic.cc:647 src/tools/dcpomatic.cc:664
+#, fuzzy
+msgid "Could not duplicate project."
+msgstr "无法找到播放器."
+
+#: src/tools/dcpomatic.cc:915
 msgid "Could not find batch converter."
 msgstr "找不到批量转换服务器."
 
-#: src/tools/dcpomatic.cc:950
+#: src/tools/dcpomatic.cc:930
 msgid "Could not find player."
 msgstr "无法找到播放器."
 
@@ -300,62 +344,72 @@ msgstr "无法从 %s 载入DCP"
 msgid "Could not load film %1"
 msgstr "无法加载工程 %1"
 
-#: src/tools/dcpomatic.cc:1698
+#: src/tools/dcpomatic.cc:1670
 msgid "Could not load film %1 (%2)"
 msgstr "无法加载工程 %1 (%2)"
 
-#: src/tools/dcpomatic.cc:846
+#: src/tools/dcpomatic.cc:836
 msgid "Could not make DCP."
 msgstr "DCP创建失败."
 
-#: src/tools/dcpomatic.cc:521 src/tools/dcpomatic.cc:526
-#: src/tools/dcpomatic_batch.cc:255
+#: src/tools/dcpomatic_batch.cc:255 src/tools/dcpomatic.cc:502
+#: src/tools/dcpomatic.cc:507
 #, c-format
 msgid "Could not open film at %s"
 msgstr "无法在 %s 打开工程"
 
-#: src/tools/dcpomatic.cc:516
+#: src/tools/dcpomatic.cc:497
 msgid "Could not open this folder as a DCP-o-matic project."
 msgstr "无法将此文件夹作为DCP-o-matic项目打开。"
 
-#: src/tools/dcpomatic_kdm.cc:554
+#: src/tools/dcpomatic_kdm.cc:582
 msgid ""
 "Could not read file as a KDM.  It is much too large.  Make sure you are "
 "loading a DKDM (XML) file."
 msgstr "不能读取KDM。文件过大。请确保打开了正确的DKDM（XML）文件."
 
-#: src/tools/dcpomatic_kdm.cc:542
+#: src/tools/dcpomatic_kdm.cc:570
 msgid ""
 "Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
 "at all."
 msgstr "不能读取KDM。文件可能使用了不兼容的格式，或者并非KDM。"
 
-#: src/tools/dcpomatic.cc:1150
+#: src/tools/dcpomatic.cc:620
+#, fuzzy
+msgid "Could not save project."
+msgstr "DCP创建失败."
+
+#: src/tools/dcpomatic.cc:631
+#, fuzzy
+msgid "Could not save template."
+msgstr "无法找到播放器."
+
+#: src/tools/dcpomatic.cc:1126
 msgid "Could not send translations"
 msgstr "无法发送翻译"
 
-#: src/tools/dcpomatic.cc:1065
+#: src/tools/dcpomatic.cc:1041
 msgid "Could not show DCP."
 msgstr "无法显示DCP."
 
-#: src/tools/dcpomatic.cc:933
+#: src/tools/dcpomatic.cc:913
 msgid ""
 "Could not start the batch converter.  You may need to download it from "
 "dcpomatic.com."
 msgstr "无法启动批处理转换器，你可能需要从dcpomatic.com下载。"
 
-#: src/tools/dcpomatic.cc:948
+#: src/tools/dcpomatic.cc:928
 msgid ""
 "Could not start the player.  You may need to download it from dcpomatic.com."
 msgstr "无法启动播放器，你可能需要从dcpomatic.com下载。"
 
-#: src/tools/dcpomatic.cc:1447 src/tools/dcpomatic_batch.cc:361
+#: src/tools/dcpomatic_batch.cc:361 src/tools/dcpomatic.cc:1419
 #, c-format
 msgid ""
 "Could not write to cinemas file at %s.  Your changes have not been saved."
 msgstr "不能保存影院数据%s。设置没有被保存。"
 
-#: src/tools/dcpomatic.cc:1459 src/tools/dcpomatic_batch.cc:373
+#: src/tools/dcpomatic_batch.cc:373 src/tools/dcpomatic.cc:1431
 #: src/tools/dcpomatic_player.cc:983 src/tools/dcpomatic_playlist.cc:613
 #, c-format
 msgid ""
@@ -370,8 +424,16 @@ msgstr "不能保存设置到文件。更改没有被保存。"
 msgid "Create KDMs"
 msgstr "创建KDM"
 
-#: src/tools/dcpomatic.cc:1560 src/tools/dcpomatic.cc:1636
-#: src/tools/dcpomatic.cc:1677
+#: src/tools/dcpomatic_editor.cc:203
+msgid "Creator"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:131 src/tools/dcpomatic_disk.cc:135
+msgid "DCP"
+msgstr "DCP"
+
+#: src/tools/dcpomatic.cc:1532 src/tools/dcpomatic.cc:1608
+#: src/tools/dcpomatic.cc:1649
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
@@ -379,11 +441,33 @@ msgstr "DCP-o-matic"
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic 批量转换"
 
+#: src/tools/dcpomatic_combiner.cc:178 src/tools/dcpomatic_combiner.cc:222
+#: src/tools/dcpomatic_combiner.cc:256
+msgid "DCP-o-matic Combiner"
+msgstr "DCP-o-matic 组合工具"
+
+#: src/tools/dcpomatic_disk.cc:314 src/tools/dcpomatic_disk.cc:322
+#: src/tools/dcpomatic_disk.cc:355 src/tools/dcpomatic_disk.cc:443
+#: src/tools/dcpomatic_disk.cc:489
+#, fuzzy
+msgid "DCP-o-matic Disk Writer"
+msgstr "DCP-o-matic KDM 创建器"
+
+#: src/tools/dcpomatic_editor.cc:288 src/tools/dcpomatic_editor.cc:437
+#, fuzzy
+msgid "DCP-o-matic Editor"
+msgstr "DCP-o-matic 播放列表编辑器"
+
+#: src/tools/dcpomatic_editor.cc:488
+#, fuzzy
+msgid "DCP-o-matic Editor could not start."
+msgstr "DCP-o-matic 无法启动"
+
 #: src/tools/dcpomatic_server.cc:151
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic 编码服务器"
 
-#: src/tools/dcpomatic_kdm.cc:783 src/tools/dcpomatic_kdm.cc:817
+#: src/tools/dcpomatic_kdm.cc:811 src/tools/dcpomatic_kdm.cc:845
 msgid "DCP-o-matic KDM Creator"
 msgstr "DCP-o-matic KDM 创建器"
 
@@ -401,10 +485,14 @@ msgstr "DCP-o-matic 播放器无法启动."
 msgid "DCP-o-matic Playlist Editor"
 msgstr "DCP-o-matic 播放列表编辑器"
 
-#: src/tools/dcpomatic_kdm.cc:834 src/tools/dcpomatic_playlist.cc:691
+#: src/tools/dcpomatic_kdm.cc:862 src/tools/dcpomatic_playlist.cc:691
 msgid "DCP-o-matic could not start"
 msgstr "DCP-o-matic 无法启动"
 
+#: src/tools/dcpomatic_combiner.cc:188
+msgid "DCPs combined successfully."
+msgstr ""
+
 #: src/tools/dcpomatic_kdm.cc:167
 msgid "DKDM"
 msgstr "DKDM"
@@ -425,20 +513,32 @@ msgstr "四分之一分辨率解码"
 msgid "Delete"
 msgstr "删除"
 
-#: src/tools/dcpomatic.cc:1875 src/tools/dcpomatic.cc:1890
+#: src/tools/dcpomatic_disk.cc:323
+msgid ""
+"Did you install the DCP-o-matic Disk Writer.pkg from the .dmg?  Please check "
+"and try again."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1847 src/tools/dcpomatic.cc:1862
 msgid "Do nothing"
 msgstr "什么都不做"
 
-#: src/tools/dcpomatic.cc:831
+#: src/tools/dcpomatic_disk.cc:315
+msgid ""
+"Do you see a 'User Account Control' dialogue asking about "
+"dcpomatic2_disk_writer.exe?  If so, click 'Yes', then try again."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:821
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr "真的要覆盖已经存在的DCP %s 吗？"
 
-#: src/tools/dcpomatic.cc:158
+#: src/tools/dcpomatic.cc:156
 msgid "Don't close"
 msgstr "取消"
 
-#: src/tools/dcpomatic.cc:195
+#: src/tools/dcpomatic.cc:184
 msgid "Don't duplicate"
 msgstr "取消复制"
 
@@ -446,27 +546,39 @@ msgstr "取消复制"
 msgid "Down"
 msgstr "下"
 
+#: src/tools/dcpomatic_disk.cc:147
+msgid "Drive"
+msgstr "目标驱动器"
+
 #: src/tools/dcpomatic_player.cc:580
 msgid "Dual screen\tShift+F11"
 msgstr "双屏\tShift+F11"
 
-#: src/tools/dcpomatic.cc:652 src/tools/dcpomatic.cc:664
+#: src/tools/dcpomatic.cc:638 src/tools/dcpomatic.cc:654
 msgid "Duplicate Film"
 msgstr "复制工程"
 
-#: src/tools/dcpomatic.cc:1342
+#: src/tools/dcpomatic.cc:1314
 msgid "Duplicate and open..."
 msgstr "复制工程并打开..."
 
-#: src/tools/dcpomatic.cc:195
+#: src/tools/dcpomatic.cc:184
 msgid "Duplicate without saving film"
 msgstr "复制项目但不保存"
 
-#: src/tools/dcpomatic.cc:1341
+#: src/tools/dcpomatic.cc:1313
 msgid "Duplicate..."
 msgstr "复制…"
 
-#: src/tools/dcpomatic.cc:1411 src/tools/dcpomatic_batch.cc:98
+#: src/tools/dcpomatic_editor.cc:88
+msgid "Duration"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:148
+msgid "Edit reel"
+msgstr ""
+
+#: src/tools/dcpomatic_batch.cc:98 src/tools/dcpomatic.cc:1383
 msgid "Encoding servers..."
 msgstr "查看编码服务器..."
 
@@ -474,15 +586,19 @@ msgstr "查看编码服务器..."
 msgid "Encrypted"
 msgstr "加密的"
 
-#: src/tools/dcpomatic.cc:1419
+#: src/tools/dcpomatic_editor.cc:83
+msgid "Entry point"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1391
 msgid "Export preferences..."
 msgstr "导出首选项设置..."
 
-#: src/tools/dcpomatic.cc:1391
+#: src/tools/dcpomatic.cc:1363
 msgid "Export subtitles..."
 msgstr "导出字幕..."
 
-#: src/tools/dcpomatic.cc:1390
+#: src/tools/dcpomatic.cc:1362
 msgid "Export video file...\tCtrl-E"
 msgstr "导出视频文件...\tCtrl-E"
 
@@ -490,17 +606,29 @@ msgstr "导出视频文件...\tCtrl-E"
 msgid "Export..."
 msgstr "导出..."
 
-#: src/tools/dcpomatic.cc:1025 src/tools/dcpomatic_kdm.cc:317
+#: src/tools/dcpomatic.cc:1001 src/tools/dcpomatic_kdm.cc:323
 #, c-format
 msgid "File %s already exists.  Do you want to overwrite it?"
 msgstr "已存在文件 %s ，是否覆盖？"
 
-#. / TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
-#. / project (Film) has been changed since it was last saved.
-#: src/tools/dcpomatic.cc:153 src/tools/dcpomatic.cc:190
+#. TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
+#. project (Film) has been changed since it was last saved.
+#: src/tools/dcpomatic.cc:151 src/tools/dcpomatic.cc:179
 msgid "Film changed"
 msgstr "工程已被编辑"
 
+#: src/tools/dcpomatic_kdm.cc:318
+#, fuzzy, c-format
+msgid "Folder %s already exists.  Do you want to overwrite it?"
+msgstr "已存在文件 %s ，是否覆盖？"
+
+#: src/tools/dcpomatic_kdm.cc:431
+msgid ""
+"For some of these KDMs the recipient certificate's validity period will not "
+"cover the whole of the KDM validity period.  This might cause problems with "
+"the KDMs."
+msgstr ""
+
 #: src/tools/dcpomatic_server.cc:162
 msgid "Frames per second"
 msgstr "帧率"
@@ -509,11 +637,23 @@ msgstr "帧率"
 msgid "Full screen\tF11"
 msgstr "全屏\tF11"
 
-#: src/tools/dcpomatic.cc:1410
+#: src/tools/dcpomatic.cc:1382
 msgid "Hints..."
 msgstr "提示..."
 
-#: src/tools/dcpomatic.cc:517
+#: src/tools/dcpomatic_combiner.cc:101
+msgid "Input DCP"
+msgstr "导入DCP"
+
+#: src/tools/dcpomatic_editor.cc:93
+msgid "Intrinsic duration"
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:198
+msgid "Issuer"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:498
 msgid ""
 "It looks like you are trying to open a DCP.  File -> Open is for loading DCP-"
 "o-matic projects, not DCPs.  To import a DCP, create a new project with File "
@@ -522,10 +662,10 @@ msgstr ""
 "您正在尝试打开一个DCP，文件->打开是用于加载DCP-o-matic项目的，而不是DCP本"
 "身。 要导入DCP，请使用文件->新建以新建一个新项目，然后单击“添加DCP …”按钮。"
 
-#. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
+#. TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
 #: src/tools/dcpomatic_kdm.cc:161
 msgid "KDM|Timing"
-msgstr "KDM|有效期"
+msgstr "有效期"
 
 #: src/tools/dcpomatic_playlist.cc:131
 msgid "Length"
@@ -535,23 +675,23 @@ msgstr "长度"
 msgid "Loading content"
 msgstr "正在载入内容"
 
-#: src/tools/dcpomatic.cc:1386
+#: src/tools/dcpomatic.cc:1358
 msgid "Make &DKDMs...\tCtrl-D"
 msgstr "制作 &DKDM...\tCtrl-D"
 
-#: src/tools/dcpomatic.cc:1384
+#: src/tools/dcpomatic.cc:1356
 msgid "Make &KDMs...\tCtrl-K"
 msgstr "制作 &KDM \tCtrl+K"
 
-#: src/tools/dcpomatic.cc:1381
+#: src/tools/dcpomatic.cc:1353
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "批量制作DCP\tCtrl+B"
 
-#: src/tools/dcpomatic.cc:1387
+#: src/tools/dcpomatic.cc:1359
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "制作DCP-o-matic的KDM..."
 
-#: src/tools/dcpomatic.cc:1412
+#: src/tools/dcpomatic.cc:1384
 msgid "Manage templates..."
 msgstr "管理模板…"
 
@@ -563,7 +703,7 @@ msgstr "名称"
 msgid "New"
 msgstr "新建"
 
-#: src/tools/dcpomatic.cc:580
+#: src/tools/dcpomatic.cc:558
 msgid "New Film"
 msgstr "新建影片"
 
@@ -571,25 +711,39 @@ msgstr "新建影片"
 msgid "New Playlist"
 msgstr "新建播放列表"
 
-#: src/tools/dcpomatic.cc:1333
+#: src/tools/dcpomatic.cc:1305
 msgid "New...\tCtrl-N"
 msgstr "新建工程...\tCtrl+N"
 
+#: src/tools/dcpomatic_disk.cc:89
+msgid ""
+"No ASSETMAP or ASSETMAP.xml found in this folder.  Please choose a DCP "
+"folder."
+msgstr ""
+
 #: src/tools/dcpomatic_playlist.cc:242
 msgid ""
 "No playlist folder is specified in preferences.  Please set one and then try "
 "again."
 msgstr "首选项中未指定播放列表文件夹，请设置一个，然后重试。"
 
-#: src/tools/dcpomatic.cc:1403
+#: src/tools/dcpomatic.cc:1375
 msgid "Open DCP in &player"
 msgstr "在播放器中打开DCP"
 
+#: src/tools/dcpomatic_editor.cc:276
+msgid "Open a DCP using File -> Open"
+msgstr ""
+
 #: src/tools/dcpomatic_kdm.cc:219
 msgid "Output"
 msgstr "输出"
 
-#: src/tools/dcpomatic.cc:1364
+#: src/tools/dcpomatic_combiner.cc:120
+msgid "Output DCP folder"
+msgstr "导出DCP到文件夹"
+
+#: src/tools/dcpomatic.cc:1336
 msgid "Paste settings...\tCtrl-V"
 msgstr "粘贴设置...\tCtrl+V"
 
@@ -601,7 +755,11 @@ msgstr "暂停/继续转换"
 msgid "Pause/resume"
 msgstr "暂停/继续"
 
-#: src/tools/dcpomatic.cc:604
+#: src/tools/dcpomatic_editor.cc:166
+msgid "Picture"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:582
 msgid ""
 "Please check that you do not have Windows controlled folder access enabled "
 "for DCP-o-matic."
@@ -615,16 +773,24 @@ msgstr "问题|N"
 msgid "Question|Y"
 msgstr "问题|Y"
 
-#: src/tools/dcpomatic.cc:1912
+#: src/tools/dcpomatic.cc:1884
 msgid "Recreate KDM decryption chain"
 msgstr "重新创建KDM解密链"
 
-#: src/tools/dcpomatic.cc:1871 src/tools/dcpomatic.cc:1886
-#: src/tools/dcpomatic.cc:1898
+#: src/tools/dcpomatic.cc:1843 src/tools/dcpomatic.cc:1858
+#: src/tools/dcpomatic.cc:1870
 msgid "Recreate signing certificates"
 msgstr "重新创建签名证书"
 
-#: src/tools/dcpomatic.cc:1724
+#: src/tools/dcpomatic_editor.cc:213
+msgid "Reels"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:151
+msgid "Refresh"
+msgstr "刷新"
+
+#: src/tools/dcpomatic.cc:1696
 msgid "Release notes"
 msgstr "发行说明"
 
@@ -632,24 +798,24 @@ msgstr "发行说明"
 msgid "Remove"
 msgstr "移除"
 
-#: src/tools/dcpomatic.cc:1427 src/tools/dcpomatic_kdm.cc:304
+#: src/tools/dcpomatic.cc:1399 src/tools/dcpomatic_kdm.cc:304
 #: src/tools/dcpomatic_player.cc:603
 msgid "Report a problem..."
 msgstr "报告问题..."
 
-#: src/tools/dcpomatic.cc:771 src/tools/dcpomatic.cc:1417
+#: src/tools/dcpomatic.cc:761 src/tools/dcpomatic.cc:1389
 msgid "Restore default preferences"
 msgstr "恢复默认设置"
 
-#: src/tools/dcpomatic.cc:1398
+#: src/tools/dcpomatic.cc:1370
 msgid "S&how DCP in Explorer"
 msgstr "&在资源管理器中显示 DCP"
 
-#: src/tools/dcpomatic.cc:1400
+#: src/tools/dcpomatic.cc:1372
 msgid "S&how DCP in Files"
 msgstr "&查看DCP文件"
 
-#: src/tools/dcpomatic.cc:1396
+#: src/tools/dcpomatic.cc:1368
 msgid "S&how DCP in Finder"
 msgstr "&在Finder中查看DCP"
 
@@ -657,26 +823,26 @@ msgstr "&在Finder中查看DCP"
 msgid "Save"
 msgstr "保存"
 
-#: src/tools/dcpomatic.cc:1340
+#: src/tools/dcpomatic.cc:1312
 #, fuzzy
 msgid "Save as &template..."
 msgstr "保存为模板…"
 
-#: src/tools/dcpomatic.cc:150
+#: src/tools/dcpomatic.cc:148
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "关闭前是否保存 \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:187
+#: src/tools/dcpomatic.cc:176
 #, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "复制前是否保存 \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:158
+#: src/tools/dcpomatic.cc:156
 msgid "Save film and close"
 msgstr "保存并关闭"
 
-#: src/tools/dcpomatic.cc:195
+#: src/tools/dcpomatic.cc:184
 msgid "Save film and duplicate"
 msgstr "保存并复制"
 
@@ -688,7 +854,7 @@ msgstr "保存场景（帧）到文件"
 msgid "Screens"
 msgstr "影厅放映服务器（屏幕）"
 
-#: src/tools/dcpomatic_player.cc:621
+#: src/tools/dcpomatic_editor.cc:365 src/tools/dcpomatic_player.cc:621
 msgid "Select DCP to open"
 msgstr "选择打开DCP"
 
@@ -696,11 +862,11 @@ msgstr "选择打开DCP"
 msgid "Select DCP to open as OV"
 msgstr "选择DCP作为OV打开"
 
-#: src/tools/dcpomatic_kdm.cc:716
+#: src/tools/dcpomatic_kdm.cc:744
 msgid "Select DKDM File"
 msgstr "选择 DKDM 文件"
 
-#: src/tools/dcpomatic_kdm.cc:513
+#: src/tools/dcpomatic_kdm.cc:541
 msgid "Select DKDM file"
 msgstr "选择 DKDM 文件"
 
@@ -708,19 +874,19 @@ msgstr "选择 DKDM 文件"
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/tools/dcpomatic.cc:1367
+#: src/tools/dcpomatic.cc:1339
 msgid "Select all\tShift-Ctrl-A"
 msgstr "选择所有\tShift-Ctrl-A"
 
-#: src/tools/dcpomatic.cc:617 src/tools/dcpomatic_batch.cc:329
+#: src/tools/dcpomatic_batch.cc:329 src/tools/dcpomatic.cc:595
 msgid "Select film to open"
 msgstr "选择打开工程文件"
 
-#: src/tools/dcpomatic_kdm.cc:424
+#: src/tools/dcpomatic_kdm.cc:445
 msgid "Send KDM emails"
 msgstr "通过电子邮件发送KDM"
 
-#: src/tools/dcpomatic.cc:1414
+#: src/tools/dcpomatic.cc:1386
 msgid "Send translations..."
 msgstr "发送翻译..."
 
@@ -728,15 +894,30 @@ msgstr "发送翻译..."
 msgid "Set decode resolution to match display"
 msgstr "将解码分辨率设置为适应屏幕"
 
-#: src/tools/dcpomatic.cc:783
+#: src/tools/dcpomatic_kdm.cc:423
+msgid ""
+"Some KDMs would have validity periods which are completely outside the "
+"recipient certificate periods.  Such KDMs are very unlikely to work, so will "
+"not be created."
+msgstr ""
+
+#: src/tools/dcpomatic_editor.cc:169
+msgid "Sound"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:773
 msgid "Specify ZIP file"
 msgstr "指定ZIP文件"
 
-#: src/tools/dcpomatic.cc:1415 src/tools/dcpomatic_player.cc:595
+#: src/tools/dcpomatic_editor.cc:172
+msgid "Subtitle"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1387 src/tools/dcpomatic_player.cc:595
 msgid "System information..."
 msgstr "系统信息…"
 
-#: src/tools/dcpomatic.cc:803
+#: src/tools/dcpomatic.cc:793
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f GB, and "
@@ -747,7 +928,7 @@ msgstr ""
 "创建该DCP包时大约需要 %.1f GB的缓存空间，而您当前的可用磁盘空间只有 %.1f GB。"
 "如果文件系统支持硬链接则只需一半的空间即可，但它并不支持。您是否仍然继续?"
 
-#: src/tools/dcpomatic.cc:801
+#: src/tools/dcpomatic.cc:791
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f GB, and the disk that you are "
@@ -756,7 +937,7 @@ msgstr ""
 "该DCP在创建中将占用约 %.1f GB, 您正在使用的磁盘只有 %.1f GB可用。您是否仍然继"
 "ç»­?"
 
-#: src/tools/dcpomatic.cc:1520 src/tools/dcpomatic_player.cc:965
+#: src/tools/dcpomatic.cc:1492 src/tools/dcpomatic_player.cc:965
 msgid "The DCP-o-matic download server could not be contacted."
 msgstr "连接DCP-o-matic下载服务器失败."
 
@@ -774,7 +955,24 @@ msgstr ""
 msgid "The KDM does not allow playback of this content at this time."
 msgstr "这个KDM不允许在现在这个时间播放这个内容."
 
-#: src/tools/dcpomatic.cc:1913
+#: src/tools/dcpomatic_kdm.cc:461
+msgid ""
+"The KDM end period is after (or close to) the end of the signing "
+"certficates' validity period.  Either use an earlier end time for this KDM "
+"or re-create your signing certificates in the DCP-o-matic preferences window."
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:459
+msgid ""
+"The KDM start period is before (or close to) the start of the signing "
+"certificate's validity period.  Use a later start time for this KDM."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:965
+msgid "The certificate chain for signing is invalid"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1885
 msgid ""
 "The certificate chain that DCP-o-matic uses for decrypting KDMs is "
 "inconsistent and\n"
@@ -789,7 +987,7 @@ msgstr ""
 "您是否希望重新创建解密KDM所用的证书链？ 您可能需要先选择“否”并在继续之前\n"
 "先备份您的配置。"
 
-#: src/tools/dcpomatic.cc:1872
+#: src/tools/dcpomatic.cc:1844
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
 "contains a small error\n"
@@ -801,7 +999,7 @@ msgstr ""
 "这将使得一些系统无法准确验证DCP。\n"
 "您需要重新创建签署DCPs和KDMs的证书链吗？"
 
-#: src/tools/dcpomatic.cc:1887
+#: src/tools/dcpomatic.cc:1859
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a "
 "validity period\n"
@@ -813,7 +1011,7 @@ msgstr ""
 "这将导致在某些系统上回放DCP时出现问题。\n"
 "您需要重新创建签署DCPs和KDMs的证书链吗？"
 
-#: src/tools/dcpomatic.cc:1899
+#: src/tools/dcpomatic.cc:1871
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs is "
 "inconsistent and\n"
@@ -825,21 +1023,39 @@ msgstr ""
 "不能使用。除非重新创建，否则DCP-o-matic无法运行。\n"
 "您想重新创建签署DCPs和KDMs的证书链吗？"
 
-#: src/tools/dcpomatic_player.cc:1332
+#: src/tools/dcpomatic_combiner.cc:161
+msgid ""
+"The directory %1 already exists and is not empty.  Are you sure you want to "
+"use it?"
+msgstr "目录 %1 已经存在且不为空。确定要使用它？"
+
+#: src/tools/dcpomatic_disk.cc:278
+msgid "The disk you selected is no longer available.  Please choose another."
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:357
+#, c-format
+msgid ""
+"The drive %s could not be unmounted.\n"
+"Close any application that is using it, then try again. (%s)"
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:530 src/tools/dcpomatic_player.cc:1332
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
 msgstr "现有配置文件损坏，系统将会使用默认的配置文件，请稍候。"
 
-#: src/tools/dcpomatic.cc:1522 src/tools/dcpomatic_player.cc:967
+#: src/tools/dcpomatic.cc:1494 src/tools/dcpomatic_player.cc:967
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "DCP-o-matic 没有新的版本。"
 
-#: src/tools/dcpomatic.cc:1177 src/tools/dcpomatic_batch.cc:274
+#: src/tools/dcpomatic_batch.cc:274 src/tools/dcpomatic.cc:1153
+#: src/tools/dcpomatic_disk.cc:254
 msgid "There are unfinished jobs; are you sure you want to quit?"
 msgstr "有未完成的操作，确定退出吗？"
 
-#: src/tools/dcpomatic.cc:499
+#: src/tools/dcpomatic.cc:480
 msgid ""
 "This film was created with an old version of DVD-o-matic and may not load "
 "correctly in this version.  Please check the film's settings carefully."
@@ -859,7 +1075,12 @@ msgstr ""
 msgid "Timing..."
 msgstr "计时..."
 
-#: src/tools/dcpomatic.cc:602
+#: src/tools/dcpomatic_disk.cc:115
+#, fuzzy
+msgid "Tools"
+msgstr "工具(&T)"
+
+#: src/tools/dcpomatic.cc:580
 #, c-format
 msgid "Try removing the %s characters from your folder name."
 msgstr "尝试将文件夹名中的 %s 字符移除."
@@ -868,10 +1089,15 @@ msgstr "尝试将文件夹名中的 %s 字符移除."
 msgid "Type"
 msgstr "类型"
 
-#: src/tools/dcpomatic.cc:1178 src/tools/dcpomatic_batch.cc:275
+#: src/tools/dcpomatic_batch.cc:275 src/tools/dcpomatic.cc:1154
+#: src/tools/dcpomatic_disk.cc:255
 msgid "Unfinished jobs"
 msgstr "未完成的进程"
 
+#: src/tools/dcpomatic_disk.cc:114
+msgid "Uninstall..."
+msgstr ""
+
 #: src/tools/dcpomatic_playlist.cc:344
 msgid "Up"
 msgstr "上"
@@ -880,11 +1106,11 @@ msgstr "上"
 msgid "Verify DCP..."
 msgstr "验证 DCP..."
 
-#: src/tools/dcpomatic.cc:1407
+#: src/tools/dcpomatic.cc:1379
 msgid "Video waveform..."
 msgstr "视频波形……"
 
-#: src/tools/dcpomatic_kdm.cc:691
+#: src/tools/dcpomatic_kdm.cc:719
 msgid ""
 "You are about to remove a DKDM.  This will make it impossible to decrypt the "
 "DCP that the DKDM was made for, and it cannot be undone.  Are you sure?"
@@ -892,7 +1118,7 @@ msgstr ""
 "您将删除当前DKDM，这会导致以后无法解密对应的DCP，并且无法找回DKDM。您确定要删"
 "除吗？"
 
-#: src/tools/dcpomatic.cc:970
+#: src/tools/dcpomatic.cc:950
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -912,7 +1138,7 @@ msgstr ""
 "weight=\"bold\" size=\"larger\">备份这个文件</span> 如果丢失，您的DKDM（包括"
 "生成的DCP包）将无法使用。"
 
-#: src/tools/dcpomatic.cc:821
+#: src/tools/dcpomatic.cc:811
 msgid ""
 "You are making an encrypted DCP.  It will not be possible to make KDMs for "
 "this DCP unless you have copies of the <tt>metadata.xml</tt> file within the "
@@ -927,7 +1153,7 @@ msgstr ""
 "请在生成KDM之前再次确认已经 <span weight=\"bold\" size=\"larger\">备份</"
 "span> 该文件。"
 
-#: src/tools/dcpomatic.cc:1685
+#: src/tools/dcpomatic.cc:1657
 msgid ""
 "You are running the 32-bit version of DCP-o-matic on a 64-bit version of "
 "Windows.  This will limit the memory available to DCP-o-matic and may cause "
@@ -937,14 +1163,27 @@ msgstr ""
 "您正在Windows的64位系统中使用32位dcp-o-matic的版本。这会限制dcp-o-matic可用的"
 "内存，并且可能导致报错。强烈建议您安装64位dcp-o-matic的版本。"
 
-#: src/tools/dcpomatic.cc:626 src/tools/dcpomatic_batch.cc:338
-#: src/tools/dcpomatic_player.cc:627 src/tools/dcpomatic_player.cc:658
+#: src/tools/dcpomatic_disk.cc:484
+msgid ""
+"You did not correctly confirm that you read the warning that was just "
+"shown.  DCP-o-matic Disk Writer will close now.  Please try again."
+msgstr ""
+
+#: src/tools/dcpomatic_disk.cc:373
+msgid ""
+"You did not correctly confirm that you read the warning that was just "
+"shown.  Please try again."
+msgstr ""
+
+#: src/tools/dcpomatic_batch.cc:338 src/tools/dcpomatic.cc:604
+#: src/tools/dcpomatic_editor.cc:371 src/tools/dcpomatic_player.cc:627
+#: src/tools/dcpomatic_player.cc:658
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr "您没有选择文件夹。请确保您单击打开之前，选择一个文件夹。"
 
-#: src/tools/dcpomatic.cc:1143
+#: src/tools/dcpomatic.cc:1119
 msgid ""
 "You must enter a valid email address when sending translations, otherwise "
 "the DCP-o-matic maintainers cannot credit you or contact you with questions."
@@ -952,6 +1191,14 @@ msgstr ""
 "发送翻译时，您必须输入有效的电子邮件地址，否则 DCP-o-matic 的维护人员无法为您"
 "署名或向您咨询某些问题。"
 
+#, fuzzy
+#~ msgid "DCP-o-matic DCP Combiner"
+#~ msgstr "DCP-o-matic KDM 创建器"
+
+#, fuzzy
+#~ msgid "DCP-o-matic Combine"
+#~ msgstr "DCP-o-matic"
+
 #~ msgid "Pause"
 #~ msgstr "暂停"
 
@@ -999,9 +1246,6 @@ msgstr ""
 #~ msgid "Scale to fit &width"
 #~ msgstr "缩放到合适宽度"
 
-#~ msgid "DCP"
-#~ msgstr "DCP"
-
 #~ msgid "Disable timeline"
 #~ msgstr "禁用时间线"
 
@@ -1029,14 +1273,6 @@ msgstr ""
 #~ msgid "Could not load DCP"
 #~ msgstr "无法载入DCP"
 
-#~ msgid "%1 already exists as a file, so you cannot use it for a new film."
-#~ msgstr "%1文件已存在！"
-
-#~ msgid ""
-#~ "The directory %1 already exists and is not empty.  Are you sure you want "
-#~ "to use it?"
-#~ msgstr "目录 %1 已经存在且不为空。确定要使用它？"
-
 #~ msgid "&Properties..."
 #~ msgstr "&Propiedades..."