Updated zh_CN translation from 刘汉源.

4 files changed, 79 insertions, 76 deletions

diff --git a/ChangeLog b/ChangeLog
index b032fe651..132bdf611 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-08-18  Carl Hetherington  <cth@carlh.net>
 
+	* Updated zh_CN translation from 刘汉源.
+
 	* Updated nl_NL translation from Rob van Nieuwkerk.
 
 2016-08-17  c.hetherington  <cth@carlh.net>
diff --git a/src/lib/po/zh_CN.po b/src/lib/po/zh_CN.po
index 08385be86..6bc601a8b 100644
--- a/src/lib/po/zh_CN.po
+++ b/src/lib/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: LIBDCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-17 14:44+0100\n"
-"PO-Revision-Date: 2016-08-14 20:57+0800\n"
+"PO-Revision-Date: 2016-08-19 02:12+0800\n"
 "Last-Translator: Rov(若文)\n"
 "Language-Team: Rov(若文) <lojy2009@qq.com>\n"
 "Language: zh\n"
@@ -20,44 +20,51 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: src/lib/video_content.cc:446
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Content frame rate %.4f\n"
-msgstr "\n源视频帧率 %.4f\n"
+msgstr ""
+"\n"
+"源视频帧速率 %.4f\n"
 
 #: src/lib/video_content.cc:410
-#, fuzzy
 msgid ""
 "\n"
 "Cropped to %1x%2"
-msgstr "\n裁剪为%1x%2"
+msgstr ""
+"\n"
+"裁剪为%1x%2"
 
 #: src/lib/video_content.cc:403
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "Display aspect ratio %.2f:1"
-msgstr "\n显示宽高比 %.2f:1"
+msgstr ""
+"\n"
+"显示宽高比 %.2f:1"
 
 #: src/lib/video_content.cc:434
-#, fuzzy
 msgid ""
 "\n"
 "Padded with black to fit container %1 (%2x%3)"
-msgstr "\n填充为黑色，以适应打包类型 %1 (%2x%3)"
+msgstr ""
+"\n"
+"填充为黑色，以适应打包宽高比 %1 (%2x%3)"
 
 #: src/lib/video_content.cc:424
-#, fuzzy
 msgid ""
 "\n"
 "Scaled to %1x%2"
-msgstr "\n缩放到 %1x%2"
+msgstr ""
+"\n"
+"缩放到 %1x%2"
 
 #: src/lib/video_content.cc:428 src/lib/video_content.cc:439
 #, c-format
 msgid " (%.2f:1)"
-msgstr ""
+msgstr " (%.2f:1)"
 
 #: src/lib/atmos_mxf_content.cc:78
 msgid "%1 [Atmos]"
@@ -80,7 +87,7 @@ msgid "%1 [video]"
 msgstr "%1 [视频]"
 
 #: src/lib/video_content.cc:398
-#, fuzzy, c-format
+#, c-format
 msgid ", pixel aspect ratio %.2f:1"
 msgstr ", 像素宽高比 %.2f:1"
 
@@ -114,10 +121,12 @@ msgid ""
 "a good idea to drop the JPEG2000 bandwidth down to about 200Mbit/s; this is "
 "unlikely to have any visible effect on the image."
 msgstr ""
+"有些放映机不支持高码率打包,我们推荐使用200Mbit/s以内的码率来进行打包，这种细"
+"微的调整是肉眼很难分辨的！"
 
 #: src/lib/ffmpeg_content.cc:545
 msgid "ARIB STD-B67 ('Hybrid log-gamma')"
-msgstr ""
+msgstr "ARIB STD-B67 ('Hybrid log-gamma')"
 
 #: src/lib/ratio.cc:38
 msgid "Academy"
@@ -133,7 +142,7 @@ msgid ""
 "Scope (2.39:1).  This will pillar-box your content inside a Flat (1.85:1) "
 "frame.  You may prefer to set your DCP's container to Flat (1.85:1) in the "
 "\"DCP\" tab."
-msgstr ""
+msgstr "遮幅(1.85：1)左右去黑边。"
 
 #: src/lib/hints.cc:87
 msgid ""
@@ -141,7 +150,7 @@ msgid ""
 "(1.85:1).  This will letter-box your content inside a Flat (1.85:1) frame.  "
 "You may prefer to set your DCP's container to Scope (2.39:1) in the \"DCP\" "
 "tab."
-msgstr ""
+msgstr "宽幅(2.39：1)上下去黑边。"
 
 #: src/lib/job.cc:99
 msgid "An error occurred whilst handling the file %1."
