X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fpo%2Fzh_CN.po;h=245cf04b86675a718eeb16ba0429a0ef32b97de3;hb=34f4731ae732f2d4ae00152c0fb26da16458582f;hp=afd4f4086b7e9daf1f92c70171e3cc1f5a520056;hpb=77a0c8bc0f2fb4de080a3301205bb385b0ebddf1;p=dcpomatic.git

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index afd4f4086..245cf04b8 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -7,118 +7,145 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-14 20:35+0100\n"
-"PO-Revision-Date: 2016-03-27 22:12+0800\n"
-"Last-Translator: Rov(若文)\n"
-"Language-Team: Rov(若文) <lojy2009@qq.com>\n"
+"POT-Creation-Date: 2018-01-17 00:30+0000\n"
+"PO-Revision-Date: 2017-07-23 10:07+0800\n"
+"Last-Translator: Hanyuan\n"
+"Language-Team: Hanyuan\n"
 "Language: zh\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.6\n"
+"X-Generator: Poedit 2.0.2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: src/tools/dcpomatic.cc:346
-msgid "%1 already exists as a file, so you cannot use it for a new film."
-msgstr "%1文件已存在！"
-
-#: src/tools/dcpomatic_kdm.cc:293
+#: src/tools/dcpomatic_kdm.cc:350
 #, c-format
 msgid "%d KDM written to %s"
-msgstr ""
+msgstr "%d 导出KDM 到 %s"
 
-#: src/tools/dcpomatic_kdm.cc:293
+#: src/tools/dcpomatic_kdm.cc:350
 #, c-format
 msgid "%d KDMs written to %s"
-msgstr ""
+msgstr "%d 导出KDMs 到 %s"
 
-#: src/tools/dcpomatic_batch.cc:59
-msgid "&Add Film..."
+#: src/tools/dcpomatic_batch.cc:63
+msgid "&Add Film...\tCtrl-A"
 msgstr "&添加工程"
 
-#: src/tools/dcpomatic.cc:828
+#: src/tools/dcpomatic_player.cc:197
+#, fuzzy
+msgid "&Add KDM..."
+msgstr "添加工程..."
+
+#: src/tools/dcpomatic_player.cc:196
+#, fuzzy
+msgid "&Add OV..."
+msgstr "添加工程..."
+
+#: src/tools/dcpomatic_player.cc:202
+msgid "&Close"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1097
 msgid "&Content"
 msgstr "&内容"
 
-#: src/tools/dcpomatic.cc:826 src/tools/dcpomatic_batch.cc:81
-#: src/tools/dcpomatic_kdm.cc:244
+#: src/tools/dcpomatic.cc:1096 src/tools/dcpomatic_batch.cc:85
+#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_player.cc:237
 msgid "&Edit"
 msgstr "&编辑"
 
-#: src/tools/dcpomatic.cc:784 src/tools/dcpomatic_batch.cc:61
-#: src/tools/dcpomatic_kdm.cc:222
+#: src/tools/dcpomatic.cc:1047 src/tools/dcpomatic_batch.cc:65
+#: src/tools/dcpomatic_kdm.cc:229 src/tools/dcpomatic_player.cc:206
 msgid "&Exit"
 msgstr "&退出"
 
-#: src/tools/dcpomatic.cc:824 src/tools/dcpomatic_batch.cc:79
-#: src/tools/dcpomatic_kdm.cc:242
+#: src/tools/dcpomatic.cc:1095 src/tools/dcpomatic_batch.cc:83
+#: src/tools/dcpomatic_kdm.cc:249 src/tools/dcpomatic_player.cc:235
 msgid "&File"
 msgstr "&文件"
 
-#: src/tools/dcpomatic.cc:831 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:246
+#: src/tools/dcpomatic.cc:1100 src/tools/dcpomatic_batch.cc:88
+#: src/tools/dcpomatic_kdm.cc:253 src/tools/dcpomatic_player.cc:241
 msgid "&Help"
 msgstr "&帮助"
 
-#: src/tools/dcpomatic.cc:829
+#: src/tools/dcpomatic.cc:1098
 msgid "&Jobs"
 msgstr "&创建"
 
-#: src/tools/dcpomatic.cc:801
+#: src/tools/dcpomatic.cc:1067
 msgid "&Make DCP\tCtrl-M"
