Tweak verification code for some changes in libdcp.

23 files changed, 102 insertions, 99 deletions

diff --git a/src/wx/po/cs_CZ.po b/src/wx/po/cs_CZ.po
index bf65fc1e9..7c2ae9bc5 100644
--- a/src/wx/po/cs_CZ.po
+++ b/src/wx/po/cs_CZ.po
@@ -356,10 +356,10 @@ msgstr "Titulky jsou delší, než je reel."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"Titulky nebo skryté titulky odkazují na písmo s ID %id, které nemá "
+"Titulky nebo skryté titulky odkazují na písmo s ID %load_font_id, které nemá "
 "odpovídající node <LoadFont>."
 
 #: src/wx/sound_preferences_page.cc:199
@@ -3582,8 +3582,8 @@ msgstr "ID prostředku v časované textové mxf neodpovídá ID obsaženého XM
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
-msgstr "Titulky SMPTE %id má uzly <Text>, ale žádný uzel <LoadFont>"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
+msgstr "Titulky SMPTE %asset_id má uzly <Text>, ale žádný uzel <LoadFont>"
 
 #: src/wx/verify_dcp_result_panel.cc:296
 #, c-format
@@ -3640,8 +3640,8 @@ msgstr "Datový zdroj %n nemá <Hash> v CPL."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
-msgstr "Dílo s ID %id v mapě aktiv má ve skutečnosti id %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
+msgstr "Dílo s ID %asset_id v mapě aktiv má ve skutečnosti id %other_asset_id"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index 0571951e6..d856c98ce 100644
--- a/src/wx/po/da_DK.po
+++ b/src/wx/po/da_DK.po
@@ -355,7 +355,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3635,7 +3635,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3689,7 +3689,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 63ed7cea7..78981b9b8 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -362,7 +362,7 @@ msgstr "A subtitle lasts longer than the reel it is in."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3745,7 +3745,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3801,7 +3801,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/el_GR.po b/src/wx/po/el_GR.po
index 5796ffd4a..4873f22d6 100644
--- a/src/wx/po/el_GR.po
+++ b/src/wx/po/el_GR.po
@@ -349,7 +349,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3476,7 +3476,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3530,7 +3530,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index d239fe4c4..2bfd6ad7c 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -354,7 +354,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3657,7 +3657,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3711,7 +3711,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/fa_IR.po b/src/wx/po/fa_IR.po
index 86e304245..e6c450904 100644
--- a/src/wx/po/fa_IR.po
+++ b/src/wx/po/fa_IR.po
@@ -357,10 +357,10 @@ msgstr "یک زیرنویس طولانی تر از حلقه فیلمش است."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"یک زیرنویس به فونتی با شناسه%i اشاره دارد که یک گره متناظر <LoadFont>ندارد."
+"یک زیرنویس به فونتی با شناسه%load_font_id اشاره دارد که یک گره متناظر <LoadFont>ندارد."
 
 #: src/wx/sound_preferences_page.cc:199
 msgid "ALSA"
@@ -3598,9 +3598,9 @@ msgstr "شناسه منبع در متن زمان‌بندی‌شده MXF با ش
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
-"فایل زیرنویس اس ام پی تی ای %i یک گره <Text> دارد اما گره <LoadFont> ندارد"
+"فایل زیرنویس اس ام پی تی ای %asset_id یک گره <Text> دارد اما گره <LoadFont> ندارد"
 
 #: src/wx/verify_dcp_result_panel.cc:296
 #, c-format
@@ -3656,8 +3656,8 @@ msgstr "فایل %n در سی پی ال فاقد <Hash> است."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
-msgstr "فایل با شناسه %id در ASSETMAP در واقع شناسه %other_id دارد"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
+msgstr "فایل با شناسه %asset_id در ASSETMAP در واقع شناسه %other_asset_id دارد"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 52e484050..dbd7c0444 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -364,10 +364,10 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"Un sous-titre (codé) fait référence à une police d'ID %id qui n'a pas de "
+"Un sous-titre (codé) fait référence à une police d'ID %load_font_id qui n'a pas de "
 "nœud <LoadFont> correspondant."
 
 #: src/wx/sound_preferences_page.cc:199