@@ -270,12 +279,11 @@ msgstr "色彩空间"
 
 #: src/lib/content.cc:158
 msgid "Computing digest"
-msgstr "计算Hash"
+msgstr "计算Hash值中"
 
 #: src/lib/writer.cc:467
-#, fuzzy
 msgid "Computing digests"
-msgstr "计算Hash"
+msgstr "计算Hash值中"
 
 #: src/lib/frame_rate_change.cc:67
 msgid "Content and DCP have the same rate.\n"
@@ -339,7 +347,7 @@ msgstr "字幕X轴偏移必须相同。"
 
 #: src/lib/subtitle_content.cc:184
 msgid "Content to be joined must have the same subtitle X scale."
-msgstr "字幕X调整大小必须相同。"
+msgstr "字幕X轴缩放大小必须相同。"
 
 #: src/lib/subtitle_content.cc:180
 msgid "Content to be joined must have the same subtitle Y offset."
@@ -347,12 +355,11 @@ msgstr "字幕Y轴偏移必须相同。"
 
 #: src/lib/subtitle_content.cc:188
 msgid "Content to be joined must have the same subtitle Y scale."
-msgstr "字幕Y调整大小必须相同。"
+msgstr "字幕Y轴缩放大小必须相同。"
 
 #: src/lib/subtitle_content.cc:196
-#, fuzzy
 msgid "Content to be joined must have the same subtitle fades."
-msgstr "字幕X调整大小必须相同。"
+msgstr "字幕淡入淡出效果必须相同。"
 
 #: src/lib/subtitle_content.cc:192
 msgid "Content to be joined must have the same subtitle line spacing."
@@ -368,7 +375,7 @@ msgstr "帧类型必须相同。"
 
 #: src/lib/subtitle_content.cc:201 src/lib/subtitle_content.cc:209
 msgid "Content to be joined must use the same fonts."
-msgstr "字体必须相同。"
+msgstr "字幕字体必须相同。"
 
 #: src/lib/ffmpeg_content.cc:166
 msgid "Content to be joined must use the same subtitle stream."
@@ -380,7 +387,7 @@ msgstr "源视频分辨率是 %1x%2"
 
 #: src/lib/upload_job.cc:53
 msgid "Copy DCP to TMS"
-msgstr "复制DCP到TMS"
+msgstr "复制DCP到TMS（影院内容管理系统）"
 
 #: src/lib/scp_uploader.cc:51
 msgid "Could not connect to server %1 (%2)"
@@ -711,7 +718,7 @@ msgstr "次低"
 
 #: src/lib/util.cc:494
 msgid "Lfe (sub)"
-msgstr "次低"
+msgstr "次低（重低音炮）"
 
 #: src/lib/ffmpeg_content.cc:497
 msgid "Limited"
@@ -982,23 +989,22 @@ msgid "The film is set to SMPTE and this DCP is Interop."
 msgstr "打包内容被设置为SMPTE类型，而实际类型是 Interop。"
 
 #: src/lib/dcp_content.cc:387
-#, fuzzy
 msgid ""
 "The reel lengths in the film differ from those in the DCP; set the reel mode "
 "to 'split by video content'."
-msgstr "请设置分卷模式来分割影片内容。"
+msgstr "卷中的影片时长与DCP中的影片时长不一致，请设置分卷模式来分割影片内容。"
 
 #: src/lib/dcp_content.cc:418
 msgid "There is other audio content overlapping this DCP; remove it."
-msgstr "音频文件重复，"
+msgstr "音频文件重复，请删除重复项"
 
 #: src/lib/dcp_content.cc:432
 msgid "There is other subtitle content overlapping this DCP; remove it."
-msgstr "字幕文件重复！"
+msgstr "字幕文件重复，请删除重复项"
 
 #: src/lib/dcp_content.cc:404
 msgid "There is other video content overlapping this DCP; remove it."
-msgstr "视频文件重复！"
+msgstr "视频文件重复，请删除重复项"
 
 #: src/lib/job.cc:154
 msgid ""
@@ -1101,24 +1107,28 @@ msgid ""
 "You are set up for an Interop DCP at a frame rate which is not officially "
 "supported.  You are advised to make a SMPTE DCP instead."
 msgstr ""
+"你所设定的视频帧速率不是国际化（SMPTE）标准支持的，我们建议您制作SMPTE标准的"
+"DCP"
 
 #: src/lib/hints.cc:125
 msgid ""
 "You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if "
 "you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"