-msgstr "&创建DCP\tCtrl+M"
+msgstr "&创建 DCP\tCtrl+M"
 
-#: src/tools/dcpomatic.cc:773
+#: src/tools/dcpomatic.cc:1032 src/tools/dcpomatic_player.cc:195
 msgid "&Open...\tCtrl-O"
 msgstr "&打开...\tCtrl+O"
 
-#: src/tools/dcpomatic.cc:790 src/tools/dcpomatic.cc:793
-#: src/tools/dcpomatic_batch.cc:67 src/tools/dcpomatic_batch.cc:70
-#: src/tools/dcpomatic_kdm.cc:228 src/tools/dcpomatic_kdm.cc:231
+#: src/tools/dcpomatic.cc:1057 src/tools/dcpomatic.cc:1059
+#: src/tools/dcpomatic_batch.cc:71 src/tools/dcpomatic_batch.cc:74
+#: src/tools/dcpomatic_kdm.cc:235 src/tools/dcpomatic_kdm.cc:238
+#: src/tools/dcpomatic_player.cc:212 src/tools/dcpomatic_player.cc:215
 msgid "&Preferences...\tCtrl-P"
 msgstr "&设置....\tCtrl+P"
 
-#: src/tools/dcpomatic.cc:786 src/tools/dcpomatic_batch.cc:63
-#: src/tools/dcpomatic_kdm.cc:224
+#: src/tools/dcpomatic.cc:1049 src/tools/dcpomatic_batch.cc:67
+#: src/tools/dcpomatic_kdm.cc:231 src/tools/dcpomatic_player.cc:208
 msgid "&Quit"
 msgstr "&退出"
 
-#: src/tools/dcpomatic.cc:775
+#: src/tools/dcpomatic.cc:1034
 msgid "&Save\tCtrl-S"
 msgstr "&保存\tCtrl+S"
 
-#: src/tools/dcpomatic.cc:805
+#: src/tools/dcpomatic.cc:1075
 msgid "&Send DCP to TMS"
-msgstr "&发送DCP到TMS"
+msgstr "&发送 DCP到TMS"
 
-#: src/tools/dcpomatic.cc:830 src/tools/dcpomatic_batch.cc:83
+#: src/tools/dcpomatic.cc:1099 src/tools/dcpomatic_batch.cc:87
+#: src/tools/dcpomatic_player.cc:240
 msgid "&Tools"
 msgstr "&工具"
 
-#: src/tools/dcpomatic.cc:820 src/tools/dcpomatic_batch.cc:77
-#: src/tools/dcpomatic_kdm.cc:238
+#: src/tools/dcpomatic_player.cc:239
+msgid "&View"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1091 src/tools/dcpomatic_batch.cc:81
+#: src/tools/dcpomatic_kdm.cc:245 src/tools/dcpomatic_player.cc:231
 msgid "About"
 msgstr "关于"
 
-#: src/tools/dcpomatic.cc:818 src/tools/dcpomatic_kdm.cc:236
+#: src/tools/dcpomatic.cc:1089 src/tools/dcpomatic_kdm.cc:243
+#: src/tools/dcpomatic_player.cc:229
 msgid "About DCP-o-matic"
-msgstr "关于DCP-o-matic"
+msgstr "关于 DCP-o-matic"
 
-#: src/tools/dcpomatic_batch.cc:115
+#: src/tools/dcpomatic_batch.cc:119
 msgid "Add Film..."
-msgstr "添加工程"
+msgstr "添加工程..."
+
+#: src/tools/dcpomatic_kdm.cc:156
+msgid "Add folder..."
+msgstr "添加工程文件夹..."
 
-#: src/tools/dcpomatic.cc:1058 src/tools/dcpomatic_kdm.cc:423
+#: src/tools/dcpomatic_kdm.cc:154
+msgid "Add..."
+msgstr "添加..."
+
+#: src/tools/dcpomatic.cc:1360 src/tools/dcpomatic_kdm.cc:617
+#: src/tools/dcpomatic_player.cc:590
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
 "\n"
 msgstr ""
-"发生异常: %s (%s).\n"
+"出现未知错误: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1067 src/tools/dcpomatic_kdm.cc:432
+#: src/tools/dcpomatic.cc:1369 src/tools/dcpomatic_kdm.cc:626
+#: src/tools/dcpomatic_player.cc:599
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -127,172 +154,361 @@ msgstr ""
 "出现未知错误: %s.\n"
 "\n"
 
