X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fpo%2Fzh_CN.po;h=b97af29c12bbff71a40f5589f42077cff1bf9678;hb=4f0be04b28c3a4cfec9513db23f92a175d207dfb;hp=5d2e66b8df2568708bb7567d74fd51a321b2e169;hpb=cc105289bed33989e5c399433e28208652b18e70;p=dcpomatic.git

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index 5d2e66b8d..b97af29c1 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -1,163 +1,184 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# dcpomatic translation file, Chinese Simplified (Rov8 branch)
+# Copyright (C) 2015-2021 DCP-o-matic zh_CN contributors
+# This file is distributed under the same license as the DCP-o-matic package.
+#
+# Translators:
+# Rov (若文) <lojy2009@qq.com>, 2015-2016
+# Hanyuan (刘汉源), 2016-2019
+# kahn <bnm14744@gmail.com>, 2021
+# Dian Li <xslidian@gmail.com>, 2022
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-28 23:38+0200\n"
-"PO-Revision-Date: 2019-04-21 22:48+0800\n"
-"Last-Translator: Hanyuan\n"
-"Language-Team: Hanyuan\n"
-"Language: zh\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"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 2.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.2.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/tools/dcpomatic_kdm.cc:389
+#: 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:389
+#: src/tools/dcpomatic_kdm.cc:451
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d 导出KDMs 到 %s"
 
-#: src/tools/dcpomatic_batch.cc:77
+#: src/tools/dcpomatic_batch.cc:83
 msgid "&Add Film...\tCtrl-A"
-msgstr "&添加工程"
+msgstr "添加工程(&A)...\tCtrl+A"
 
-#: src/tools/dcpomatic_player.cc:526
+#: src/tools/dcpomatic_player.cc:547
 msgid "&Add OV..."
-msgstr "&添加OV…"
+msgstr "添加OV(&A)…"
 
-#: src/tools/dcpomatic_player.cc:532
+#: src/tools/dcpomatic_player.cc:555
 msgid "&Close"
-msgstr "&关闭"
+msgstr "关闭(&C)"
 
-#: src/tools/dcpomatic.cc:1317
+#: src/tools/dcpomatic.cc:1320
 msgid "&Close\tCtrl-W"
-msgstr "&关闭\tCtrl+W"
+msgstr "关闭(&C)\tCtrl+W"
 
-#: src/tools/dcpomatic.cc:1388 src/tools/dcpomatic_batch.cc:99
-#: src/tools/dcpomatic_kdm.cc:267 src/tools/dcpomatic_player.cc:584
-#: src/tools/dcpomatic_playlist.cc:551
+#: 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 "&编辑"
+msgstr "编辑(&E)"
 
-#: src/tools/dcpomatic.cc:1324 src/tools/dcpomatic_batch.cc:79
-#: src/tools/dcpomatic_kdm.cc:245 src/tools/dcpomatic_player.cc:536
-#: src/tools/dcpomatic_playlist.cc:532
+#: 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 "&退出"
+msgstr "退出(&E)"
 
-#: src/tools/dcpomatic.cc:1387 src/tools/dcpomatic_batch.cc:97
-#: src/tools/dcpomatic_kdm.cc:265 src/tools/dcpomatic_player.cc:582
-#: src/tools/dcpomatic_playlist.cc:549
+#: 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 "&文件"
+msgstr "文件(&F)"
 
-#: src/tools/dcpomatic.cc:1392 src/tools/dcpomatic_batch.cc:102
-#: src/tools/dcpomatic_kdm.cc:269 src/tools/dcpomatic_player.cc:588
-#: src/tools/dcpomatic_playlist.cc:553
+#: 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 "&帮助"
+msgstr "帮助(&H)"
 
-#: src/tools/dcpomatic.cc:1389
+#: src/tools/dcpomatic.cc:1403
 msgid "&Jobs"
-msgstr "&创建"
+msgstr "任务(&J)"
 
-#: src/tools/dcpomatic.cc:1343
+#: src/tools/dcpomatic.cc:1351
 msgid "&Make DCP\tCtrl-M"
-msgstr "&创建 DCP\tCtrl+M"
+msgstr "创建 DCP(&M)\tCtrl+M"
 
-#: src/tools/dcpomatic.cc:1306 src/tools/dcpomatic_player.cc:525
+#: src/tools/dcpomatic.cc:1307 src/tools/dcpomatic_editor.cc:341
+#: src/tools/dcpomatic_player.cc:546
 msgid "&Open...\tCtrl-O"
-msgstr "&打开...\tCtrl+O"
+msgstr "打开(&O)...\tCtrl+O"
 
-#: src/tools/dcpomatic.cc:1336 src/tools/dcpomatic.cc:1339
-#: src/tools/dcpomatic_batch.cc:85 src/tools/dcpomatic_batch.cc:88
-#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_kdm.cc:254
-#: src/tools/dcpomatic_player.cc:542 src/tools/dcpomatic_player.cc:545
-#: src/tools/dcpomatic_playlist.cc:539
+#: 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:579 src/tools/dcpomatic_playlist.cc:587
 msgid "&Preferences...\tCtrl-P"
-msgstr "&设置....\tCtrl+P"
+msgstr "设置(&P)...\tCtrl+P"
 
-#: src/tools/dcpomatic.cc:1326 src/tools/dcpomatic_batch.cc:81
-#: src/tools/dcpomatic_kdm.cc:247 src/tools/dcpomatic_player.cc:538
-#: src/tools/dcpomatic_playlist.cc:534
+#: 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 "&退出"
+msgstr "退出(&Q)"
 
-#: src/tools/dcpomatic.cc:1308
+#: src/tools/dcpomatic.cc:1310 src/tools/dcpomatic_editor.cc:343
 msgid "&Save\tCtrl-S"
-msgstr "&保存\tCtrl+S"
+msgstr "保存(&S)\tCtrl+S"
 
-#: src/tools/dcpomatic.cc:1353
+#: src/tools/dcpomatic_player.cc:550
+msgid "&Save frame to file...\tCtrl-S"
+msgstr "保存场景（帧）到文件...\tCtrl-S"
+
+#: src/tools/dcpomatic.cc:1365
 msgid "&Send DCP to TMS"