-msgstr ""
+msgstr "您添加的内容是3D内容，但是您的DCP包设置为2D模式，请设置到3D模式。"
 
 #: src/lib/hints.cc:114
 msgid ""
 "You have %1 files that look like they are VOB files from DVD. You should "
 "join them to ensure smooth joins between the files."
 msgstr ""
+"您已经添加了 %1 个VOB文件，如果他们来自一张DVD，请确保您已经导入了所有文件，"
+"否则可能无法正常播放。"
 
 #: src/lib/hints.cc:66
 msgid ""
 "You have specified a font file which is larger than 640kB.  This is very "
 "likely to cause problems on playback."
-msgstr ""
+msgstr "您添加的字体文件超过了640KB，很有可能不能正常播放。"
 
 #: src/lib/film.cc:309
 msgid "You must add some content to the DCP before creating it"
@@ -1129,24 +1139,26 @@ msgid ""
 "Your DCP frame rate (%1 fps) may cause problems in a few (mostly older) "
 "projectors.  Use 24 or 48 frames per second to be on the safe side."
 msgstr ""
+"您的DCP帧速率（%1 fps）会使一部分投影机出现错误，请使用24 fps或者48 fps保证正"
+"常放映。"
 
 #: src/lib/hints.cc:70
 msgid ""
 "Your DCP has fewer than 6 audio channels.  This may cause problems on some "
 "projectors."
-msgstr ""
+msgstr "您的DCP声道数小于6个，在小部分放映机上可能不能正常播放。"
 
 #: src/lib/hints.cc:137
 msgid ""
 "Your audio level is very close to clipping.  You should reduce the gain of "
 "your audio content."
-msgstr ""
+msgstr "您的音量已经接近上限，请降低音频增益防止爆音。"
 
 #: src/lib/hints.cc:135
 msgid ""
 "Your audio level is very high.  You should reduce the gain of your audio "
 "content."
-msgstr ""
+msgstr "您的音频增益过大，请降低音频增益。"
 
 #: src/lib/image_content.cc:81
 msgid "[moving images]"
diff --git a/src/tools/po/zh_CN.po b/src/tools/po/zh_CN.po
index ebe03ae5a..4b21ff95b 100644
--- a/src/tools/po/zh_CN.po
+++ b/src/tools/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DCPOMATIC\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-17 14:44+0100\n"
-"PO-Revision-Date: 2016-08-14 20:57+0800\n"
+"PO-Revision-Date: 2016-08-19 02:20+0800\n"
 "Last-Translator: Rov(若文)\n"
 "Language-Team: Rov(若文) <lojy2009@qq.com>\n"
 "Language: zh\n"
@@ -225,7 +225,7 @@ msgstr "取消"
 
 #: src/tools/dcpomatic.cc:864 src/tools/dcpomatic_batch.cc:75
 msgid "Encoding servers..."
-msgstr "编码服务器..."
+msgstr "查看编码服务器..."
 
 #. / 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.
@@ -244,7 +244,7 @@ msgstr "提示..."
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "KDM|" prefix
 #: src/tools/dcpomatic_kdm.cc:146
 msgid "KDM|Timing"
-msgstr ""
+msgstr "时长调整"
 
 #: src/tools/dcpomatic.cc:856
 msgid "Make &KDMs...\tCtrl-K"
@@ -344,7 +344,7 @@ msgstr "目录 %1 已经存在且不为空。确定要使用它？"
 msgid ""
 "The existing configuration failed to load.  Default values will be used "
 "instead.  These may take a short time to create."
-msgstr ""
+msgstr "现有配置文件损坏，系统将会使用默认的配置文件，请稍候。"
 
 #: src/tools/dcpomatic.cc:942
 msgid "There are no new versions of DCP-o-matic available."
diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index dee65bc13..ed9ff6030 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: DCP-O-MATIC_CN\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-08-17 14:44+0100\n"
-"PO-Revision-Date: 2016-08-14 21:11+0800\n"
+"PO-Revision-Date: 2016-08-19 02:40+0800\n"
 "Last-Translator: Rov(若文)\n"
 "Language-Team: Rov(若文) <lojy2009@qq.com>\n"
 "Language: zh\n"
@@ -53,11 +53,11 @@ msgstr "-6db"
 
 #: src/wx/wx_util.cc:377
 msgid "12 - 7.1/HI/VI"