-#: src/tools/dcpomatic_server.cc:308
+#: src/tools/dcpomatic_server.cc:321
 msgid "An unknown error has occurred with the DCP-o-matic server."
-msgstr ""
+msgstr "DCP-o-matic 服务出现未知错误。"
 
-#: src/tools/dcpomatic.cc:485 src/tools/dcpomatic.cc:563
-#: src/tools/dcpomatic.cc:1072 src/tools/dcpomatic_kdm.cc:324
-#: src/tools/dcpomatic_kdm.cc:437 src/tools/dcpomatic_kdm.cc:446
+#: src/tools/dcpomatic.cc:740 src/tools/dcpomatic.cc:1374
+#: src/tools/dcpomatic_kdm.cc:361 src/tools/dcpomatic_kdm.cc:631
+#: src/tools/dcpomatic_kdm.cc:640 src/tools/dcpomatic_player.cc:604
 msgid "An unknown exception occurred."
 msgstr "出现未知错误."
 
-#: src/tools/dcpomatic.cc:442
-#, c-format
-msgid "Bad setting for %s (%s)"
-msgstr "配置错误 %s (%s)"
+#: src/tools/dcpomatic.cc:563
+msgid ""
+"Are you sure you want to restore preferences to their defaults?  This cannot "
+"be undone."
+msgstr "确定要恢复默认设置？ 该操作不能撤销！"
 
-#: src/tools/dcpomatic_kdm.cc:147
-msgid "CPL"
-msgstr ""
+#: src/tools/dcpomatic.cc:630
+#, fuzzy, c-format
+msgid "Bad setting for %s."
+msgstr "配置错误 %s."
 
-#: src/tools/dcpomatic.cc:481 src/tools/dcpomatic.cc:559
-#: src/tools/dcpomatic_kdm.cc:320
+#: src/tools/dcpomatic.cc:736 src/tools/dcpomatic_kdm.cc:357
 msgid "CPL's content is not encrypted."
 msgstr "该CPL未加密."
 
-#: src/tools/dcpomatic.cc:812
+#: src/tools/dcpomatic.cc:1083 src/tools/dcpomatic_player.cc:225
 msgid "Check for updates"
 msgstr "检查更新"
 
-#: src/tools/dcpomatic.cc:529
+#: src/tools/dcpomatic.cc:128
+msgid "Close without saving film"
+msgstr "关闭但不保存"
+
+#: src/tools/dcpomatic.cc:1053
+msgid "Copy settings\tCtrl-C"
+msgstr ""
+
+#: src/tools/dcpomatic_kdm.cc:433
+msgid ""
+"Could not decrypt the DKDM.  Perhaps it was not created with the correct "
+"certificate."
+msgstr ""
+
+#: src/tools/dcpomatic.cc:699
 msgid "Could not find batch converter."
-msgstr "找不到批量转换！"
+msgstr "找不到批量转换服务器."
+
+#: src/tools/dcpomatic_player.cc:152
+#, fuzzy
+msgid "Could not load DCP"
+msgstr "DCP创建失败: %s。"
+
+#: src/tools/dcpomatic_player.cc:549
+#, fuzzy
+msgid "Could not load DCP %1."
+msgstr "DCP创建失败: %s。"
+
+#: src/tools/dcpomatic_player.cc:315
+#, fuzzy
+msgid "Could not load KDM."
+msgstr "无法显示DCP"
+
+#: src/tools/dcpomatic_batch.cc:341
+#, fuzzy
+msgid "Could not load film %1"
+msgstr "无法加载工程 %s (%s)"
 
-#: src/tools/dcpomatic.cc:996 src/tools/dcpomatic_batch.cc:326
+#: src/tools/dcpomatic.cc:1288
 msgid "Could not load film %1 (%2)"
 msgstr "无法加载工程 %s (%s)"
 
-#: src/tools/dcpomatic.cc:444
-#, c-format
-msgid "Could not make DCP: %s"
-msgstr "创建DCP失败: %s"
+#: src/tools/dcpomatic.cc:632
+#, fuzzy
+msgid "Could not make DCP."
+msgstr "DCP创建失败: %s。"
 