-msgstr "&发送 DCP 到 TMS"
+msgstr "发送 DCP 到 TMS(&S)"
 
-#: src/tools/dcpomatic.cc:1391 src/tools/dcpomatic_batch.cc:101
-#: src/tools/dcpomatic_player.cc:587
+#: src/tools/dcpomatic_batch.cc:107 src/tools/dcpomatic.cc:1405
+#: src/tools/dcpomatic_player.cc:610
 msgid "&Tools"
-msgstr "&工具"
+msgstr "工具(&T)"
 
-#: src/tools/dcpomatic.cc:1390 src/tools/dcpomatic_player.cc:586
+#: src/tools/dcpomatic.cc:1404 src/tools/dcpomatic_player.cc:609
 msgid "&View"
-msgstr "&查看"
+msgstr "查看(&V)"
 
-#: src/tools/dcpomatic_playlist.cc:262
+#: src/tools/dcpomatic_playlist.cc:312
 msgid "<b>Playlist:</b>"
-msgstr ""
+msgstr "<b>播放列表：</b>"
 
-#: src/tools/dcpomatic_playlist.cc:108
+#: src/tools/dcpomatic_playlist.cc:123
 msgid "<b>Playlists</b>"
-msgstr ""
+msgstr "<b>播放列表</b>"
 
-#: src/tools/dcpomatic.cc:1383 src/tools/dcpomatic_batch.cc:95
-#: src/tools/dcpomatic_kdm.cc:261 src/tools/dcpomatic_player.cc:578
-#: src/tools/dcpomatic_playlist.cc:546
+#: 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:1381 src/tools/dcpomatic_kdm.cc:259
-#: src/tools/dcpomatic_player.cc:576 src/tools/dcpomatic_playlist.cc:544
+#: 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"
 
-#: src/tools/dcpomatic_playlist.cc:294
+#: src/tools/dcpomatic_playlist.cc:346
 msgid "Add"
 msgstr "添加"
 
-#: src/tools/dcpomatic_player.cc:527
-#, fuzzy
+#: src/tools/dcpomatic_player.cc:548
 msgid "Add &KDM..."
-msgstr "&添加KDM…"
+msgstr "添加 &KDM..."
 
-#: src/tools/dcpomatic_batch.cc:134
-msgid "Add Film..."
-msgstr "添加工程..."
-
-#: src/tools/dcpomatic_playlist.cc:63
+#: src/tools/dcpomatic_playlist.cc:76
 msgid "Add content"
 msgstr "添加内容"
 
-#: src/tools/dcpomatic_kdm.cc:169
+#: src/tools/dcpomatic_batch.cc:172
+msgid "Add film"
+msgstr "添加影片"
+
+#: src/tools/dcpomatic_batch.cc:172
+msgid "Add film for conversion"
+msgstr "添加影片以转换"
+
+#: src/tools/dcpomatic_kdm.cc:208
 msgid "Add folder..."
 msgstr "添加工程文件夹..."
 
-#: src/tools/dcpomatic_kdm.cc:167
+#: src/tools/dcpomatic_kdm.cc:206
 msgid "Add..."
 msgstr "添加..."
 
-#: src/tools/dcpomatic.cc:1724 src/tools/dcpomatic_kdm.cc:702
-#: src/tools/dcpomatic_player.cc:1228 src/tools/dcpomatic_playlist.cc:656
+#: 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"
@@ -166,17 +187,19 @@ msgstr ""
 "出现未知错误: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1733
-#, fuzzy, c-format
+#: src/tools/dcpomatic.cc:1766
+#, c-format
 msgid ""
 "An exception occurred: %s (%s) (%s)\n"
 "\n"
 msgstr ""
-"出现未知错误: %s (%s).\n"
+"发生异常: %s (%s) (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1743 src/tools/dcpomatic_kdm.cc:711
-#: src/tools/dcpomatic_player.cc:1237 src/tools/dcpomatic_playlist.cc:665
+#: 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"
@@ -185,239 +208,329 @@ msgstr ""
 "出现未知错误: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:341
+#: src/tools/dcpomatic_server.cc:354
 msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "DCP-o-matic 服务出现未知错误。"
 
-#: src/tools/dcpomatic.cc:957 src/tools/dcpomatic.cc:1748
-#: src/tools/dcpomatic_kdm.cc:400 src/tools/dcpomatic_kdm.cc:716
-#: src/tools/dcpomatic_kdm.cc:725 src/tools/dcpomatic_player.cc:1242
-#: src/tools/dcpomatic_playlist.cc:670 src/tools/dcpomatic_playlist.cc:679
+#: 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:732
+#: 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:799
+#: src/tools/dcpomatic.cc:834
 #, c-format
 msgid "Bad setting for %s."
-msgstr "配置错误 %s."
+msgstr "%s的配置错误。"
 
-#: src/tools/dcpomatic_player.cc:554 src/tools/dcpomatic_playlist.cc:275
+#: 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:953 src/tools/dcpomatic_kdm.cc:396
+#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_kdm.cc:465
 msgid "CPL's content is not encrypted."
 msgstr "该CPL未加密."
 
-#: src/tools/dcpomatic.cc:1373 src/tools/dcpomatic_player.cc:570
+#: src/tools/dcpomatic.cc:1385 src/tools/dcpomatic_player.cc:593
 msgid "Check for updates"
 msgstr "检查更新"
 
-#: src/tools/dcpomatic.cc:1832 src/tools/dcpomatic.cc:1849
-#, fuzzy
+#: 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"
+msgstr "关闭 DCP-o-matic"
 
 #: src/tools/dcpomatic.cc:156
 msgid "Close without saving film"
 msgstr "关闭但不保存"
 
-#: src/tools/dcpomatic.cc:1366 src/tools/dcpomatic_player.cc:560
+#: src/tools/dcpomatic.cc:1378 src/tools/dcpomatic_player.cc:583
 msgid "Closed captions..."
 msgstr "隐藏式字幕..."
 
