Merge branch 'tidy-verify'HEADmain

This adapts DCP-o-matic for a lot of changes to how libdcp reports
verification results, including a lot of i18n tweaks.

1 files changed, 91 insertions, 91 deletions

diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index fd0524ed8..48219f03f 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -250,13 +250,13 @@ msgstr ":1"
 
 #: src/wx/verify_dcp_result_panel.cc:646
 #, c-format
-msgid "<IssueDate> has an invalid value %n"
-msgstr "<IssueDate> 具有无效值 %n"
+msgid "<IssueDate> has an invalid value %issue_date"
+msgstr "<IssueDate> 具有无效值 %issue_date"
 
 #: src/wx/verify_dcp_result_panel.cc:652
 #, c-format
-msgid "<MainSoundConfiguration> is invalid (%n)"
-msgstr "<MainSoundConfiguration> 不可用 (%n)"
+msgid "<MainSoundConfiguration> is invalid (%error)"
+msgstr "<MainSoundConfiguration> 不可用 (%error)"
 
 #: src/wx/subtitle_appearance_dialog.cc:118
 msgid "<b>New colour</b>"
@@ -278,43 +278,43 @@ msgstr "A"
 
 #: src/wx/verify_dcp_result_panel.cc:555
 #, c-format
-msgid "A 2K JPEG2000 frame contains %n tile parts instead of 3."
-msgstr "2K JPEG2000帧包含%n个图块部分，而不是3个。"
+msgid "A 2K JPEG2000 frame contains %tile_parts tile parts instead of 3."
+msgstr "2K JPEG2000帧包含%tile_parts个图块部分，而不是3个。"
 
 #: src/wx/verify_dcp_result_panel.cc:569
 #, c-format
-msgid "A 2K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %n"
-msgstr "一个 2K JPEG2000 帧包含无效的 Rsiz（承载力）值 %n"
+msgid "A 2K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %capabilities"
+msgstr "一个 2K JPEG2000 帧包含无效的 Rsiz（承载力）值 %capabilities"
 
 #: src/wx/verify_dcp_result_panel.cc:527
 #, c-format
-msgid "A 2K JPEG2000 frame has %n POC marker(s) instead of 0."
-msgstr "2K JPEG2000帧具有 %n POC标记而不是0。"
+msgid "A 2K JPEG2000 frame has %poc_markers POC marker(s) instead of 0."
+msgstr "2K JPEG2000帧具有 %poc_markers POC标记而不是0。"
 
 #: src/wx/verify_dcp_result_panel.cc:492
 #, c-format
-msgid "A 2K JPEG2000 frame has %n guard bits instead of 1."
-msgstr "2K JPEG2000帧具有 %n 保护位而不是1。"
+msgid "A 2K JPEG2000 frame has %guard_bits guard bits instead of 1."
+msgstr "2K JPEG2000帧具有 %guard_bits 保护位而不是1。"
 
 #: src/wx/verify_dcp_result_panel.cc:562
 #, c-format
-msgid "A 4K JPEG2000 frame contains %n tile parts instead of 6."
-msgstr "4K JPEG2000帧包含 %n 个图块部分，而不是6个。"
+msgid "A 4K JPEG2000 frame contains %tile_parts tile parts instead of 6."
+msgstr "4K JPEG2000帧包含 %tile_parts 个图块部分，而不是6个。"
 
 #: src/wx/verify_dcp_result_panel.cc:576
 #, c-format
-msgid "A 4K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %n"
-msgstr "一个 2K JPEG2000 帧包含无效的 Rsiz（承载力）值 %n"
+msgid "A 4K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %capabilities"
+msgstr "一个 2K JPEG2000 帧包含无效的 Rsiz（承载力）值 %capabilities"
 
 #: src/wx/verify_dcp_result_panel.cc:534
 #, c-format
-msgid "A 4K JPEG2000 frame has %n POC marker(s) instead of 1."
-msgstr "4K JPEG2000帧具有 %n POC标记而不是1。"
+msgid "A 4K JPEG2000 frame has %poc_markers POC marker(s) instead of 1."
+msgstr "4K JPEG2000帧具有 %poc_markers POC标记而不是1。"
 
 #: src/wx/verify_dcp_result_panel.cc:499
 #, c-format
-msgid "A 4K JPEG2000 frame has %n guard bits instead of 2."
-msgstr "4K JPEG2000帧具有 %n 保护位 而不是2。"
+msgid "A 4K JPEG2000 frame has %guard_bits guard bits instead of 2."
+msgstr "4K JPEG2000帧具有 %guard_bits 保护位 而不是2。"
 
 #: src/wx/verify_dcp_result_panel.cc:548
 msgid "A JPEG2000 frame contains a POC marker in an invalid location."
