pot/merge.

1 files changed, 240 insertions, 54 deletions

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index 469764c8e..b97af29c1 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-03-29 01:43+0200\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,6 +24,11 @@ msgstr ""
 "X-Generator: Poedit 3.2.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
+#: 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"
@@ -50,27 +55,27 @@ msgstr "关闭(&C)"
 msgid "&Close\tCtrl-W"
 msgstr "关闭(&C)\tCtrl+W"
 
-#: src/tools/dcpomatic.cc:1402 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:1327 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:1401 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:1406 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)"
 
@@ -82,25 +87,26 @@ msgstr "任务(&J)"
 msgid "&Make DCP\tCtrl-M"
 msgstr "创建 DCP(&M)\tCtrl+M"
 
-#: src/tools/dcpomatic.cc:1307 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:1342 src/tools/dcpomatic.cc:1346
 #: 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 "设置(&P)...\tCtrl+P"
 
-#: src/tools/dcpomatic.cc:1329 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:1310
+#: src/tools/dcpomatic.cc:1310 src/tools/dcpomatic_editor.cc:343
 msgid "&Save\tCtrl-S"
 msgstr "保存(&S)\tCtrl+S"
 
@@ -112,7 +118,7 @@ msgstr "保存场景（帧）到文件...\tCtrl-S"
 msgid "&Send DCP to TMS"
 msgstr "发送 DCP 到 TMS(&S)"
 
-#: src/tools/dcpomatic.cc:1405 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)"
@@ -129,14 +135,15 @@ msgstr "<b>播放列表：</b>"
 msgid "<b>Playlists</b>"
 msgstr "<b>播放列表</b>"
 
-#: src/tools/dcpomatic.cc:1397 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:1395 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:1757 src/tools/dcpomatic_kdm.cc:877
-#: 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"
@@ -187,8 +196,10 @@ msgstr ""
 "发生异常: %s (%s) (%s)\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1776 src/tools/dcpomatic_kdm.cc:886
-#: 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"
@@ -202,12 +213,19 @@ msgid "An unknown error has occurred with the DCP-o-matic server."
 msgstr "DCP-o-matic 服务出现未知错误。"
 
 #: src/tools/dcpomatic.cc:986 src/tools/dcpomatic.cc:1781
-#: 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
+#: 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_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 "
@@ -219,7 +237,8 @@ msgstr "确定要恢复默认设置？ 该操作不能撤销."
 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"
 
@@ -231,6 +250,10 @@ msgstr "该CPL未加密."
 msgid "Check for updates"
 msgstr "检查更新"
 
+#: 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"
@@ -243,6 +266,22 @@ msgstr "关闭但不保存"
 msgid "Closed captions..."
 msgstr "隐藏式字幕..."
 
+#: 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"
@@ -313,8 +352,8 @@ msgstr "无法加载工程 %1 (%2)"
 msgid "Could not make DCP."
 msgstr "DCP创建失败."
 
-#: src/tools/dcpomatic.cc:502 src/tools/dcpomatic.cc:507
-#: 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 打开工程"
@@ -364,13 +403,13 @@ msgid ""
 "Could not start the player.  You may need to download it from dcpomatic.com."
 msgstr "无法启动播放器，你可能需要从dcpomatic.com下载。"
 
-#: src/tools/dcpomatic.cc:1419 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:1431 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 ""
@@ -385,6 +424,14 @@ msgstr "不能保存设置到文件。更改没有被保存。"
 msgid "Create KDMs"
 msgstr "创建KDM"
 
+#: 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"
@@ -394,6 +441,29 @@ 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
+#, 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 编码服务器"
@@ -420,6 +490,10 @@ msgstr "DCP-o-matic 播放列表编辑器"
 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"
@@ -440,10 +514,22 @@ msgstr "四分之一分辨率解码"
 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: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:821
 #, c-format
 msgid "Do you want to overwrite the existing DCP %s?"
@@ -461,6 +547,10 @@ 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"
@@ -481,7 +571,15 @@ msgstr "复制项目但不保存"
 msgid "Duplicate..."
 msgstr "复制…"
 
-#: src/tools/dcpomatic.cc:1383 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 "查看编码服务器..."
 
@@ -489,6 +587,10 @@ msgstr "查看编码服务器..."
 msgid "Encrypted"
 msgstr "加密的"
 
+#: src/tools/dcpomatic_editor.cc:83
+msgid "Entry point"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1391
 msgid "Export preferences..."
 msgstr "导出首选项设置..."
@@ -540,6 +642,18 @@ msgstr "全屏\tF11"
 msgid "Hints..."
 msgstr "提示..."
 
+#: 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-"
@@ -602,6 +716,12 @@ msgstr "新建播放列表"
 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 "
@@ -612,10 +732,18 @@ msgstr "首选项中未指定播放列表文件夹，请设置一个，然后重
 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_combiner.cc:120
+msgid "Output DCP folder"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1336
 msgid "Paste settings...\tCtrl-V"
 msgstr "粘贴设置...\tCtrl+V"
@@ -628,6 +756,10 @@ msgstr "暂停/继续转换"
 msgid "Pause/resume"
 msgstr "暂停/继续"
 
+#: 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 "
@@ -651,6 +783,14 @@ msgstr "重新创建KDM解密链"
 msgid "Recreate signing certificates"
 msgstr "重新创建签名证书"
 
+#: 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 "发行说明"
@@ -715,7 +855,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"
 
@@ -739,7 +879,7 @@ msgstr "选择KDM"
 msgid "Select all\tShift-Ctrl-A"
 msgstr "选择所有\tShift-Ctrl-A"
 
-#: src/tools/dcpomatic.cc:595 src/tools/dcpomatic_batch.cc:329
+#: src/tools/dcpomatic_batch.cc:329 src/tools/dcpomatic.cc:595
 msgid "Select film to open"
 msgstr "选择打开工程文件"
 
@@ -762,10 +902,18 @@ msgid ""
 "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_editor.cc:172
+msgid "Subtitle"
+msgstr ""
+
 #: src/tools/dcpomatic.cc:1387 src/tools/dcpomatic_player.cc:595
 msgid "System information..."
 msgstr "系统信息…"
@@ -876,7 +1024,24 @@ 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."
@@ -886,7 +1051,8 @@ msgstr "现有配置文件损坏，系统将会使用默认的配置文件，请
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "DCP-o-matic 没有新的版本。"
 
-#: src/tools/dcpomatic.cc:1153 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 "有未完成的操作，确定退出吗？"
 
@@ -910,6 +1076,11 @@ msgstr ""
 msgid "Timing..."
 msgstr "计时..."
 
+#: 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."
@@ -919,10 +1090,15 @@ msgstr "尝试将文件夹名中的 %s 字符移除."
 msgid "Type"
 msgstr "类型"
 
-#: src/tools/dcpomatic.cc:1154 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 "上"
@@ -988,8 +1164,21 @@ msgstr ""
 "您正在Windows的64位系统中使用32位dcp-o-matic的版本。这会限制dcp-o-matic可用的"
 "内存，并且可能导致报错。强烈建议您安装64位dcp-o-matic的版本。"
 
-#: src/tools/dcpomatic.cc:604 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."
@@ -1003,6 +1192,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 "暂停"
 
@@ -1050,9 +1247,6 @@ msgstr ""
 #~ msgid "Scale to fit &width"
 #~ msgstr "缩放到合适宽度"
 
-#~ msgid "DCP"
-#~ msgstr "DCP"
-
 #~ msgid "Disable timeline"
 #~ msgstr "禁用时间线"
 
@@ -1080,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..."