-#: src/tools/dcpomatic.cc:1330
+#: src/tools/dcpomatic_combiner.cc:124
+msgid "Combine"
+msgstr ""
+
+#: 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 ""
+
+#: src/tools/dcpomatic.cc:1334
 msgid "Copy settings\tCtrl-C"
 msgstr "拷贝设置\tCtrl-C"
 
-#: src/tools/dcpomatic.cc:549 src/tools/dcpomatic.cc:558
+#: src/tools/dcpomatic.cc:577 src/tools/dcpomatic.cc:586
 msgid "Could not create folder to store film."
 msgstr "无法创建目录来存储影片."
 
-#: src/tools/dcpomatic_kdm.cc:475
+#: 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:892
+#: 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:907
+#: src/tools/dcpomatic.cc:930
 msgid "Could not find player."
 msgstr "无法找到播放器."
 
-#: src/tools/dcpomatic_player.cc:697 src/tools/dcpomatic_player.cc:1167
+#: src/tools/dcpomatic_batch.cc:475
+msgid ""
+"Could not listen for new batch jobs.  Perhaps another instance of the DCP-o-"
+"matic Batch Converter is running."
+msgstr "未能侦测到新的批量任务。 可能另一个DCP-o-matic批量转换正在运行."
+
+#: src/tools/dcpomatic_player.cc:756 src/tools/dcpomatic_player.cc:1233
 msgid "Could not load DCP %1."
 msgstr "无法载入DCP %1。"
 
-#: src/tools/dcpomatic_player.cc:515
-#, fuzzy, c-format
+#: src/tools/dcpomatic_player.cc:536
+#, c-format
 msgid ""
 "Could not load DCP.\n"
 "\n"
 "%s."
-msgstr "无法载入DCP %1。"
+msgstr ""
+"无法载入 DCP。\n"
+"\n"
+"%s."
 
-#: src/tools/dcpomatic_player.cc:679
+#: src/tools/dcpomatic_player.cc:704
 msgid "Could not load KDM."
 msgstr "无法载入KDM."
 
-#: src/tools/dcpomatic_player.cc:377 src/tools/dcpomatic_player.cc:384
-#: src/tools/dcpomatic_player.cc:386
+#: src/tools/dcpomatic_player.cc:399 src/tools/dcpomatic_player.cc:406
+#: src/tools/dcpomatic_player.cc:408
 #, c-format
 msgid "Could not load a DCP from %s"
 msgstr "无法从 %s 载入DCP"
 
-#: src/tools/dcpomatic_batch.cc:457
+#: src/tools/dcpomatic_batch.cc:491
 msgid "Could not load film %1"
-msgstr "无法载入工程 %1"
+msgstr "无法加载工程 %1"
 
-#: src/tools/dcpomatic.cc:1641
+#: src/tools/dcpomatic.cc:1670
 msgid "Could not load film %1 (%2)"
 msgstr "无法加载工程 %1 (%2)"
 
-#: src/tools/dcpomatic.cc:801
+#: src/tools/dcpomatic.cc:836
 msgid "Could not make DCP."
 msgstr "DCP创建失败."
 
-#: src/tools/dcpomatic.cc:466 src/tools/dcpomatic.cc:471
-#: src/tools/dcpomatic_batch.cc:218
+#: 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:461
+#: src/tools/dcpomatic.cc:497
 msgid "Could not open this folder as a DCP-o-matic project."
-msgstr ""
+msgstr "无法将此文件夹作为DCP-o-matic项目打开。"
 
-#: src/tools/dcpomatic_kdm.cc:480
+#: 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:468
+#: 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。文件可能被损坏或者使用了不兼容的格式."
+msgstr "不能读取KDM。文件可能使用了不兼容的格式，或者并非KDM。"
 
-#: src/tools/dcpomatic.cc:1042
-msgid "Could not run konqueror"
-msgstr "无法运行konqueror"
+#: src/tools/dcpomatic.cc:620
+#, fuzzy
+msgid "Could not save project."
+msgstr "DCP创建失败."
 
-#: src/tools/dcpomatic.cc:1035
-msgid "Could not run nautilus"
-msgstr "无法运行nautilus"
+#: src/tools/dcpomatic.cc:631
+#, fuzzy
+msgid "Could not save template."
+msgstr "无法找到播放器."
 
-#: src/tools/dcpomatic.cc:1042 src/tools/dcpomatic.cc:1051
-msgid "Could not show DCP"
-msgstr "无法显示DCP"
+#: src/tools/dcpomatic.cc:1126
+msgid "Could not send translations"
+msgstr "无法发送翻译"
 
-#: src/tools/dcpomatic.cc:1035
+#: src/tools/dcpomatic.cc:1041
 msgid "Could not show DCP."
 msgstr "无法显示DCP."
 
-#: src/tools/dcpomatic.cc:890
+#: src/tools/dcpomatic.cc:913
 msgid ""
 "Could not start the batch converter.  You may need to download it from "
 "dcpomatic.com."
-msgstr ""
+msgstr "无法启动批处理转换器，你可能需要从dcpomatic.com下载。"
 
-#: src/tools/dcpomatic.cc:905
+#: src/tools/dcpomatic.cc:928
 msgid ""
 "Could not start the player.  You may need to download it from dcpomatic.com."
-msgstr ""
+msgstr "无法启动播放器，你可能需要从dcpomatic.com下载。"
 
-#: src/tools/dcpomatic.cc:1405 src/tools/dcpomatic_batch.cc:329
+#: 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。设置没有被保存。"
+msgstr "不能保存影院数据%s。设置没有被保存。"
 
-#: src/tools/dcpomatic.cc:1417 src/tools/dcpomatic_batch.cc:341
-#: src/tools/dcpomatic_player.cc:918 src/tools/dcpomatic_playlist.cc:565
+#: 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 ""
 "Could not write to config file at %s.  Your changes have not been saved."
 msgstr "不能保存设置%s。设置没有被保存。"
 
-#: src/tools/dcpomatic_player.cc:926
+#: src/tools/dcpomatic_player.cc:991
 msgid "Could not write to config file.  Your changes have not been saved."
 msgstr "不能保存设置到文件。更改没有被保存。"
 