@@ -327,13 +327,13 @@ msgstr "JPEG2000帧包含无效的POC标记 (%n)。"
 
 #: src/wx/verify_dcp_result_panel.cc:520
 #, c-format
-msgid "A JPEG2000 frame has a code-block height of %n instead of 32."
-msgstr "JPEG2000帧的代码块高度为 %n ，而不是32。"
+msgid "A JPEG2000 frame has a code-block height of %code_block_height instead of 32."
+msgstr "JPEG2000帧的代码块高度为 %code_block_height ，而不是32。"
 
 #: src/wx/verify_dcp_result_panel.cc:513
 #, c-format
-msgid "A JPEG2000 frame has a code-block width of %n instead of 32."
-msgstr "JPEG2000帧的代码块宽度为 %n ，而不是32。"
+msgid "A JPEG2000 frame has a code-block width of %code_block_width instead of 32."
+msgstr "JPEG2000帧的代码块宽度为 %code_block_width ，而不是32。"
 
 #: src/wx/verify_dcp_result_panel.cc:583
 msgid "A JPEG2000 frame has no TLM marker."
@@ -350,8 +350,8 @@ msgstr "发现新版本的%s可用。"
 
 #: src/wx/verify_dcp_result_panel.cc:485
 #, c-format
-msgid "A picture frame has an invalid JPEG2000 codestream (%n)."
-msgstr "图片帧包含无效的JPEG2000码流（%n）"
+msgid "A picture frame has an invalid JPEG2000 codestream (%error)."
+msgstr "图片帧包含无效的JPEG2000码流（%error）"
 
 #: src/wx/hints_dialog.cc:183
 #, c-format
@@ -575,8 +575,8 @@ msgstr "有资产在 ASSETMAP 中具有空路径。"
 
 #: src/wx/verify_dcp_result_panel.cc:631
 #, c-format
-msgid "An invalid <ContentKind> %n has been used."
-msgstr "一个无效的 <ContentKind> %n 被使用。"
+msgid "An invalid <ContentKind> %content_kind has been used."
+msgstr "一个无效的 <ContentKind> %content_kind 被使用。"
 
 #: src/wx/dkdm_output_panel.cc:204 src/wx/kdm_output_panel.cc:321
 msgid "An unknown exception occurred."
@@ -866,8 +866,8 @@ msgstr "单击该按钮可将所有选定的内容为相同的值。"
 
 #: src/wx/verify_dcp_result_panel.cc:435
 #, c-format
-msgid "Closed caption asset %n has a non-zero <EntryPoint>."
-msgstr "隐藏式字幕资源 %n 具有非零 <EntryPoint>。"
+msgid "Closed caption asset %asset_id has a non-zero <EntryPoint>."
+msgstr "隐藏式字幕资源 %asset_id 具有非零 <EntryPoint>。"
 
 #: src/wx/closed_captions_dialog.cc:49 src/wx/dcp_referencing_dialog.cc:115
 msgid "Closed captions"
@@ -1011,8 +1011,8 @@ msgstr "无法播放内容"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
-msgstr "无法读取 DCP (%n)"
+msgid "Could not read DCP (%error)"
+msgstr "无法读取 DCP (%error)"
 
 #: src/wx/gl_video_view.cc:131
 #, c-format
@@ -1572,8 +1572,8 @@ msgstr "视频资产 %f (时间码 %ti)的至少一个%f 帧超过250MBit/s的�
 #, c-format
 msgid ""
 "Frame %frame has an image component that is too large (component %component "
-"is %size bytes in size)."
-msgstr "帧 %frame 包含一个图像组件过大（组件 %component 的大小为 %size 字节）"
+"is %size_in_bytes bytes in size)."
+msgstr "帧 %frame 包含一个图像组件过大（组件 %component 的大小为 %size_in_bytes 字节）"
 
 #: src/wx/dcp_panel.cc:868
 msgid "Frame Rate"
@@ -3293,8 +3293,8 @@ msgstr "字幕外观"
 
 #: src/wx/verify_dcp_result_panel.cc:429
 #, c-format
-msgid "Subtitle asset %n has a non-zero <EntryPoint>."
-msgstr "字幕文件 %n有非零 <EntryPoint>。"
+msgid "Subtitle asset %asset_id has a non-zero <EntryPoint>."
+msgstr "字幕文件 %asset_id有非零 <EntryPoint>。"
 
 #: src/wx/export_subtitles_dialog.cc:105
 msgid "Subtitle files (.mxf)|*.mxf"