-msgstr ""
+msgstr "12声道—7.1+听力障碍声道/视力障碍声道"
 
 #: src/wx/wx_util.cc:369
 msgid "2 - stereo"
-msgstr ""
+msgstr "2声道—立体声"
 
 #: src/wx/rgba_colour_picker.cc:36
 msgid "255"
@@ -101,7 +101,7 @@ msgstr "上下眼(3D)"
 
 #: src/wx/wx_util.cc:371
 msgid "4 - L/C/R/Lfe"
-msgstr ""
+msgstr "4声道—左/中/右/低音"
 
 #: src/wx/dcp_panel.cc:713
 msgid "4K"
@@ -109,11 +109,11 @@ msgstr "4K"
 
 #: src/wx/wx_util.cc:373
 msgid "6 - 5.1"
-msgstr ""
+msgstr "6声道—5.1声道"
 
 #: src/wx/wx_util.cc:375
 msgid "8 - 5.1/HI/VI"
-msgstr ""
+msgstr "8声道—5.1+听力障碍声道/视力障碍声道"
 
 #: src/wx/image_subtitle_colour_dialog.cc:41
 msgid "<b>New colour</b>"
@@ -215,7 +215,7 @@ msgstr "透明度 0"
 
 #: src/wx/kdm_dialog.cc:166
 msgid "An unknown exception occurred."
-msgstr ""
+msgstr "出现未知错误。"
 
 #: src/wx/subtitle_panel.cc:135
 msgid "Appearance..."
@@ -307,7 +307,7 @@ msgstr "CPL注释文本"
 
 #: src/wx/kdm_dialog.cc:162
 msgid "CPL's content is not encrypted."
-msgstr ""
+msgstr "该内容没有加密"
 
 #: src/wx/audio_panel.cc:78
 msgid "Calculate..."
@@ -384,7 +384,7 @@ msgstr "色彩转换"
 #. / TRANSLATORS: translate the word "Custom" here; do not include the "Colour|" prefix
 #: src/wx/video_panel.cc:206
 msgid "Colour|Custom"
-msgstr "色彩空间|自定义"
+msgstr "自定义"
 
 #: src/wx/video_waveform_dialog.cc:51
 msgid "Component"
@@ -393,7 +393,7 @@ msgstr "结构"
 #. / TRANSLATORS: translate the word "Timing" here; do not include the "Config|" prefix
 #: src/wx/config_dialog.cc:1479
 msgid "Config|Timing"
-msgstr "同步"
+msgstr "时间设置"
 
 #: src/wx/report_problem_dialog.cc:66
 msgid "Contact email"
@@ -472,7 +472,7 @@ msgstr "DCP"
 
 #: src/wx/config_dialog.cc:1452
 msgid "DCP asset filename format"
-msgstr ""
+msgstr "DCP内容的文件名格式"
 
 #: src/wx/kdm_cpl_panel.cc:44
 msgid "DCP directory"
@@ -480,7 +480,7 @@ msgstr "DCP目录"
 
 #: src/wx/config_dialog.cc:1440
 msgid "DCP metadata filename format"
-msgstr ""
+msgstr "DCP元数据的文件名格式"
 
 #: src/wx/about_dialog.cc:50 src/wx/wx_util.cc:90 src/wx/wx_util.cc:102
 #: src/wx/wx_util.cc:110
@@ -561,7 +561,7 @@ msgstr "杜比 / 哆来咪"
 
 #: src/wx/hints_dialog.cc:45
 msgid "Don't show hints again"
-msgstr ""
+msgstr "不再显示小提示"
 
 #: src/wx/content_panel.cc:97
 msgid "Down"
@@ -634,18 +634,16 @@ msgid "Export"
 msgstr "导出"
 
 #: src/wx/config_dialog.cc:1044
-#, fuzzy
 msgid ""
 "Export DCP decryption\n"
 "certificate..."
 msgstr "导出DCP证书"
 
 #: src/wx/config_dialog.cc:1046
-#, fuzzy
 msgid ""
 "Export DCP decryption\n"
 "chain..."
-msgstr "导出DCP证书"
+msgstr "导出DCP密匙"
 
 #: src/wx/config_dialog.cc:732
 msgid "Export..."
@@ -664,23 +662,20 @@ msgid "Fade in"
 msgstr "淡入"
 
 #: src/wx/text_subtitle_appearance_dialog.cc:53
-#, fuzzy
 msgid "Fade in time"
