Updated zh_CN translation from Rov (若文).

1 files changed, 43 insertions, 48 deletions

diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index 20291603f..2ddecd131 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-12-16 16:15+0000\n"
-"PO-Revision-Date: 2016-08-27 02:34+0800\n"
+"POT-Creation-Date: 2016-10-25 10:43+0100\n"
+"PO-Revision-Date: 2016-12-19 22:23+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.8\n"
+"X-Generator: Poedit 1.8.6\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
@@ -23,12 +23,12 @@ msgstr ""
 msgid "%1 already exists as a file, so you cannot use it for a new film."
 msgstr "%1文件已存在！"
 
-#: src/tools/dcpomatic_kdm.cc:334
+#: src/tools/dcpomatic_kdm.cc:320
 #, c-format
 msgid "%d KDM written to %s"
 msgstr "%d 导出KDM 到 %s"
 
-#: src/tools/dcpomatic_kdm.cc:334
+#: src/tools/dcpomatic_kdm.cc:320
 #, c-format
 msgid "%d KDMs written to %s"
 msgstr "%d 导出KDMs 到 %s"
@@ -42,22 +42,22 @@ msgid "&Content"
 msgstr "&内容"
 
 #: src/tools/dcpomatic.cc:915 src/tools/dcpomatic_batch.cc:84
-#: src/tools/dcpomatic_kdm.cc:267
+#: src/tools/dcpomatic_kdm.cc:266
 msgid "&Edit"
 msgstr "&编辑"
 
 #: src/tools/dcpomatic.cc:872 src/tools/dcpomatic_batch.cc:64
-#: src/tools/dcpomatic_kdm.cc:245
+#: src/tools/dcpomatic_kdm.cc:244
 msgid "&Exit"
 msgstr "&退出"
 
 #: src/tools/dcpomatic.cc:913 src/tools/dcpomatic_batch.cc:82
-#: src/tools/dcpomatic_kdm.cc:265
+#: src/tools/dcpomatic_kdm.cc:264
 msgid "&File"
 msgstr "&文件"
 
 #: src/tools/dcpomatic.cc:920 src/tools/dcpomatic_batch.cc:87
-#: src/tools/dcpomatic_kdm.cc:269
+#: src/tools/dcpomatic_kdm.cc:268
 msgid "&Help"
 msgstr "&帮助"
 
@@ -67,7 +67,7 @@ msgstr "&创建"
 
 #: src/tools/dcpomatic.cc:889
 msgid "&Make DCP\tCtrl-M"
-msgstr "&创建DCP\tCtrl+M"
+msgstr "&创建 DCP\tCtrl+M"
 
 #: src/tools/dcpomatic.cc:859
 msgid "&Open...\tCtrl-O"
@@ -75,12 +75,12 @@ msgstr "&打开...\tCtrl+O"
 
 #: src/tools/dcpomatic.cc:878 src/tools/dcpomatic.cc:881
 #: src/tools/dcpomatic_batch.cc:70 src/tools/dcpomatic_batch.cc:73
-#: src/tools/dcpomatic_kdm.cc:251 src/tools/dcpomatic_kdm.cc:254
+#: src/tools/dcpomatic_kdm.cc:250 src/tools/dcpomatic_kdm.cc:253
 msgid "&Preferences...\tCtrl-P"
 msgstr "&设置....\tCtrl+P"
 
 #: src/tools/dcpomatic.cc:874 src/tools/dcpomatic_batch.cc:66
-#: src/tools/dcpomatic_kdm.cc:247
+#: src/tools/dcpomatic_kdm.cc:246
 msgid "&Quit"
 msgstr "&退出"
 
@@ -90,26 +90,26 @@ msgstr "&保存\tCtrl+S"
 
 #: src/tools/dcpomatic.cc:893
 msgid "&Send DCP to TMS"
-msgstr "&发送DCP到TMS"
+msgstr "&发送 DCP到TMS"
 
 #: src/tools/dcpomatic.cc:919 src/tools/dcpomatic_batch.cc:86
 msgid "&Tools"
 msgstr "&工具"
 
 #: src/tools/dcpomatic.cc:909 src/tools/dcpomatic_batch.cc:80