-#: src/tools/dcpomatic_kdm.cc:187
+#: src/tools/dcpomatic_kdm.cc:225
 msgid "Create KDMs"
-msgstr "创建KDMs"
+msgstr "创建KDM"
 
-#: src/tools/dcpomatic.cc:523 src/tools/dcpomatic.cc:1579
-#: src/tools/dcpomatic.cc:1620
+#: 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"
 
-#: src/tools/dcpomatic_batch.cc:397 src/tools/dcpomatic_batch.cc:433
+#: src/tools/dcpomatic_batch.cc:427 src/tools/dcpomatic_batch.cc:463
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic 批量转换"
 
-#: src/tools/dcpomatic_server.cc:146
+#: src/tools/dcpomatic_combiner.cc:178 src/tools/dcpomatic_combiner.cc:222
+#: src/tools/dcpomatic_combiner.cc:256
+#, fuzzy
+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:636 src/tools/dcpomatic_kdm.cc:670
+#: src/tools/dcpomatic_kdm.cc:811 src/tools/dcpomatic_kdm.cc:845
 msgid "DCP-o-matic KDM Creator"
-msgstr "DCP-o-matic KMD 创建器"
+msgstr "DCP-o-matic KDM 创建器"
 
-#: src/tools/dcpomatic_player.cc:141 src/tools/dcpomatic_player.cc:369
-#: src/tools/dcpomatic_player.cc:644 src/tools/dcpomatic_player.cc:830
-#: src/tools/dcpomatic_player.cc:1108
+#: src/tools/dcpomatic_player.cc:197 src/tools/dcpomatic_player.cc:388
+#: src/tools/dcpomatic_player.cc:670 src/tools/dcpomatic_player.cc:901
+#: src/tools/dcpomatic_player.cc:1174
 msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic 播放器"
 
-#: src/tools/dcpomatic_player.cc:1190
+#: src/tools/dcpomatic_player.cc:1256
 msgid "DCP-o-matic Player could not start."
 msgstr "DCP-o-matic 播放器无法启动."
 
-#: src/tools/dcpomatic_playlist.cc:597 src/tools/dcpomatic_playlist.cc:631
+#: src/tools/dcpomatic_playlist.cc:645 src/tools/dcpomatic_playlist.cc:679
 msgid "DCP-o-matic Playlist Editor"
 msgstr "DCP-o-matic 播放列表编辑器"
 
-#: src/tools/dcpomatic_kdm.cc:687 src/tools/dcpomatic_playlist.cc:643
+#: 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_kdm.cc:158
+#: src/tools/dcpomatic_combiner.cc:188
+msgid "DCPs combined successfully."
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:167
 msgid "DKDM"
 msgstr "DKDM"
 
-#: src/tools/dcpomatic_player.cc:563
+#: src/tools/dcpomatic_player.cc:586
 msgid "Decode at full resolution"
 msgstr "全分辨率解码"
 
-#: src/tools/dcpomatic_player.cc:564
+#: src/tools/dcpomatic_player.cc:587
 msgid "Decode at half resolution"
 msgstr "半分辨率解码"
 
-#: src/tools/dcpomatic_player.cc:565
+#: src/tools/dcpomatic_player.cc:588
 msgid "Decode at quarter resolution"
 msgstr "四分之一分辨率解码"
 
-#: src/tools/dcpomatic_playlist.cc:121
+#: src/tools/dcpomatic_playlist.cc:136
 msgid "Delete"
+msgstr "删除"
+
+#: 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:1818
+#: src/tools/dcpomatic.cc:1847 src/tools/dcpomatic.cc:1862
 msgid "Do nothing"
+msgstr "什么都不做"
+
+#: 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:786
+#: src/tools/dcpomatic.cc:821
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
 msgstr "真的要覆盖已经存在的DCP %s 吗？"
@@ -426,228 +539,302 @@ msgstr "真的要覆盖已经存在的DCP %s 吗？"
 msgid "Don't close"
 msgstr "取消"
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:184
 msgid "Don't duplicate"
 msgstr "取消复制"
 
-#: src/tools/dcpomatic_playlist.cc:293
+#: src/tools/dcpomatic_playlist.cc:345
 msgid "Down"
 msgstr "下"
 
-#: src/tools/dcpomatic_player.cc:557
+#: 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:609 src/tools/dcpomatic.cc:624
+#: src/tools/dcpomatic.cc:638 src/tools/dcpomatic.cc:654
 msgid "Duplicate Film"
 msgstr "复制工程"
 
-#: src/tools/dcpomatic.cc:1312
+#: src/tools/dcpomatic.cc:1314
 msgid "Duplicate and open..."
 msgstr "复制工程并打开..."
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:184
 msgid "Duplicate without saving film"
 msgstr "复制项目但不保存"
 
-#: src/tools/dcpomatic.cc:1311
+#: src/tools/dcpomatic.cc:1313
 msgid "Duplicate..."
 msgstr "复制…"
 
-#: src/tools/dcpomatic.cc:1371 src/tools/dcpomatic_batch.cc:92
+#: 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 "查看编码服务器..."
 
-#: src/tools/dcpomatic_playlist.cc:277
+#: src/tools/dcpomatic_playlist.cc:329
 msgid "Encrypted"
 msgstr "加密的"
 
-#: src/tools/dcpomatic.cc:1351
-#, fuzzy
+#: src/tools/dcpomatic_editor.cc:83
+msgid "Entry point"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1391
+msgid "Export preferences..."
+msgstr "导出首选项设置..."
+
+#: src/tools/dcpomatic.cc:1363
 msgid "Export subtitles..."
-msgstr "导出...\tCtrl+E"
+msgstr "导出字幕..."
 
-#: src/tools/dcpomatic.cc:1350
-#, fuzzy
+#: src/tools/dcpomatic.cc:1362
 msgid "Export video file...\tCtrl-E"
-msgstr "导出...\tCtrl+E"
+msgstr "导出视频文件...\tCtrl-E"
 
-#: src/tools/dcpomatic_kdm.cc:173
-#, fuzzy
+#: src/tools/dcpomatic_kdm.cc:212
 msgid "Export..."