-#: src/tools/dcpomatic.cc:297 src/tools/dcpomatic_batch.cc:136
-#, c-format
-msgid "Could not open film at %s (%s)"
-msgstr "不能打开工程，在 %s (%s)"
+#: src/tools/dcpomatic.cc:389 src/tools/dcpomatic_batch.cc:140
+#, fuzzy, c-format
+msgid "Could not open film at %s"
+msgstr "无法在 %s 打开工程。"
+
+#: src/tools/dcpomatic_kdm.cc:426
+#, fuzzy
+msgid ""
+"Could not read file as a KDM.  Perhaps it is badly formatted, or not a KDM "
+"at all."
+msgstr ""
+"不能读取KDM。文件可能被损坏或者使用了不兼容的格式。\n"
+"%s"
+
+#: src/tools/dcpomatic.cc:810
+#, fuzzy
+msgid "Could not run konqueror"
+msgstr "无法显示DCP (无法运行konqueror)"
+
+#: src/tools/dcpomatic.cc:803
+#, fuzzy
+msgid "Could not run nautilus"
+msgstr "无法显示DCP (无法运行nautilus)"
 
-#: src/tools/dcpomatic.cc:619
+#: src/tools/dcpomatic.cc:810 src/tools/dcpomatic.cc:819
 msgid "Could not show DCP"
-msgstr "不能显示DCP"
+msgstr "无法显示DCP"
 
-#: src/tools/dcpomatic.cc:610
-msgid "Could not show DCP (could not run konqueror)"
-msgstr "无法显示DCP (无法运行在konqueror出错)"
+#: src/tools/dcpomatic.cc:803
+#, fuzzy
+msgid "Could not show DCP."
+msgstr "无法显示DCP"
+
+#: src/tools/dcpomatic.cc:1113
+#, c-format
+msgid ""
+"Could not write to cinemas file at %s.  Your changes have not been saved."
+msgstr "不能保存设置%s。设置没有被保存。"
 
-#: src/tools/dcpomatic.cc:603
-msgid "Could not show DCP (could not run nautilus)"
-msgstr "无法显示DCP (无法运行在nautilus出错)"
+#: src/tools/dcpomatic.cc:1125 src/tools/dcpomatic_player.cc:414
+#, c-format
+msgid ""
+"Could not write to config file at %s.  Your changes have not been saved."
+msgstr "不能保存设置%s。设置没有被保存。"
 
-#: src/tools/dcpomatic_kdm.cc:160
+#: src/tools/dcpomatic_kdm.cc:172
 msgid "Create KDMs"
-msgstr ""
+msgstr "创建KDMs"
 
-#: src/tools/dcpomatic.cc:317 src/tools/dcpomatic.cc:948
-#: src/tools/dcpomatic.cc:984
+#: src/tools/dcpomatic.cc:413 src/tools/dcpomatic.cc:1240
+#: src/tools/dcpomatic.cc:1276
 msgid "DCP-o-matic"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_batch.cc:278 src/tools/dcpomatic_batch.cc:308
+#: src/tools/dcpomatic_batch.cc:282 src/tools/dcpomatic_batch.cc:317
 msgid "DCP-o-matic Batch Converter"
 msgstr "DCP-o-matic 批量转换"
 
-#: src/tools/dcpomatic_kdm.cc:362 src/tools/dcpomatic_kdm.cc:398
+#: src/tools/dcpomatic_server.cc:141
+msgid "DCP-o-matic Encode Server"
+msgstr "DCP-o-matic 编码服务器"
+
+#: src/tools/dcpomatic_kdm.cc:553 src/tools/dcpomatic_kdm.cc:589
+msgid "DCP-o-matic KDM Creator"
+msgstr "DCP-o-matic KMD 创建器"
+
+#: src/tools/dcpomatic_player.cc:81 src/tools/dcpomatic_player.cc:160
+#: src/tools/dcpomatic_player.cc:499
 #, fuzzy
-msgid "DCP-o-matic KDM creator"
+msgid "DCP-o-matic Player"
 msgstr "DCP-o-matic"
 
-#: src/tools/dcpomatic_server.cc:140
+#: src/tools/dcpomatic_player.cc:563
 #, fuzzy
-msgid "DCP-o-matic encode server"
-msgstr "DCP-o-matic 批量转换"
+msgid "DCP-o-matic Player could not start."
+msgstr "连接DCP-o-matic下载服务器失败."
 