-msgstr "淡入"
+msgstr "淡入时间"
 
 #: src/wx/video_panel.cc:159
 msgid "Fade out"
 msgstr "淡出"
 
 #: src/wx/text_subtitle_appearance_dialog.cc:57
-#, fuzzy
 msgid "Fade out time"
-msgstr "淡出"
+msgstr "淡出时间"
 
 #: src/wx/kdm_output_panel.cc:50
-#, fuzzy
 msgid "Filename format"
-msgstr "文件名"
+msgstr "文件名格式"
 
 #: src/wx/new_film_dialog.cc:38
 msgid "Film name"
@@ -763,7 +758,7 @@ msgstr "外置字体 "
 
 #: src/wx/hints_dialog.cc:56
 msgid "Go back"
-msgstr ""
+msgstr "返回"
 
 #: src/wx/playhead_to_timecode_dialog.cc:27
 #: src/wx/playhead_to_frame_dialog.cc:30
@@ -815,9 +810,8 @@ msgid "ISDCF name"
 msgstr "ISDCF名称"
 
 #: src/wx/video_waveform_dialog.cc:61
-#, fuzzy
 msgid "Image X position"
-msgstr "裁剪当前位置"
+msgstr "画面X轴位置"
 
 #: src/wx/colour_conversion_editor.cc:55
 msgid "Input gamma"
@@ -850,7 +844,7 @@ msgstr "Interop"
 
 #: src/wx/config_dialog.cc:227
 msgid "Issuer"
-msgstr "发行"
+msgstr "发行商"
 
 #: src/wx/fonts_dialog.cc:62
 msgid "Italic file"
@@ -861,11 +855,10 @@ msgid "Italic font"
 msgstr "斜体"
 
 #: src/wx/dcp_panel.cc:680
-#, fuzzy
 msgid ""
 "JPEG2000 bandwidth\n"
 "for newly-encoded data"
-msgstr "JPEG2000码率"
+msgstr "上次使用的JPEG2000码率"
 
 #: src/wx/content_menu.cc:64
 msgid "Join"
@@ -959,7 +952,7 @@ msgstr "邮箱用户名"
 
 #: src/wx/hints_dialog.cc:55
 msgid "Make DCP anyway"
-msgstr ""
+msgstr "无论如何制作DCP"
 
 #: src/wx/self_dkdm_dialog.cc:49
 msgid "Make DKDM for DCP-o-matic"
@@ -1053,7 +1046,7 @@ msgstr "没有找到文件！"
 
 #: src/wx/text_subtitle_appearance_dialog.cc:37
 msgid "No effect"
-msgstr ""
+msgstr "无效果"
 
 #: src/wx/dcp_panel.cc:752 src/wx/video_panel.cc:186 src/wx/video_panel.cc:200
 #: src/wx/video_panel.cc:304
@@ -1109,7 +1102,6 @@ msgid "Outline"
 msgstr "缩略视图"
 
 #: src/wx/text_subtitle_appearance_dialog.cc:49
-#, fuzzy
 msgid "Outline / shadow colour"
 msgstr "缩略视图轮廓颜色"
 
@@ -1201,7 +1193,6 @@ msgid "Re-examine..."
 msgstr "重新制作..."
 
 #: src/wx/config_dialog.cc:737
-#, fuzzy
 msgid ""
 "Re-make certificates\n"
 "and key..."
@@ -1354,7 +1345,6 @@ msgid "Select Certificate File"
 msgstr "选择证书文件"
 
 #: src/wx/config_dialog.cc:1076
-#, fuzzy
 msgid "Select Chain File"
 msgstr "选择密钥文件"
 
@@ -1412,7 +1402,7 @@ msgstr "设置语言"
 
 #: src/wx/text_subtitle_appearance_dialog.cc:45
 msgid "Shadow"
-msgstr ""
+msgstr "字幕阴影"
 
 #: src/wx/dcp_panel.cc:759
 msgid "Show audio..."
@@ -1822,7 +1812,6 @@ msgid "YUV to RGB matrix"
 msgstr "YUV转换到RGB矩阵"
 
 #: src/wx/video_waveform_dialog.cc:65
-#, fuzzy
 msgid "component value"
 msgstr "结构"
 
@@ -1833,7 +1822,7 @@ msgstr "dB"
 #: src/wx/name_format_editor.cc:67
 #, c-format
 msgid "e.g. %s"
-msgstr ""
+msgstr "例如 %s"
 
 #. // TRANSLATORS: this is an abbreviation for "frames"
 #: src/wx/timing_panel.cc:82