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, 46 insertions, 46 deletions

diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index b34c4be43..5872a4a36 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -237,12 +237,12 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:646
 #, c-format
-msgid "<IssueDate> has an invalid value %n"
+msgid "<IssueDate> has an invalid value %issue_date"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:652
 #, c-format
-msgid "<MainSoundConfiguration> is invalid (%n)"
+msgid "<MainSoundConfiguration> is invalid (%error)"
 msgstr ""
 
 #: src/wx/subtitle_appearance_dialog.cc:118
@@ -267,42 +267,42 @@ msgstr "A"
 
 #: src/wx/verify_dcp_result_panel.cc:555
 #, c-format
-msgid "A 2K JPEG2000 frame contains %n tile parts instead of 3."
+msgid "A 2K JPEG2000 frame contains %tile_parts tile parts instead of 3."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:569
 #, c-format
-msgid "A 2K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %n"
+msgid "A 2K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %capabilities"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:527
 #, c-format
-msgid "A 2K JPEG2000 frame has %n POC marker(s) instead of 0."
+msgid "A 2K JPEG2000 frame has %poc_markers POC marker(s) instead of 0."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:492
 #, c-format
-msgid "A 2K JPEG2000 frame has %n guard bits instead of 1."
+msgid "A 2K JPEG2000 frame has %guard_bits guard bits instead of 1."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:562
 #, c-format
-msgid "A 4K JPEG2000 frame contains %n tile parts instead of 6."
+msgid "A 4K JPEG2000 frame contains %tile_parts tile parts instead of 6."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:576
 #, c-format
-msgid "A 4K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %n"
+msgid "A 4K JPEG2000 frame contains an invalid Rsiz (capabilities) value of %capabilities"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:534
 #, c-format
-msgid "A 4K JPEG2000 frame has %n POC marker(s) instead of 1."
+msgid "A 4K JPEG2000 frame has %poc_markers POC marker(s) instead of 1."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:499
 #, c-format
-msgid "A 4K JPEG2000 frame has %n guard bits instead of 2."
+msgid "A 4K JPEG2000 frame has %guard_bits guard bits instead of 2."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:548
@@ -316,12 +316,12 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:520
 #, c-format
-msgid "A JPEG2000 frame has a code-block height of %n instead of 32."
+msgid "A JPEG2000 frame has a code-block height of %code_block_height instead of 32."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:513
 #, c-format
-msgid "A JPEG2000 frame has a code-block width of %n instead of 32."
+msgid "A JPEG2000 frame has a code-block width of %code_block_width instead of 32."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:583
@@ -339,7 +339,7 @@ msgstr "Una nuova versione di DCP-o-MATIC è disponibile."
 
 #: src/wx/verify_dcp_result_panel.cc:485
 #, c-format
-msgid "A picture frame has an invalid JPEG2000 codestream (%n)."
+msgid "A picture frame has an invalid JPEG2000 codestream (%error)."
 msgstr ""
 
 #: src/wx/hints_dialog.cc:183
@@ -578,7 +578,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:631
 #, c-format
-msgid "An invalid <ContentKind> %n has been used."
+msgid "An invalid <ContentKind> %content_kind has been used."
 msgstr ""
 
 #: src/wx/dkdm_output_panel.cc:204 src/wx/kdm_output_panel.cc:321
@@ -883,7 +883,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:435
 #, c-format
-msgid "Closed caption asset %n has a non-zero <EntryPoint>."
+msgid "Closed caption asset %asset_id has a non-zero <EntryPoint>."
 msgstr ""
 
 #: src/wx/closed_captions_dialog.cc:49 src/wx/dcp_referencing_dialog.cc:115
@@ -1035,7 +1035,7 @@ msgstr "Impossibile caricare la KDM (%s)"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Impossibile caricare la KDM (%s)"
 
 #: src/wx/gl_video_view.cc:131
@@ -1623,7 +1623,7 @@ msgstr ""
 #, c-format
 msgid ""
 "Frame %frame has an image component that is too large (component %component "
-"is %size bytes in size)."
+"is %size_in_bytes bytes in size)."
 msgstr ""
 
 #: src/wx/dcp_panel.cc:868
@@ -3394,7 +3394,7 @@ msgstr "Aspetto dei sottotitoli"
 
 #: src/wx/verify_dcp_result_panel.cc:429
 #, c-format
-msgid "Subtitle asset %n has a non-zero <EntryPoint>."
+msgid "Subtitle asset %asset_id has a non-zero <EntryPoint>."
 msgstr ""
 
 #: src/wx/export_subtitles_dialog.cc:105