-#: src/tools/dcpomatic_kdm.cc:142
+#: src/tools/dcpomatic_kdm.cc:604
+#, fuzzy
+msgid "DCP-o-matic could not start"
+msgstr "DCP-o-matic"
+
+#: src/tools/dcpomatic_kdm.cc:145
 msgid "DKDM"
+msgstr "DKDM"
+
+#: src/tools/dcpomatic_player.cc:220
+msgid "Decode at full resolution"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:811 src/tools/dcpomatic_batch.cc:74
+#: src/tools/dcpomatic_player.cc:221
+msgid "Decode at half resolution"
+msgstr ""
+
+#: src/tools/dcpomatic_player.cc:222
+msgid "Decode at quarter resolution"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:617
+#, c-format
+msgid "Do you want to overwrite the existing DCP %s?"
+msgstr "真的要覆盖已经存在的DCP %s 吗？"
+
+#: src/tools/dcpomatic.cc:128
+msgid "Don't close"
+msgstr "取消"
+
+#: src/tools/dcpomatic.cc:161
+msgid "Don't duplicate"
+msgstr "取消复制"
+
+#: src/tools/dcpomatic.cc:476 src/tools/dcpomatic.cc:491
+msgid "Duplicate Film"
+msgstr "复制工程"
+
+#: src/tools/dcpomatic.cc:1038
+msgid "Duplicate and open..."
+msgstr "复制工程并打开..."
+
+#: src/tools/dcpomatic.cc:161
+msgid "Duplicate without saving film"
+msgstr "复制项目但不保存"
+
+#: src/tools/dcpomatic.cc:1037
+msgid "Duplicate..."
+msgstr "复制…"
+
+#: src/tools/dcpomatic.cc:1081 src/tools/dcpomatic_batch.cc:78
 msgid "Encoding servers..."
-msgstr "服务器编码..."
+msgstr "查看编码服务器..."
+
+#: src/tools/dcpomatic.cc:1073
+msgid "Export...\tCtrl-E"
+msgstr "导出...\tCtrl+O"
+
+#: src/tools/dcpomatic_kdm.cc:260
+#, 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:103
+#: src/tools/dcpomatic.cc:123 src/tools/dcpomatic.cc:156
 msgid "Film changed"
-msgstr "修改工程"
+msgstr "工程已被编辑"
 
-#: src/tools/dcpomatic_server.cc:147
+#: src/tools/dcpomatic_server.cc:148
 msgid "Frames per second"
-msgstr ""
+msgstr "帧率"
 
-#: src/tools/dcpomatic.cc:810
+#: src/tools/dcpomatic.cc:1080
 msgid "Hints..."
 msgstr "提示..."
 
-#: src/tools/dcpomatic.cc:803
+#. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
+#: src/tools/dcpomatic_kdm.cc:139
+msgid "KDM|Timing"
+msgstr "KDM有效期"
+
+#: src/tools/dcpomatic_player.cc:160
+msgid "Loading DCP"
+msgstr ""
+
+#: src/tools/dcpomatic.cc:1070
 msgid "Make &KDMs...\tCtrl-K"
-msgstr "制作KDM \tCtrl+K"
+msgstr "制作 KDM \tCtrl+K"
 
-#: src/tools/dcpomatic.cc:802
+#: src/tools/dcpomatic.cc:1068
 msgid "Make DCP in &batch converter\tCtrl-B"
 msgstr "批量制作DCP\tCtrl+B"
 
-#: src/tools/dcpomatic.cc:804
+#: src/tools/dcpomatic.cc:1071
 msgid "Make DKDM for DCP-o-matic..."
-msgstr "制作DCP-o-matic KDM"
+msgstr "制作DCP-o-matic的KDM..."
+
+#: src/tools/dcpomatic.cc:1082
+msgid "Manage templates..."
+msgstr "管理模板…"
+
+#: src/tools/dcpomatic.cc:423
+msgid "New Film"
+msgstr "新建工程"
 
-#: src/tools/dcpomatic.cc:772
+#: src/tools/dcpomatic.cc:1031
 msgid "New...\tCtrl-N"
 msgstr "新建工程\tCtrl+N"
 
-#: src/tools/dcpomatic_kdm.cc:153
+#: src/tools/dcpomatic_kdm.cc:165
 msgid "Output"