-msgstr "导出...\tCtrl+E"
+msgstr "导出..."
 
-#: src/tools/dcpomatic.cc:982 src/tools/dcpomatic_kdm.cc:276
+#: 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:151 src/tools/dcpomatic.cc:188
+#. 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_server.cc:157
+#: 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 "帧率"
 
-#: src/tools/dcpomatic_player.cc:556
+#: src/tools/dcpomatic_player.cc:579
 msgid "Full screen\tF11"
 msgstr "全屏\tF11"
 
-#: src/tools/dcpomatic.cc:1370
+#: src/tools/dcpomatic.cc:1382
 msgid "Hints..."
 msgstr "提示..."
 
-#: src/tools/dcpomatic.cc:462
+#: src/tools/dcpomatic_combiner.cc:101
+msgid "Input DCP"
+msgstr ""
+
+#: 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 "
 "-> New and then click the \"Add DCP...\" button."
 msgstr ""
+"您正在尝试打开一个DCP，文件->打开是用于加载DCP-o-matic项目的，而不是DCP本"
+"身。 要导入DCP，请使用文件->新建以新建一个新项目，然后单击“添加DCP …”按钮。"
 
-#. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:152
+#. TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
+#: src/tools/dcpomatic_kdm.cc:161
 msgid "KDM|Timing"
-msgstr "KDM有效期"
+msgstr "KDM|有效期"
 
-#: src/tools/dcpomatic_playlist.cc:116
+#: src/tools/dcpomatic_playlist.cc:131
 msgid "Length"
-msgstr ""
+msgstr "长度"
 
-#: src/tools/dcpomatic_player.cc:369 src/tools/dcpomatic_player.cc:644
+#: src/tools/dcpomatic_player.cc:388 src/tools/dcpomatic_player.cc:670
 msgid "Loading content"
 msgstr "正在载入内容"
 
-#: src/tools/dcpomatic.cc:1347
-#, fuzzy
+#: src/tools/dcpomatic.cc:1358
 msgid "Make &DKDMs...\tCtrl-D"
-msgstr "制作 KDM \tCtrl+K"
+msgstr "制作 &DKDM...\tCtrl-D"
 
-#: src/tools/dcpomatic.cc:1346
+#: src/tools/dcpomatic.cc:1356
 msgid "Make &KDMs...\tCtrl-K"
-msgstr "制作 KDM \tCtrl+K"
+msgstr "制作 &KDM \tCtrl+K"
 
-#: src/tools/dcpomatic.cc:1344
+#: src/tools/dcpomatic.cc:1353
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "批量制作DCP\tCtrl+B"
 
-#: src/tools/dcpomatic.cc:1348
+#: src/tools/dcpomatic.cc:1359
 msgid "Make DKDM for DCP-o-matic..."
 msgstr "制作DCP-o-matic的KDM..."
 
-#: src/tools/dcpomatic.cc:1372
+#: src/tools/dcpomatic.cc:1384
 msgid "Manage templates..."
 msgstr "管理模板…"
 
-#: src/tools/dcpomatic_playlist.cc:115 src/tools/dcpomatic_playlist.cc:274
+#: src/tools/dcpomatic_playlist.cc:130 src/tools/dcpomatic_playlist.cc:326
 msgid "Name"
 msgstr "名称"
 
-#: src/tools/dcpomatic_playlist.cc:119
+#: src/tools/dcpomatic_playlist.cc:134
 msgid "New"
-msgstr ""
+msgstr "新建"
 
-#: src/tools/dcpomatic.cc:533
+#: src/tools/dcpomatic.cc:558
 msgid "New Film"
-msgstr "新建工程"
+msgstr "新建影片"
 
-#: src/tools/dcpomatic_playlist.cc:209
-#, fuzzy
+#: src/tools/dcpomatic_playlist.cc:246
 msgid "New Playlist"
-msgstr "保存播放列表"
+msgstr "新建播放列表"
 
 #: src/tools/dcpomatic.cc:1305
 msgid "New...\tCtrl-N"
-msgstr "新建工程\tCtrl+N"
+msgstr "新建工程...\tCtrl+N"
 
-#: src/tools/dcpomatic_playlist.cc:522
+#: 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 ""
+msgstr "首选项中未指定播放列表文件夹，请设置一个，然后重试。"
 
-#: src/tools/dcpomatic.cc:1363
+#: src/tools/dcpomatic.cc:1375
 msgid "Open DCP in &player"
-msgstr "打开并使用播放器播放DCP"
+msgstr "在播放器中打开DCP"
+
+#: src/tools/dcpomatic_editor.cc:276
+msgid "Open a DCP using File -> Open"
+msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:180
+#: src/tools/dcpomatic_kdm.cc:219
 msgid "Output"
 msgstr "输出"
 
-#: src/tools/dcpomatic.cc:1331
+#: src/tools/dcpomatic_combiner.cc:120
+msgid "Output DCP folder"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1336
 msgid "Paste settings...\tCtrl-V"
-msgstr "黏贴设置....\tCtrl+V"
+msgstr "粘贴设置...\tCtrl+V"
+
+#: src/tools/dcpomatic_batch.cc:173
+msgid "Pause or resume conversion"
+msgstr "暂停/继续转换"
 
-#: src/tools/dcpomatic_batch.cc:137
-msgid "Pause"
-msgstr "暂停"
+#: src/tools/dcpomatic_batch.cc:173
+msgid "Pause/resume"
+msgstr "暂停/继续"
 
-#: src/tools/dcpomatic.cc:554
+#: 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."
-msgstr ""
+msgstr "请检查您是否没有为DCP-o-matic启用Windows控制的文件夹访问权限。"
 
-#: src/tools/dcpomatic_playlist.cc:361
+#: src/tools/dcpomatic_playlist.cc:423
 msgid "Question|N"
 msgstr "问题|N"
 
-#: src/tools/dcpomatic_playlist.cc:361
+#: src/tools/dcpomatic_playlist.cc:423
 msgid "Question|Y"
 msgstr "问题|Y"
 
-#: src/tools/dcpomatic.cc:1844
+#: src/tools/dcpomatic.cc:1884
 msgid "Recreate KDM decryption chain"