@@ -3390,8 +3390,8 @@ msgstr "<MainPictureActiveArea>不是2的倍数，或者大于资产。"
 
 #: src/wx/verify_dcp_result_panel.cc:640
 #, c-format
-msgid "The ASSETMAP %n has more than one asset with the same ID."
-msgstr "ASSETMAP %n 中有一个以上的资产具有相同的ID。"
+msgid "The ASSETMAP %asset_map_id has more than one asset with the same ID."
+msgstr "ASSETMAP %asset_map_id 中有一个以上的资产具有相同的ID。"
 
 #: src/wx/verify_dcp_result_panel.cc:594
 msgid ""
@@ -3408,8 +3408,8 @@ msgstr "CPL %cpl的 <AnnotationText> 与其 <ContentTitleText> 不同。"
 
 #: src/wx/verify_dcp_result_panel.cc:680
 #, c-format
-msgid "The CPL %cpl has an invalid namespace %n"
-msgstr "声音资产 %cpl  的帧率 %n 非法"
+msgid "The CPL %cpl has an invalid namespace %xml_namespace"
+msgstr "声音资产 %cpl  的帧率 %xml_namespace 非法"
 
 #: src/wx/verify_dcp_result_panel.cc:471
 #, c-format
@@ -3443,18 +3443,18 @@ msgstr "CPL %cpl 没有CPL元数据版本号标记。"
 
 #: src/wx/verify_dcp_result_panel.cc:468
 #, c-format
-msgid "The CPL %f has an invalid CPL extension metadata tag (%n)"
-msgstr "CPL %f具有无效的CPL扩展元数据标记(%n)"
+msgid "The CPL %f has an invalid CPL extension metadata tag (%error)"
+msgstr "CPL %f具有无效的CPL扩展元数据标记(%error)"
 
 #: src/wx/verify_dcp_result_panel.cc:453
 #, c-format
-msgid "The DCP has a FFOC of %n instead of 1."
-msgstr "DCP的FFOC为%n，而不是1。"
+msgid "The DCP has a FFOC of %time instead of 1."
+msgstr "DCP的FFOC为%time，而不是1。"
 
 #: src/wx/verify_dcp_result_panel.cc:456
 #, c-format
-msgid "The DCP has a LFOC of %n instead of the reel duration minus one."
-msgstr "DCP的LFOC为%n，而不是卷轴持续时间减1。"
+msgid "The DCP has a LFOC of %time instead of the reel duration minus one."
+msgstr "DCP的LFOC为%time，而不是卷轴持续时间减1。"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 msgid ""
@@ -3506,25 +3506,25 @@ msgstr "KDM起始时间在签署证书生效之前 (或接近)。为此KDM设置
 
 #: src/wx/verify_dcp_result_panel.cc:699
 #, c-format
-msgid "The PKL %f has an invalid namespace %n"
-msgstr "声音资产 %f 的帧率 %n 非法"
+msgid "The PKL %f has an invalid namespace %xml_namespace"
+msgstr "声音资产 %f 的帧率 %xml_namespace 非法"
 
 #: src/wx/verify_dcp_result_panel.cc:477
 #, c-format
 msgid ""
-"The PKL %n has an <AnnotationText> which does not match its CPL's "
+"The PKL %pkl has an <AnnotationText> which does not match its CPL's "
 "<ContentTitleText>."
-msgstr "PKL%n具有与其CPL的 <ContentTitleText> 不匹配的 <AnnotationText> 。"
+msgstr "PKL%pkl具有与其CPL的 <ContentTitleText> 不匹配的 <AnnotationText> 。"
 
 #: src/wx/verify_dcp_result_panel.cc:474
 #, c-format
-msgid "The PKL %n has encrypted content but is not signed."
-msgstr "PKL %n包含已加密内容，但未签名。"
+msgid "The PKL %pkl has encrypted content but is not signed."
+msgstr "PKL %pkl包含已加密内容，但未签名。"
 
 #: src/wx/verify_dcp_result_panel.cc:637
 #, c-format
-msgid "The PKL %n has more than one asset with the same ID."
-msgstr "PKL %n 包含一个以上的资产具有相同的ID。"
+msgid "The PKL %pkl_id has more than one asset with the same ID."
+msgstr "PKL %pkl_id 包含一个以上的资产具有相同的ID。"
 
 #: src/wx/verify_dcp_result_panel.cc:283
 #, c-format
@@ -3550,25 +3550,25 @@ msgstr "SMPTE 字幕资产 %asset_id 有 <Text> 节点，但缺少 <LoadFont> �
 
 #: src/wx/verify_dcp_result_panel.cc:305
 #, c-format