-msgstr ""
+msgstr "输出"
+
+#: src/tools/dcpomatic.cc:1054
+#, fuzzy
+msgid "Paste settings...\tCtrl-V"
+msgstr "&设置....\tCtrl+P"
 
-#: src/tools/dcpomatic.cc:822 src/tools/dcpomatic_kdm.cc:240
+#: src/tools/dcpomatic_kdm.cc:158
+msgid "Remove"
+msgstr "移除"
+
+#: src/tools/dcpomatic.cc:1093 src/tools/dcpomatic_kdm.cc:247
+#: src/tools/dcpomatic_player.cc:233
 msgid "Report a problem..."
-msgstr "问题报告"
+msgstr "报告问题..."
 
-#: src/tools/dcpomatic.cc:814
+#: src/tools/dcpomatic.cc:564 src/tools/dcpomatic.cc:1085
 msgid "Restore default preferences"
-msgstr "恢复默认首选项"
+msgstr "恢复默认设置"
 
-#: src/tools/dcpomatic.cc:806
+#: src/tools/dcpomatic.cc:1076
 msgid "S&how DCP"
 msgstr "&查看DCP"
 
-#: src/tools/dcpomatic.cc:100
+#: src/tools/dcpomatic.cc:1036
+msgid "Save as &template..."
+msgstr "保存为模板…"
+
+#: src/tools/dcpomatic.cc:120
 #, c-format
 msgid "Save changes to film \"%s\" before closing?"
 msgstr "是否保存 \"%s\" ?"
 
-#: src/tools/dcpomatic.cc:798
+#: src/tools/dcpomatic.cc:153
+#, c-format
+msgid "Save changes to film \"%s\" before duplicating?"
+msgstr "复制前是否保存 \"%s\" ?"
+
+#: src/tools/dcpomatic.cc:128
+msgid "Save film and close"
+msgstr "保存并关闭"
+
+#: src/tools/dcpomatic.cc:161
+msgid "Save film and duplicate"
+msgstr "保存并复制"
+
+#: src/tools/dcpomatic.cc:1064
 msgid "Scale to fit &height"
 msgstr "缩放到合适高度"
 
-#: src/tools/dcpomatic.cc:797
+#: src/tools/dcpomatic.cc:1063
 msgid "Scale to fit &width"
 msgstr "缩放到合适宽度"
 
-#: src/tools/dcpomatic_kdm.cc:133
+#: src/tools/dcpomatic_kdm.cc:132
 msgid "Screens"
-msgstr ""
+msgstr "厅放映服务器"
 
-#: src/tools/dcpomatic_kdm.cc:73
+#: src/tools/dcpomatic_player.cc:251
 #, fuzzy
-msgid "Select DKDM file"
+msgid "Select DCP to open"
+msgstr "选择打开工程文件"
+
+#: src/tools/dcpomatic_player.cc:276
+#, fuzzy
+msgid "Select DCP to open as OV"
 msgstr "选择打开工程文件"
 
-#: src/tools/dcpomatic.cc:362 src/tools/dcpomatic_batch.cc:213
+#: src/tools/dcpomatic_kdm.cc:405
+msgid "Select DKDM file"
+msgstr "选择DKDM文件"
+
+#: src/tools/dcpomatic_player.cc:305
+#, fuzzy
+msgid "Select KDM"
+msgstr "选择DKDM文件"
+
+#: src/tools/dcpomatic.cc:437 src/tools/dcpomatic_batch.cc:217
 msgid "Select film to open"
 msgstr "选择打开工程文件"
 
-#: src/tools/dcpomatic_kdm.cc:316
+#: src/tools/dcpomatic_kdm.cc:344
 msgid "Send KDM emails"
+msgstr "发送KDM电子邮件"
+
+#: src/tools/dcpomatic_player.cc:219
+msgid "Set decode resolution to match display"
 msgstr ""
 
-#: src/tools/dcpomatic.cc:428
+#: src/tools/dcpomatic.cc:587
 #, c-format
 msgid ""
 "The DCP and intermediate files for this film will take up about %.1f Gb, and "
@@ -303,53 +519,100 @@ msgstr ""
 "创造该DCP包时大约需要缓存空间 %.1f Gb, 您当前可用磁盘空间只有 %.1f Gb.您是否"
 "仍然继续?"
 