-msgstr ""
+msgstr "重新创建KDM解密链"
 
-#: src/tools/dcpomatic.cc:1814 src/tools/dcpomatic.cc:1828
+#: src/tools/dcpomatic.cc:1843 src/tools/dcpomatic.cc:1858
+#: src/tools/dcpomatic.cc:1870
 msgid "Recreate signing certificates"
+msgstr "重新创建签名证书"
+
+#: src/tools/dcpomatic_editor.cc:213
+msgid "Reels"
 msgstr ""
 
-#: src/tools/dcpomatic_kdm.cc:171 src/tools/dcpomatic_playlist.cc:295
+#: src/tools/dcpomatic_disk.cc:151
+msgid "Refresh"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1696
+msgid "Release notes"
+msgstr "发行说明"
+
+#: src/tools/dcpomatic_kdm.cc:210 src/tools/dcpomatic_playlist.cc:347
 msgid "Remove"
 msgstr "移除"
 
-#: src/tools/dcpomatic.cc:1385 src/tools/dcpomatic_kdm.cc:263
-#: src/tools/dcpomatic_player.cc:580
+#: 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:733 src/tools/dcpomatic.cc:1377
+#: src/tools/dcpomatic.cc:761 src/tools/dcpomatic.cc:1389
 msgid "Restore default preferences"
 msgstr "恢复默认设置"
 
-#: src/tools/dcpomatic_batch.cc:140
-msgid "Resume"
-msgstr "继续"
-
-#: src/tools/dcpomatic.cc:1358
-#, fuzzy
+#: src/tools/dcpomatic.cc:1370
 msgid "S&how DCP in Explorer"
-msgstr "&查看DCP"
+msgstr "&在资源管理器中显示 DCP"
 
-#: src/tools/dcpomatic.cc:1360
-#, fuzzy
+#: src/tools/dcpomatic.cc:1372
 msgid "S&how DCP in Files"
-msgstr "&查看DCP"
+msgstr "&查看DCP文件"
 
-#: src/tools/dcpomatic.cc:1356
-#, fuzzy
+#: src/tools/dcpomatic.cc:1368
 msgid "S&how DCP in Finder"
-msgstr "&查看DCP"
+msgstr "&在Finder中查看DCP"
+
+#: src/tools/dcpomatic_playlist.cc:316
+msgid "Save"
+msgstr "保存"
 
-#: src/tools/dcpomatic.cc:1310
+#: src/tools/dcpomatic.cc:1312
+#, fuzzy
 msgid "Save as &template..."
 msgstr "保存为模板…"
 
 #: src/tools/dcpomatic.cc:148
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
-msgstr "是否保存 \"%s\" ?"
+msgstr "关闭前是否保存 \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:185
+#: src/tools/dcpomatic.cc:176
 #, c-format
 msgid "Save changes to film \"%s\" before duplicating?"
 msgstr "复制前是否保存 \"%s\" ?"
@@ -656,60 +843,82 @@ msgstr "复制前是否保存 \"%s\" ?"
 msgid "Save film and close"
 msgstr "保存并关闭"
 
-#: src/tools/dcpomatic.cc:193
+#: src/tools/dcpomatic.cc:184
 msgid "Save film and duplicate"
 msgstr "保存并复制"
 
-#: src/tools/dcpomatic_kdm.cc:145
+#: src/tools/dcpomatic_player.cc:714
+msgid "Save frame to file"
+msgstr "保存场景（帧）到文件"
+
+#: src/tools/dcpomatic_kdm.cc:154
 msgid "Screens"
-msgstr "厅放映服务器"
+msgstr "影厅放映服务器（屏幕）"
 
-#: src/tools/dcpomatic_player.cc:598
+#: src/tools/dcpomatic_editor.cc:365 src/tools/dcpomatic_player.cc:621
 msgid "Select DCP to open"
 msgstr "选择打开DCP"
 
-#: src/tools/dcpomatic_player.cc:623
+#: src/tools/dcpomatic_player.cc:649
 msgid "Select DCP to open as OV"
 msgstr "选择DCP作为OV打开"
 
-#: src/tools/dcpomatic_kdm.cc:585
-#, fuzzy
+#: src/tools/dcpomatic_kdm.cc:744
 msgid "Select DKDM File"
-msgstr "选择DKDM文件"
+msgstr "选择 DKDM 文件"
 
-#: src/tools/dcpomatic_kdm.cc:448
+#: src/tools/dcpomatic_kdm.cc:541
 msgid "Select DKDM file"
-msgstr "选择DKDM文件"
+msgstr "选择 DKDM 文件"
 
-#: src/tools/dcpomatic_player.cc:665
+#: src/tools/dcpomatic_player.cc:690
 msgid "Select KDM"
 msgstr "选择KDM"
 
-#: src/tools/dcpomatic.cc:1333
+#: src/tools/dcpomatic.cc:1339
 msgid "Select all\tShift-Ctrl-A"
-msgstr ""
+msgstr "选择所有\tShift-Ctrl-A"
 
-#: src/tools/dcpomatic.cc:570 src/tools/dcpomatic_batch.cc:295
+#: src/tools/dcpomatic_batch.cc:329 src/tools/dcpomatic.cc:595
 msgid "Select film to open"
 msgstr "选择打开工程文件"
 
-#: src/tools/dcpomatic_kdm.cc:383
+#: src/tools/dcpomatic_kdm.cc:445
 msgid "Send KDM emails"
-msgstr "发送KDM电子邮件"
+msgstr "通过电子邮件发送KDM"
 
-#: src/tools/dcpomatic.cc:1374
+#: src/tools/dcpomatic.cc:1386
 msgid "Send translations..."
-msgstr "发送翻译……"
+msgstr "发送翻译..."
 
-#: src/tools/dcpomatic_player.cc:562
+#: src/tools/dcpomatic_player.cc:585
 msgid "Set decode resolution to match display"
-msgstr "将解码分辨率设置为适应屏幕分辨率"
+msgstr "将解码分辨率设置为适应屏幕"
 