-msgid "The XML in %f is malformed (%n)."
-msgstr "%f中的XML格式不正确(%n)。"
+msgid "The XML in %f is malformed (%error)."
+msgstr "%f中的XML格式不正确(%error)。"
 
 #: src/wx/verify_dcp_result_panel.cc:303
-msgid "The XML in %f is malformed on line %l (%n)."
-msgstr "%f 中的XML在第 %l 行格式不正确(%n)。"
+msgid "The XML in %f is malformed on line %l (%error)."
+msgstr "%f 中的XML在第 %l 行格式不正确(%error)。"
 
 #: src/wx/verify_dcp_result_panel.cc:357
 #, c-format
 msgid ""
-"The XML in the closed caption asset %f takes up %n bytes which is over the "
+"The XML in the closed caption asset %f takes up %size_in_bytes bytes which is over the "
 "256KB limit."
-msgstr "隐藏式字幕资产 %f 中的XML占用了 %n 字节，超过了256KB的限制。"
+msgstr "隐藏式字幕资产 %f 中的XML占用了 %size_in_bytes 字节，超过了256KB的限制。"
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
 msgid ""
-"The XML in the subtitle asset %n has more than one namespace declaration."
-msgstr "字幕资产 %n 中的 XML 包含多个命名空间声明。"
+"The XML in the subtitle asset %asset_id has more than one namespace declaration."
+msgstr "字幕资产 %asset_id 中的 XML 包含多个命名空间声明。"
 
 #: src/wx/verify_dcp_result_panel.cc:336
 #, c-format
@@ -3582,20 +3582,20 @@ msgstr "丢失资产 %f。"
 
 #: src/wx/verify_dcp_result_panel.cc:316
 #, c-format
-msgid "The asset %n has a duration of less than 1 second, which is invalid."
-msgstr "此资产 %n 的持续时间少于1秒，这是无效的。"
+msgid "The asset %asset_id has a duration of less than 1 second, which is invalid."
+msgstr "此资产 %asset_id 的持续时间少于1秒，这是无效的。"
 
 #: src/wx/verify_dcp_result_panel.cc:313
 #, c-format
 msgid ""
-"The asset %n has an intrinsic duration of less than 1 second, which is "
+"The asset %asset_id has an intrinsic duration of less than 1 second, which is "
 "invalid."
-msgstr "此资产 %n 的持续时间小于1秒，这是无效的。"
+msgstr "此资产 %asset_id 的持续时间小于1秒，这是无效的。"
 
 #: src/wx/verify_dcp_result_panel.cc:438
 #, c-format
-msgid "The asset %n has no <Hash> in the CPL."
-msgstr "此资产 %n 在CPL中没有<Hash>。"
+msgid "The asset %asset_id has no <Hash> in the CPL."
+msgstr "此资产 %asset_id 在CPL中没有<Hash>。"
 
 #: src/wx/verify_dcp_result_panel.cc:674
 #, c-format
@@ -3606,8 +3606,8 @@ msgstr "资产映射中 ID 为 %asset_id 的资产实际上具有 ID %other_asse
 
 #: src/wx/verify_dcp_result_panel.cc:432
 #, c-format
-msgid "The closed caption asset %n has no <EntryPoint> tag."
-msgstr "隐藏式字幕资产 %n 没有 <EntryPoint> 标记。"
+msgid "The closed caption asset %asset_id has no <EntryPoint> tag."
+msgstr "隐藏式字幕资产 %asset_id 没有 <EntryPoint> 标记。"
 
 #: src/wx/film_name_location_dialog.cc:146
 #, c-format
@@ -3651,16 +3651,16 @@ msgstr "第一个字幕或隐藏式字幕出现在第一卷4秒之前。"
 #: src/wx/verify_dcp_result_panel.cc:655
 #, c-format
 msgid ""
-"The font file for font ID \"%n\" was not found, or was not referred to in "
+"The font file for font ID \"%load_font_id\" was not found, or was not referred to in "
 "the ASSETMAP."
-msgstr "字体文件 ID “%n” 未找到，或未在 ASSETMAP 中引用。"
+msgstr "字体文件 ID “%load_font_id” 未找到，或未在 ASSETMAP 中引用。"
 
 #: src/wx/verify_dcp_result_panel.cc:363
 #, c-format
 msgid ""
-"The fonts in the timed text asset %f take up %n bytes which is over the 10MB "
+"The fonts in the timed text asset %f take up %size_in_bytes bytes which is over the 10MB "
 "limit."