@@ -3625,9 +3625,9 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
-"Le sous-titre SMPTE %id contient des nœuds <Text>, mais pas de nœud "
+"Le sous-titre SMPTE %asset_id contient des nœuds <Text>, mais pas de nœud "
 "<LoadFont>"
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3688,9 +3688,9 @@ msgstr "La ressource %n n'a pas de <Hash> dans la CPL."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
-"La ressource dont l'ID est %id dans l'ASSETMAP a en fait un ID de %other_id"
+"La ressource dont l'ID est %asset_id dans l'ASSETMAP a en fait un ID de %other_asset_id"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/po/hu_HU.po b/src/wx/po/hu_HU.po
index cf3bedccc..4051d277c 100644
--- a/src/wx/po/hu_HU.po
+++ b/src/wx/po/hu_HU.po
@@ -349,7 +349,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3479,7 +3479,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3533,7 +3533,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index d02b77003..949243003 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -354,7 +354,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3647,7 +3647,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3701,7 +3701,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/ja_JP.po b/src/wx/po/ja_JP.po
index 1faf7152d..6b3abfdf9 100644
--- a/src/wx/po/ja_JP.po
+++ b/src/wx/po/ja_JP.po
@@ -361,7 +361,7 @@ msgstr "字幕の長さは、字幕が含まれるリールの長さよりも長
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3588,7 +3588,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3644,7 +3644,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/ko_KR.po b/src/wx/po/ko_KR.po
index f51f35d46..8fbe76adf 100644
--- a/src/wx/po/ko_KR.po
+++ b/src/wx/po/ko_KR.po
@@ -359,10 +359,10 @@ msgstr "자막이 해당 릴보다 더 오래 지속됩니다."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"자막 또는 캡션이 해당 <LoadFont> 노드가 없는 ID %id인 폰트를 참조하고 있습니"
+"자막 또는 캡션이 해당 <LoadFont> 노드가 없는 ID %load_font_id인 폰트를 참조하고 있습니"
 "다."
 
 #: src/wx/sound_preferences_page.cc:199
@@ -3615,8 +3615,8 @@ msgstr "타임드 텍스트 MXF의 리소스 ID가 포함된 XML의 ID와 일치
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
-msgstr "SMPTE 자막 에셋 %id에 <Text> 노드는 있지만 <LoadFont> 노드가 없습니다."
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
+msgstr "SMPTE 자막 에셋 %asset_id에 <Text> 노드는 있지만 <LoadFont> 노드가 없습니다."
 
 #: src/wx/verify_dcp_result_panel.cc:296
 #, c-format
@@ -3669,8 +3669,8 @@ msgstr "에셋 %n에 대한 <Hash>가 CPL에 없습니다."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
-msgstr "에셋 맵의 ID %id인 에셋이 실제로는 %other_id라는 ID를 가지고 있습니다."
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
+msgstr "에셋 맵의 ID %asset_id인 에셋이 실제로는 %other_asset_id라는 ID를 가지고 있습니다."
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 1549f16e2..fb788201b 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -359,10 +359,10 @@ msgstr "Een ondertitel duurt langer dan de reel waarin hij zit."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"Een ondertitel of closed caption refereert aan een font met ID %id dat geen "
+"Een ondertitel of closed caption refereert aan een font met ID %load_font_id dat geen "
 "corresponderende <LoadFont> node heeft."
 
 #: src/wx/sound_preferences_page.cc:199
@@ -3591,9 +3591,9 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
-"De SMPTE subtitle asset %id heeft <Text> nodes maar geen <LoadFont> node"
+"De SMPTE subtitle asset %asset_id heeft <Text> nodes maar geen <LoadFont> node"
 
 #: src/wx/verify_dcp_result_panel.cc:296
 #, c-format
@@ -3652,9 +3652,9 @@ msgstr "De asset %n heeft geen <Hash> in de CPL."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
-"De asset met ID %id in de asset map heeft in werkelijkheid een ID %other_id"
+"De asset met ID %asset_id in de asset map heeft in werkelijkheid een ID %other_asset_id"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index cbc3ac0ec..5ce208e76 100644
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -368,7 +368,7 @@ msgstr "Napis trwa dłużej niż długość rolki, na której się znajduje."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3691,7 +3691,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3748,7 +3748,7 @@ msgstr "Zawartość %n nie ma znacznika <Hash> w pliku CPL."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/pt_BR.po b/src/wx/po/pt_BR.po
index 846a6779c..6867f5810 100644
--- a/src/wx/po/pt_BR.po
+++ b/src/wx/po/pt_BR.po
@@ -355,7 +355,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3660,7 +3660,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3714,7 +3714,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/pt_PT.po b/src/wx/po/pt_PT.po
index e7ba8e49f..0cc868294 100644
--- a/src/wx/po/pt_PT.po
+++ b/src/wx/po/pt_PT.po
@@ -353,7 +353,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3674,7 +3674,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3728,7 +3728,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index fcd68f058..a4c379f79 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -355,10 +355,10 @@ msgstr "Субтитр длится дольше, чем продолжител�
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"Субтитры или скрытые субтитры относятся к шрифту с идентификатором %id, "
+"Субтитры или скрытые субтитры относятся к шрифту с идентификатором %load_font_id, "
 "который не имеет соответствующего узла <LoadFont>."
 
 #: src/wx/sound_preferences_page.cc:199