-#: src/tools/dcpomatic_kdm.cc:261
+#: src/tools/dcpomatic_kdm.cc:260
 msgid "About"
 msgstr "关于"
 
-#: src/tools/dcpomatic.cc:907 src/tools/dcpomatic_kdm.cc:259
+#: src/tools/dcpomatic.cc:907 src/tools/dcpomatic_kdm.cc:258
 msgid "About DCP-o-matic"
-msgstr "关于DCP-o-matic"
+msgstr "关于 DCP-o-matic"
 
 #: src/tools/dcpomatic_batch.cc:118
 msgid "Add Film..."
 msgstr "添加工程"
 
-#: src/tools/dcpomatic.cc:1152 src/tools/dcpomatic_kdm.cc:465
+#: src/tools/dcpomatic.cc:1152 src/tools/dcpomatic_kdm.cc:450
 #, c-format
 msgid ""
 "An exception occurred: %s (%s)\n"
@@ -118,7 +118,7 @@ msgstr ""
 "出现未知错误: %s (%s).\n"
 "\n"
 
-#: src/tools/dcpomatic.cc:1161 src/tools/dcpomatic_kdm.cc:474
+#: src/tools/dcpomatic.cc:1161 src/tools/dcpomatic_kdm.cc:459
 #, c-format
 msgid ""
 "An exception occurred: %s.\n"
@@ -129,11 +129,11 @@ msgstr ""
 
 #: src/tools/dcpomatic_server.cc:306
 msgid "An unknown error has occurred with the DCP-o-matic server."
-msgstr "DCP-o-matic服务出现未知错误！"
+msgstr "DCP-o-matic 服务出现未知错误！"
 
 #: src/tools/dcpomatic.cc:602 src/tools/dcpomatic.cc:1166
-#: src/tools/dcpomatic_kdm.cc:366 src/tools/dcpomatic_kdm.cc:479
-#: src/tools/dcpomatic_kdm.cc:488
+#: src/tools/dcpomatic_kdm.cc:351 src/tools/dcpomatic_kdm.cc:464
+#: src/tools/dcpomatic_kdm.cc:473
 msgid "An unknown exception occurred."
 msgstr "出现未知错误."
 
@@ -141,18 +141,18 @@ msgstr "出现未知错误."
 msgid ""
 "Are you sure you want to restore preferences to their defaults?  This cannot "
 "be undone."
-msgstr "确定要恢复默认设置？该操作不能撤销！"
+msgstr "确定要恢复默认设置？ 该操作不能撤销！"
 
 #: src/tools/dcpomatic.cc:503
 #, c-format
 msgid "Bad setting for %s (%s)"
 msgstr "配置错误 %s (%s)"
 
-#: src/tools/dcpomatic_kdm.cc:170
+#: src/tools/dcpomatic_kdm.cc:169
 msgid "CPL"
 msgstr "CPL"
 
-#: src/tools/dcpomatic.cc:598 src/tools/dcpomatic_kdm.cc:362
+#: src/tools/dcpomatic.cc:598 src/tools/dcpomatic_kdm.cc:347
 msgid "CPL's content is not encrypted."
 msgstr "该CPL未加密."
 
@@ -180,7 +180,7 @@ msgstr "DCP创建失败: %s"
 #: src/tools/dcpomatic.cc:322 src/tools/dcpomatic_batch.cc:139
 #, c-format
 msgid "Could not open film at %s (%s)"
-msgstr "不能打开工程，在 %s (%s)"
+msgstr "无法在 %s (%s)打开工程"
 
 #: src/tools/dcpomatic.cc:670
 msgid "Could not show DCP"
@@ -188,15 +188,15 @@ msgstr "无法显示DCP"
 
 #: src/tools/dcpomatic.cc:661
 msgid "Could not show DCP (could not run konqueror)"
-msgstr "无法显示DCP (无法运行在konqueror出错)"
+msgstr "无法显示DCP (无法运行konqueror)"
 
 #: src/tools/dcpomatic.cc:654
 msgid "Could not show DCP (could not run nautilus)"
-msgstr "无法显示DCP (无法运行在nautilus出错)"
+msgstr "无法显示DCP (无法运行nautilus)"
 