-#: src/tools/dcpomatic.cc:426
+#: src/tools/dcpomatic.cc:585
 #, c-format
 msgid ""
 "The DCP for this film will take up about %.1f Gb, and the disk that you are "
 "using only has %.1f Gb available.  Do you want to continue anyway?"
 msgstr ""
-"该DCP在创建中将占用约 %.1f Gb, 并且您正在使用的磁盘只有 %.1f Gb可用。你要继续"
-"吗？"
+"该DCP在创建中将占用约 %.1f Gb, 您正在使用的磁盘只有 %.1f Gb可用。你要继续吗？"
 
-#: src/tools/dcpomatic.cc:886
+#: src/tools/dcpomatic.cc:1183 src/tools/dcpomatic_player.cc:397
 msgid "The DCP-o-matic download server could not be contacted."
-msgstr "连接DCP-o-matic服务器失败."
+msgstr "连接DCP-o-matic下载服务器失败."
 
-#: src/tools/dcpomatic.cc:336
+#: src/tools/dcpomatic.cc:1407 src/tools/dcpomatic_batch.cc:373
+#: src/tools/dcpomatic_kdm.cc:650 src/tools/dcpomatic_server.cc:333
+#: src/tools/dcpomatic_player.cc:628
 msgid ""
-"The directory %1 already exists and is not empty.  Are you sure you want to "
-"use it?"
-msgstr "目录 %1 已经存在且不为空。你确定要使用它？"
+"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:888
+#: src/tools/dcpomatic.cc:1185 src/tools/dcpomatic_player.cc:399
 msgid "There are no new versions of DCP-o-matic available."
 msgstr "DCP-O-MATIC没有新的版本。"
 
-#: src/tools/dcpomatic.cc:681 src/tools/dcpomatic_batch.cc:155
+#: src/tools/dcpomatic.cc:890 src/tools/dcpomatic_batch.cc:159
 msgid "There are unfinished jobs; are you sure you want to quit?"
-msgstr "有未完成的操作; 你确定你要退出吗？"
+msgstr "有未完成的操作，确定退出吗？"
 
-#: src/tools/dcpomatic.cc:283
+#: src/tools/dcpomatic.cc:375
 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 "老版本中创建的工程无法在高于创建版本中被打开，具体请参考设置."
 
-#: src/tools/dcpomatic.cc:682 src/tools/dcpomatic_batch.cc:156
+#: src/tools/dcpomatic.cc:891 src/tools/dcpomatic_batch.cc:160
 msgid "Unfinished jobs"
-msgstr "未完成的工作"
+msgstr "未完成的进程"
 
-#: src/tools/dcpomatic.cc:809
+#: src/tools/dcpomatic.cc:1079
 msgid "Video waveform..."
-msgstr "视频波形..."
+msgstr "视频示波器..."
+
+#: src/tools/dcpomatic.cc:718
+#, c-format
+msgid ""
+"You are making a DKDM which is encrypted by a private key held in\n"
+"\n"
+"<tt>%s</tt>\n"
+"\n"
+"It is <span weight=\"bold\" size=\"larger\">VITALLY IMPORTANT</span> that "
+"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"
+"\n"
+"<tt>%s</tt>\n"
+"\n"
+"这个文件 <span weight=“bold” size=“larger”>非常重要</span> 请务必 <span "
+"weight=“bold” size=“larger”>备份这个文件</span> 如果丢失，您的数字模板文件"
+"（包括生成的DCP包）将无法使用。"
 
-#: src/tools/dcpomatic.cc:371 src/tools/dcpomatic_batch.cc:222
+#: src/tools/dcpomatic.cc:607
+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."
+msgstr ""
+"您已经制作了一个加密的DCP.  您不能生成KDM文件除非您备份下列文件 <tt>metadata."
+"xml</tt> \n"
+"\n"
+"请在生成KDM之前再次确认已经 <span weight=“bold” size=“larger”>备份</span> 该"
+"文件。"
+
+#: src/tools/dcpomatic.cc:446 src/tools/dcpomatic_batch.cc:226
+#: src/tools/dcpomatic_player.cc:257 src/tools/dcpomatic_player.cc:285
 msgid ""
 "You did not select a folder.  Make sure that you select a folder before "
 "clicking Open."
 msgstr "您没有选择文件夹。请确保您单击打开之前，选择一个文件夹。"
 
+#~ msgid "CPL"
+#~ msgstr "CPL"
+
+#~ 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..."