@@ -3628,8 +3628,8 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
-msgstr "В ресурсе %id субтитров SMPTE есть узлы <Text>, но нет узла <LoadFont>"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
+msgstr "В ресурсе %asset_id субтитров SMPTE есть узлы <Text>, но нет узла <LoadFont>"
 
 #: src/wx/verify_dcp_result_panel.cc:296
 #, c-format
@@ -3685,10 +3685,10 @@ msgstr "Ресурс %n не содержит тег <Hash> в CPL."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
-"Ресурс с идентификатором %id в карте ресурсов на самом деле имеет "
-"идентификатор %other_id"
+"Ресурс с идентификатором %asset_id в карте ресурсов на самом деле имеет "
+"идентификатор %other_asset_id"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/po/sk_SK.po b/src/wx/po/sk_SK.po
index 4eb67f8bb..d33c46708 100644
--- a/src/wx/po/sk_SK.po
+++ b/src/wx/po/sk_SK.po
@@ -354,7 +354,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3676,7 +3676,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3730,7 +3730,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/sl_SI.po b/src/wx/po/sl_SI.po
index 22b5bad82..817d8c604 100644
--- a/src/wx/po/sl_SI.po
+++ b/src/wx/po/sl_SI.po
@@ -355,10 +355,10 @@ msgstr "Podnaslov traja dlje, kot je dolg kolut, na katerem se nahaja."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"Podnaslov ali zaprti napis se slicuje na pisavo z ID %id, ki nima ustreznega "
+"Podnaslov ali zaprti napis se slicuje na pisavo z ID %load_font_id, ki nima ustreznega "
 "vozlišča <LoadFont>."
 
 #: src/wx/sound_preferences_page.cc:199
@@ -3442,7 +3442,7 @@ msgstr "Čas »do« mora slediti času »od«."
 #: src/wx/verify_dcp_result_panel.cc:668
 #, fuzzy, c-format
 msgid "The <LabelText> in a <ContentVersion> in CPL %cpl is empty"
-msgstr "<LabelText> v <ContentVersion> v CPL %id je prazen"
+msgstr "<LabelText> v <ContentVersion> v CPL %cpl je prazen"
 
 #: src/wx/verify_dcp_result_panel.cc:625
 msgid ""
@@ -3618,9 +3618,9 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
-"Sredstvo podnaslovov SMPTE %id ima vozlišča <Text>, nima pa vozlišča "
+"Sredstvo podnaslovov SMPTE %asset_id ima vozlišča <Text>, nima pa vozlišča "
 "<LoadFont> "
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3677,8 +3677,8 @@ msgstr "Sredstvo %n nima kontrolne vsote <Hash> v CPL."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
-msgstr "Sredstvo z ID %id v mapi sredstev ima dejansko ID %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
+msgstr "Sredstvo z ID %asset_id v mapi sredstev ima dejansko ID %other_asset_id"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 6af86f052..db3ca0774 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -361,7 +361,7 @@ msgstr "En undertext är längre än akten den ligger i."
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3677,7 +3677,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3735,7 +3735,7 @@ msgstr "Komponenten %n har ingen <Hash> i CPL:en."
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/tr_TR.po b/src/wx/po/tr_TR.po
index 8628d9f3c..b3b61996f 100644
--- a/src/wx/po/tr_TR.po
+++ b/src/wx/po/tr_TR.po
@@ -349,7 +349,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3473,7 +3473,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3527,7 +3527,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/uk_UA.po b/src/wx/po/uk_UA.po
index b31221bfc..d28fdca54 100644
--- a/src/wx/po/uk_UA.po
+++ b/src/wx/po/uk_UA.po
@@ -353,7 +353,7 @@ msgstr ""
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
 
@@ -3651,7 +3651,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:296
@@ -3705,7 +3705,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
 msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:423
diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 40a4fb56f..9323fddcb 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -365,10 +365,10 @@ msgstr "字幕的持续时间比卷轴长。"
 #: src/wx/verify_dcp_result_panel.cc:659
 #, c-format
 msgid ""