@@ -3500,7 +3500,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:640
 #, c-format
-msgid "The ASSETMAP %n has more than one asset with the same ID."
+msgid "The ASSETMAP %asset_map_id has more than one asset with the same ID."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:594
@@ -3518,7 +3518,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:680
 #, c-format
-msgid "The CPL %cpl has an invalid namespace %n"
+msgid "The CPL %cpl has an invalid namespace %xml_namespace"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:471
@@ -3553,17 +3553,17 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:468
 #, c-format
-msgid "The CPL %f has an invalid CPL extension metadata tag (%n)"
+msgid "The CPL %f has an invalid CPL extension metadata tag (%error)"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:453
 #, c-format
-msgid "The DCP has a FFOC of %n instead of 1."
+msgid "The DCP has a FFOC of %time instead of 1."
 msgstr ""
 
 #: 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."
+msgid "The DCP has a LFOC of %time instead of the reel duration minus one."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
@@ -3614,24 +3614,24 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:699
 #, c-format
-msgid "The PKL %f has an invalid namespace %n"
+msgid "The PKL %f has an invalid namespace %xml_namespace"
 msgstr ""
 
 #: 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 ""
 
 #: src/wx/verify_dcp_result_panel.cc:474
 #, c-format
-msgid "The PKL %n has encrypted content but is not signed."
+msgid "The PKL %pkl has encrypted content but is not signed."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:637
 #, c-format
-msgid "The PKL %n has more than one asset with the same ID."
+msgid "The PKL %pkl_id has more than one asset with the same ID."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:283
@@ -3658,24 +3658,24 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:305
 #, c-format
-msgid "The XML in %f is malformed (%n)."
+msgid "The XML in %f is malformed (%error)."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:303
-msgid "The XML in %f is malformed on line %l (%n)."
+msgid "The XML in %f is malformed on line %l (%error)."
 msgstr ""
 
 #: 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 ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
 msgid ""
-"The XML in the subtitle asset %n has more than one namespace declaration."
+"The XML in the subtitle asset %asset_id has more than one namespace declaration."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:336
@@ -3690,19 +3690,19 @@ msgstr ""
 
 #: 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."
+msgid "The asset %asset_id has a duration of less than 1 second, which is invalid."
 msgstr ""
 
 #: 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 ""
 
 #: src/wx/verify_dcp_result_panel.cc:438
 #, c-format
-msgid "The asset %n has no <Hash> in the CPL."
+msgid "The asset %asset_id has no <Hash> in the CPL."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:674
@@ -3714,7 +3714,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:432
 #, c-format
-msgid "The closed caption asset %n has no <EntryPoint> tag."
+msgid "The closed caption asset %asset_id has no <EntryPoint> tag."
 msgstr ""
 
 #: src/wx/film_name_location_dialog.cc:146
@@ -3757,14 +3757,14 @@ msgstr ""
 #: 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 ""
 
 #: 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 ""
 
@@ -3791,7 +3791,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:342
 #, c-format
-msgid "The invalid language tag %n is used."
+msgid "The invalid language tag %language is used."
 msgstr ""
 
 #: src/wx/smpte_metadata_dialog.cc:63
@@ -3808,13 +3808,13 @@ msgstr ""
 #: 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."
+"The reel duration (%other_duration) of some timed text is not the same as the "
+"ContainerDuration (%duration) of its MXF."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:408
 #, c-format
-msgid "The sound asset %f has an invalid bit depth of %n."
+msgid "The sound asset %f has an invalid bit depth of %bit_depth."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:405
@@ -3845,18 +3845,18 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:643
 #, c-format
-msgid "The subtitle asset %n contains no subtitles."
+msgid "The subtitle asset %asset_id contains no subtitles."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:426
 #, c-format
-msgid "The subtitle asset %n has no <EntryPoint> tag."
+msgid "The subtitle asset %asset_id has no <EntryPoint> tag."
 msgstr ""
 
 #: 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."
+"The timed text asset %f takes up %size_in_bytes bytes which is over the 115MB limit."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:351
@@ -3873,7 +3873,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:345
 #, c-format
-msgid "The video asset %f uses the invalid image size %n."
+msgid "The video asset %f uses the invalid image size %size_in_pixels."
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:354
@@ -3940,7 +3940,7 @@ msgstr "Il contenuto del CPL non è crittografato."
 #: 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 ""