-#: src/tools/dcpomatic_kdm.cc:183
+#: src/tools/dcpomatic_kdm.cc:182
 msgid "Create KDMs"
-msgstr "创建KDMs."
+msgstr "创建KDMs"
 
 #: src/tools/dcpomatic.cc:346 src/tools/dcpomatic.cc:1042
 #: src/tools/dcpomatic.cc:1078
@@ -211,11 +211,11 @@ msgstr "DCP-o-matic 批量转换"
 msgid "DCP-o-matic Encode Server"
 msgstr "DCP-o-matic 编码服务器"
 
-#: src/tools/dcpomatic_kdm.cc:404 src/tools/dcpomatic_kdm.cc:440
+#: src/tools/dcpomatic_kdm.cc:389 src/tools/dcpomatic_kdm.cc:425
 msgid "DCP-o-matic KDM Creator"
-msgstr "DCP-o-matic KMD 生成。"
+msgstr "DCP-o-matic KMD 创建。"
 
-#: src/tools/dcpomatic_kdm.cc:165
+#: src/tools/dcpomatic_kdm.cc:164
 msgid "DKDM"
 msgstr "DKDM"
 
@@ -227,11 +227,6 @@ msgstr "取消"
 msgid "Encoding servers..."
 msgstr "查看编码服务器..."
 
-#: src/tools/dcpomatic_kdm.cc:276
-#, fuzzy, 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:113
@@ -240,20 +235,20 @@ msgstr "工程已被编辑"
 
 #: src/tools/dcpomatic_server.cc:147
 msgid "Frames per second"
-msgstr "帧速率"
+msgstr "帧率"
 
 #: src/tools/dcpomatic.cc:898
 msgid "Hints..."
 msgstr "提示..."
 
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
-#: src/tools/dcpomatic_kdm.cc:159
+#: src/tools/dcpomatic_kdm.cc:158
 msgid "KDM|Timing"
-msgstr "时长调整"
+msgstr "KDM有效期"
 
 #: src/tools/dcpomatic.cc:891
 msgid "Make &KDMs...\tCtrl-K"
-msgstr "制作KDM \tCtrl+K"
+msgstr "制作 KDM \tCtrl+K"
 
 #: src/tools/dcpomatic.cc:890
 msgid "Make DCP in &batch converter\tCtrl-B"
@@ -271,11 +266,11 @@ msgstr "管理模板"
 msgid "New...\tCtrl-N"
 msgstr "新建工程\tCtrl+N"
 
-#: src/tools/dcpomatic_kdm.cc:176
+#: src/tools/dcpomatic_kdm.cc:175
 msgid "Output"
 msgstr "输出"
 
-#: src/tools/dcpomatic.cc:911 src/tools/dcpomatic_kdm.cc:263
+#: src/tools/dcpomatic.cc:911 src/tools/dcpomatic_kdm.cc:262
 msgid "Report a problem..."
 msgstr "报告问题"
 
@@ -308,11 +303,11 @@ msgstr "缩放到合适高度"
 msgid "Scale to fit &width"
 msgstr "缩放到合适宽度"
 
-#: src/tools/dcpomatic_kdm.cc:152
+#: src/tools/dcpomatic_kdm.cc:151
 msgid "Screens"
-msgstr "荧幕（服务器）"
+msgstr "厅放映服务器"
 
-#: src/tools/dcpomatic_kdm.cc:76
+#: src/tools/dcpomatic_kdm.cc:75
 msgid "Select DKDM file"
 msgstr "选择DKDM文件"
 
@@ -320,7 +315,7 @@ msgstr "选择DKDM文件"
 msgid "Select film to open"
 msgstr "选择打开工程文件"
 
-#: src/tools/dcpomatic_kdm.cc:358
+#: src/tools/dcpomatic_kdm.cc:343
 msgid "Send KDM emails"
 msgstr "发送KDM电子邮件"
 
@@ -345,7 +340,7 @@ msgstr ""
 
 #: src/tools/dcpomatic.cc:976
 msgid "The DCP-o-matic download server could not be contacted."
-msgstr "连接DCP-o-matic服务器失败."
+msgstr "连接DCP-o-matic下载服务器失败."
 
 #: src/tools/dcpomatic.cc:365
 msgid ""