-"A subtitle or closed caption refers to a font with ID %id that does not have "
+"A subtitle or closed caption refers to a font with ID %load_font_id that does not have "
 "a corresponding <LoadFont> node."
 msgstr ""
-"字幕或隐藏字幕指的是 ID 为 %id 的字体，该字体没有相应的 <LoadFont> 节点。"
+"字幕或隐藏字幕指的是 ID 为 %load_font_id 的字体，该字体没有相应的 <LoadFont> 节点。"
 
 #: src/wx/sound_preferences_page.cc:199
 msgid "ALSA"
@@ -3538,8 +3538,8 @@ msgstr "时间文本 MXF 中的资源 ID 与所包含的 XML 的 ID 不匹配。
 
 #: src/wx/verify_dcp_result_panel.cc:662
 #, c-format
-msgid "The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"
-msgstr "SMPTE 字幕资产 %id 有 <Text> 节点，但缺少 <LoadFont> 节点"
+msgid "The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"
+msgstr "SMPTE 字幕资产 %asset_id 有 <Text> 节点，但缺少 <LoadFont> 节点"
 
 #: src/wx/verify_dcp_result_panel.cc:296
 #, c-format
@@ -3592,8 +3592,8 @@ msgstr "此资产 %n 在CPL中没有<Hash>。"
 
 #: src/wx/verify_dcp_result_panel.cc:665
 #, c-format
-msgid "The asset with ID %id in the asset map actually has an id of %other_id"
-msgstr "资产映射中 ID 为 %id 的资产实际上具有 ID %other_id"
+msgid "The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"
+msgstr "资产映射中 ID 为 %asset_id 的资产实际上具有 ID %other_asset_id"
 
 #: src/wx/verify_dcp_result_panel.cc:423
 #, c-format
diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc
index 2f4c16374..d2003407f 100644
--- a/src/wx/verify_dcp_result_panel.cc
+++ b/src/wx/verify_dcp_result_panel.cc
@@ -208,11 +208,14 @@ VerifyDCPResultPanel::add(shared_ptr<const VerifyDCPJob> job, bool many)
 		if (auto const size = note.size()) {
 			message.Replace(char_to_wx("%size"), std_to_wx(fmt::to_string(*size)));
 		}
-		if (auto const id = note.id()) {
-			message.Replace(char_to_wx("%id"), std_to_wx(*id));
+		if (auto const load_font_id = note.load_font_id()) {
+			message.Replace(char_to_wx("%load_font_id"), std_to_wx(*load_font_id));
 		}
-		if (auto const other_id = note.other_id()) {
-			message.Replace(char_to_wx("%other_id"), std_to_wx(*other_id));
+		if (auto const asset_id = note.asset_id()) {
+			message.Replace(char_to_wx("%asset_id"), std_to_wx(*asset_id));
+		}
+		if (auto const other_asset_id = note.other_asset_id()) {
+			message.Replace(char_to_wx("%other_asset_id"), std_to_wx(*other_asset_id));
 		}
 		if (auto const cpl = note.cpl_id()) {
 			message.Replace(char_to_wx("%cpl"), std_to_wx(*cpl));
@@ -656,13 +659,13 @@ VerifyDCPResultPanel::add(shared_ptr<const VerifyDCPJob> job, bool many)
 			add(i.second, _("The XML in the subtitle asset %n has more than one namespace declaration."));
 			break;
 		case dcp::VerificationNote::Code::MISSING_LOAD_FONT_FOR_FONT:
-			add(i.second, _("A subtitle or closed caption refers to a font with ID %id that does not have a corresponding <LoadFont> node."));
+			add(i.second, _("A subtitle or closed caption refers to a font with ID %load_font_id that does not have a corresponding <LoadFont> node."));
 			break;
 		case dcp::VerificationNote::Code::MISSING_LOAD_FONT:
-			add(i.second, _("The SMPTE subtitle asset %id has <Text> nodes but no <LoadFont> node"));
+			add(i.second, _("The SMPTE subtitle asset %asset_id has <Text> nodes but no <LoadFont> node"));
 			break;
 		case dcp::VerificationNote::Code::MISMATCHED_ASSET_MAP_ID:
-			add(i.second, _("The asset with ID %id in the asset map actually has an id of %other_id"));
+			add(i.second, _("The asset with ID %asset_id in the asset map actually has an id of %other_asset_id"));
 			break;
 		case dcp::VerificationNote::Code::EMPTY_CONTENT_VERSION_LABEL_TEXT:
 			add(i.second, _("The <LabelText> in a <ContentVersion> in CPL %cpl is empty"));