-msgstr "字幕资产 %f 中的字体占用了 %n 字节，超过了10MB的限制。"
+msgstr "字幕资产 %f 中的字体占用了 %size_in_bytes 字节，超过了10MB的限制。"
 
 #: src/wx/verify_dcp_result_panel.cc:280
 msgid ""
@@ -3685,8 +3685,8 @@ msgstr "PKL中CPL哈希值与CPL文件的哈希值不一致。可能CPL文件已
 
 #: src/wx/verify_dcp_result_panel.cc:342
 #, c-format
-msgid "The invalid language tag %n is used."
-msgstr "使用了无效的语言标记%n。"
+msgid "The invalid language tag %language is used."
+msgstr "使用了无效的语言标记%language。"
 
 #: src/wx/smpte_metadata_dialog.cc:63
 #, c-format
@@ -3702,14 +3702,14 @@ msgstr "分卷包含的图像内容帧速率 %frame_rate 非法。"
 #: src/wx/verify_dcp_result_panel.cc:604
 #, c-format
 msgid ""
-"The reel duration (%s) of some timed text is not the same as the "
-"ContainerDuration (%s) of its MXF."
-msgstr "某些字幕文本的分卷持续时间 (%s) 与其MXF的容器持续时间 (%s) 不同。"
+"The reel duration (%other_duration) of some timed text is not the same as the "
+"ContainerDuration (%duration) of its MXF."
+msgstr "某些字幕文本的分卷持续时间 (%other_duration) 与其MXF的容器持续时间 (%duration) 不同。"
 
 #: src/wx/verify_dcp_result_panel.cc:408
 #, c-format
-msgid "The sound asset %f has an invalid bit depth of %n."
-msgstr "声音资产 %f 的位深度 %n 无效。"
+msgid "The sound asset %f has an invalid bit depth of %bit_depth."
+msgstr "声音资产 %f 的位深度 %bit_depth 无效。"
 
 #: src/wx/verify_dcp_result_panel.cc:405
 #, c-format
@@ -3741,19 +3741,19 @@ msgstr "字幕资产 %f 的<StartTime>不是零。"
 
 #: src/wx/verify_dcp_result_panel.cc:643
 #, c-format
-msgid "The subtitle asset %n contains no subtitles."
-msgstr "字幕资源 %n 不包含字幕。"
+msgid "The subtitle asset %asset_id contains no subtitles."
+msgstr "字幕资源 %asset_id 不包含字幕。"
 
 #: src/wx/verify_dcp_result_panel.cc:426
 #, c-format
-msgid "The subtitle asset %n has no <EntryPoint> tag."
-msgstr "字幕资产 %n 没有<EntryPoint>标记。"
+msgid "The subtitle asset %asset_id has no <EntryPoint> tag."
+msgstr "字幕资产 %asset_id 没有<EntryPoint>标记。"
 
 #: src/wx/verify_dcp_result_panel.cc:360
 #, c-format
 msgid ""
-"The timed text asset %f takes up %n bytes which is over the 115MB limit."
-msgstr "字幕文本资产 %f 占用了%n字节，超出了115MB的限制。"
+"The timed text asset %f takes up %size_in_bytes bytes which is over the 115MB limit."
+msgstr "字幕文本资产 %f 占用了%size_in_bytes字节，超出了115MB的限制。"
 
 #: src/wx/verify_dcp_result_panel.cc:351
 #, c-format
@@ -3769,8 +3769,8 @@ msgstr "视频资产 %f 的帧率 %frame_rate 非法。"
 
 #: src/wx/verify_dcp_result_panel.cc:345
 #, c-format
-msgid "The video asset %f uses the invalid image size %n."
-msgstr "视频资产 %f 使用了无效的图像大小 %n。"
+msgid "The video asset %f uses the invalid image size %size_in_pixels."
+msgstr "视频资产 %f 使用了无效的图像大小 %size_in_pixels。"
 
 #: src/wx/verify_dcp_result_panel.cc:354
 #, fuzzy
@@ -3835,10 +3835,10 @@ msgstr "该CPL没有包含加密内容。"
 #: src/wx/verify_dcp_result_panel.cc:333
 #, c-format
 msgid ""
-"This DCP refers to at the asset %n in another DCP (and perhaps others), so "
+"This DCP refers to at the asset %asset_id in another DCP (and perhaps others), so "
 "it is a \"version file\" (VF)"
 msgstr ""
-"此DCP引用了另一个DCP（可能还有其他DCP）中的资产 %n，因此它是一个“版本文件”"
+"此DCP引用了另一个DCP（可能还有其他DCP）中的资产 %asset_id，因此它是一个“版本文件”"
 "（VF）"
 
 #: src/wx/verify_dcp_result_panel.cc:339