-#: src/tools/dcpomatic.cc:1375 src/tools/dcpomatic_player.cc:572
-msgid "System information..."
+#: 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.cc:756
+#: src/tools/dcpomatic_editor.cc:169
+msgid "Sound"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:773
+msgid "Specify ZIP file"
+msgstr "指定ZIP文件"
+
+#: 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:793
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f GB, and "
@@ -717,10 +926,10 @@ msgid ""
 "as much space if the filesystem supported hard links, but it does not.  Do "
 "you want to continue anyway?"
 msgstr ""
-"创造该DCP包时大约需要缓存空间 %.1f GB，您当前可用磁盘空间只有 %.1f GB。DCP-o-"
-"matic工作至少需要2倍的空间来继续。您是否仍然继续?"
+"创建该DCP包时大约需要 %.1f GB的缓存空间，而您当前的可用磁盘空间只有 %.1f GB。"
+"如果文件系统支持硬链接则只需一半的空间即可，但它并不支持。您是否仍然继续?"
 
-#: src/tools/dcpomatic.cc:754
+#: 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 "
@@ -729,11 +938,11 @@ msgstr ""
 "该DCP在创建中将占用约 %.1f GB, 您正在使用的磁盘只有 %.1f GB可用。您是否仍然继"
 "ç»­?"
 
-#: src/tools/dcpomatic.cc:1479 src/tools/dcpomatic_player.cc:900
+#: 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下载服务器失败."
 
-#: src/tools/dcpomatic_batch.cc:207
+#: src/tools/dcpomatic_batch.cc:244
 #, c-format
 msgid ""
 "The DCPs for this film and the films already in the queue will take up about "
@@ -743,11 +952,28 @@ msgstr ""
 "该DCP在创建中将占用约 %.1f GB, 您正在使用的磁盘只有 %.1f GB可用。您是否仍然要"
 "把影片添加到队列中?"
 
-#: src/tools/dcpomatic_player.cc:299
+#: src/tools/dcpomatic_player.cc:345
 msgid "The KDM does not allow playback of this content at this time."
 msgstr "这个KDM不允许在现在这个时间播放这个内容."
 
-#: src/tools/dcpomatic.cc:1845
+#: 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"
@@ -757,8 +983,12 @@ msgid ""
 "and back up your\n"
 "configuration before continuing."
 msgstr ""
+"DCP-o-matic用于解密KDM的证书链不一致，无法被使用。\n"
+"除非您重新创建它，否则DCP-o-matic将无法运行。\n"
+"您是否希望重新创建解密KDM所用的证书链？ 您可能需要先选择“否”并在继续之前\n"
+"先备份您的配置。"
 
-#: src/tools/dcpomatic.cc:1815
+#: src/tools/dcpomatic.cc:1844
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs "
 "contains a small error\n"
@@ -766,8 +996,23 @@ msgid ""
 "you want to re-create\n"
 "the certificate chain for signing DCPs and KDMs?"
 msgstr ""
+"DCP-o-matic用于签署DCP和KDMs的证书链错误\n"
+"这将使得一些系统无法准确验证DCP。\n"
+"您需要重新创建签署DCPs和KDMs的证书链吗？"
 
-#: src/tools/dcpomatic.cc:1829
+#: src/tools/dcpomatic.cc:1859
+msgid ""
+"The certificate chain that DCP-o-matic uses for signing DCPs and KDMs has a "
+"validity period\n"
+"that is too long.  This will cause problems playing back DCPs on some "
+"systems.\n"
+"Do you want to re-create the certificate chain for signing DCPs and KDMs?"
+msgstr ""
+"DCP-o-matic用于签署DCP和KDMs的证书链具有时长过长的有效期，\n"
+"这将导致在某些系统上回放DCP时出现问题。\n"
+"您需要重新创建签署DCPs和KDMs的证书链吗？"
+
+#: src/tools/dcpomatic.cc:1871
 msgid ""
 "The certificate chain that DCP-o-matic uses for signing DCPs and KDMs is "
 "inconsistent and\n"
@@ -775,74 +1020,106 @@ msgid ""
 "want to re-create\n"
 "the certificate chain for signing DCPs and KDMs?"
 msgstr ""
+"DCP-o-matic用于签署DCP和KDMs的证书链不一致且\n"
+"不能使用。除非重新创建，否则DCP-o-matic无法运行。\n"
+"您想重新创建签署DCPs和KDMs的证书链吗？"
+
+#: 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.cc:1790 src/tools/dcpomatic_batch.cc:489
-#: src/tools/dcpomatic_kdm.cc:735 src/tools/dcpomatic_server.cc:353
-#: src/tools/dcpomatic_player.cc:1266
+#: 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:1481 src/tools/dcpomatic_player.cc:902
+#: 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:1157 src/tools/dcpomatic_batch.cc:237
+#: 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:444
+#: 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."
-msgstr "老版本中创建的工程无法在高于创建版本中被打开，具体请参考设置."
+msgstr ""
+"老版本DVD-o-matic中创建的工程无法在高于创建版本中被打开，具体请参考设置."
 
-#: src/tools/dcpomatic_player.cc:379
+#: src/tools/dcpomatic_player.cc:401
 msgid ""
 "This looks like a DCP-o-matic project folder, which cannot be loaded into "
-"the player.  Choose the DCP directory inside the DCP-o-matic project folder "
-"if that's what you want to play."
+"the player.  Choose the DCP folder inside the DCP-o-matic project folder if "
+"that's what you want to play."
 msgstr ""
+"这似乎是DCP-o-matic项目文件夹，播放器无法加载。如果要播放，请选择DCP-o-matic"
+"项目文件夹中的DCP目录。"
 
-#: src/tools/dcpomatic_player.cc:571
-#, fuzzy
+#: src/tools/dcpomatic_player.cc:594
 msgid "Timing..."
-msgstr "KDM有效期"
+msgstr "计时..."
 
-#: src/tools/dcpomatic.cc:552
+#: 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 字符移除."
+msgstr "尝试将文件夹名中的 %s 字符移除."
 
-#: src/tools/dcpomatic_playlist.cc:276
+#: src/tools/dcpomatic_playlist.cc:328
 msgid "Type"
 msgstr "类型"
 
-#: src/tools/dcpomatic.cc:1158 src/tools/dcpomatic_batch.cc:238
+#: src/tools/dcpomatic_batch.cc:275 src/tools/dcpomatic.cc:1154
+#: src/tools/dcpomatic_disk.cc:255
 msgid "Unfinished jobs"
 msgstr "未完成的进程"
 
-#: src/tools/dcpomatic_playlist.cc:292
+#: src/tools/dcpomatic_disk.cc:114
+msgid "Uninstall..."
+msgstr ""
+
+#: src/tools/dcpomatic_playlist.cc:344
 msgid "Up"
 msgstr "上"
 
-#: src/tools/dcpomatic_player.cc:568
-#, fuzzy
+#: src/tools/dcpomatic_player.cc:591
 msgid "Verify DCP..."
-msgstr "验证DCP"
+msgstr "验证 DCP..."
 
-#: src/tools/dcpomatic.cc:1367
+#: src/tools/dcpomatic.cc:1379
 msgid "Video waveform..."
-msgstr "视频示波器..."
+msgstr "视频波形……"
 
-#: src/tools/dcpomatic_kdm.cc:560
+#: 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?"
 msgstr ""
+"您将删除当前DKDM，这会导致以后无法解密对应的DCP，并且无法找回DKDM。您确定要删"
+"除吗？"
 
-#: src/tools/dcpomatic.cc:928
+#: src/tools/dcpomatic.cc:950
 #, c-format
 msgid ""
 "You are making a DKDM which is encrypted by a private key held in\n"
@@ -853,22 +1130,23 @@ msgid ""
 "you <span weight=\"bold\" size=\"larger\">BACK UP THIS FILE</span> since if "
 "it is lost your DKDMs (and the DCPs they protect) will become useless."
 msgstr ""
-"您已经制作了一个数字母版文件，私人秘钥private key保存在\n"
+"您已经制作了一个通过私人密钥（private key）加密的DKDM，私人秘钥private key保"
+"存在\n"
 "\n"
 "<tt>%s</tt>\n"
 "\n"
 "这个文件 <span weight=\"bold\" size=\"larger\">非常重要</span> 请务必 <span "
-"weight=\"bold\" size=\"larger\">备份这个文件</span> 如果丢失，您的数字模板文"
-"件（包括生成的DCP包）将无法使用。"
+"weight=\"bold\" size=\"larger\">备份这个文件</span> 如果丢失，您的DKDM（包括"
+"生成的DCP包）将无法使用。"
 
-#: src/tools/dcpomatic.cc:776
+#: 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 "
 "film and the metadata files within the DCP.\n"
 "\n"
-"You should ensure that these files are <span weight=\"bold\" size=\"larger"
-"\">BACKED UP</span> if you want to make KDMs for this film."
+"You should ensure that these files are <span weight=\"bold\" "
+"size=\"larger\">BACKED UP</span> if you want to make KDMs for this film."
 msgstr ""
 "您已经制作了一个加密的DCP.  您不能生成KDM文件除非您备份下列文件 <tt>metadata."
 "xml</tt> \n"
@@ -876,21 +1154,81 @@ msgstr ""
 "请在生成KDM之前再次确认已经 <span weight=\"bold\" size=\"larger\">备份</"
 "span> 该文件。"
 
-#: src/tools/dcpomatic.cc:1628
+#: 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 "
 "errors.  You are strongly advised to install the 64-bit version of DCP-o-"
 "matic."
 msgstr ""
+"您正在Windows的64位系统中使用32位dcp-o-matic的版本。这会限制dcp-o-matic可用的"
+"内存，并且可能导致报错。强烈建议您安装64位dcp-o-matic的版本。"
 
-#: src/tools/dcpomatic.cc:579 src/tools/dcpomatic_batch.cc:304
-#: src/tools/dcpomatic_player.cc:604 src/tools/dcpomatic_player.cc:632
+#: 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: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."
+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 "暂停"
+
+#~ msgid "Resume"
+#~ msgstr "继续"
+
+#~ msgid "Could not run konqueror"
+#~ msgstr "无法运行konqueror"
+
+#~ msgid "Could not show DCP"
+#~ msgstr "无法显示DCP"
+
+#~ msgid ""
+#~ "The player is dropping a lot of frames, so playback may not be accurate.\n"
+#~ "\n"
+#~ "<b>This does not necessarily mean that the DCP you are playing is "
+#~ "defective!</b>\n"
+#~ "\n"
+#~ "You may be able to improve player performance by:\n"
+#~ "• choosing 'decode at half resolution' or 'decode at quarter resolution' "
+#~ "from the View menu\n"
+#~ "• using a more powerful computer.\n"
+#~ msgstr ""
+#~ "播放器丢帧很严重，因此播放可能不准确。\n"
+#~ "<b> 这并不一定就是当前DCP有问题!</b>\n"
+#~ "您可以通过以下方式减少丢帧率:\n"
+#~ "• 从视图菜单中选择 “半分辨率解码” 或 “四分之一分辨率解码”\n"
+#~ "• 使用配置更高的计算机。\n"
+
 #~ msgid "The lock file is not present."
 #~ msgstr "锁定文件不存在."
 
@@ -909,9 +1247,6 @@ msgstr "您没有选择文件夹。请确保您单击打开之前，选择一个
 #~ msgid "Scale to fit &width"
 #~ msgstr "缩放到合适宽度"
 
-#~ msgid "DCP"
-#~ msgstr "DCP"
-
 #~ msgid "Disable timeline"
 #~ msgstr "禁用时间线"
 
@@ -939,14 +1274,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..."
 
@@ -964,9 +1291,6 @@ msgstr "您没有选择文件夹。请确保您单击打开之前，选择一个
 #~ "Ha ocurrido una excepción desconocida. Por favor informe del problema al "
 #~ "creador de DCP-o-matic (carl@dcpomatic.com)"
 
-#~ msgid "&Save"
-#~ msgstr "&Guardar"
-
 #~ msgid ""
 #~ "(C) 2012-2013 Carl Hetherington, Terrence Meiczinger, Paul Davis, Ole "
 #~ "Laursen"