summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cscript2
-rw-r--r--src/wx/po/cs_CZ.po4
-rw-r--r--src/wx/po/da_DK.po2
-rw-r--r--src/wx/po/de_DE.po2
-rw-r--r--src/wx/po/el_GR.po2
-rw-r--r--src/wx/po/es_ES.po2
-rw-r--r--src/wx/po/fa_IR.po4
-rw-r--r--src/wx/po/fr_FR.po4
-rw-r--r--src/wx/po/hu_HU.po2
-rw-r--r--src/wx/po/it_IT.po2
-rw-r--r--src/wx/po/ja_JP.po4
-rw-r--r--src/wx/po/ko_KR.po4
-rw-r--r--src/wx/po/nl_NL.po4
-rw-r--r--src/wx/po/pl_PL.po2
-rw-r--r--src/wx/po/pt_BR.po2
-rw-r--r--src/wx/po/pt_PT.po2
-rw-r--r--src/wx/po/ru_RU.po4
-rw-r--r--src/wx/po/sk_SK.po2
-rw-r--r--src/wx/po/sl_SI.po4
-rw-r--r--src/wx/po/sv_SE.po2
-rw-r--r--src/wx/po/tr_TR.po2
-rw-r--r--src/wx/po/uk_UA.po2
-rw-r--r--src/wx/po/zh_CN.po4
-rw-r--r--src/wx/verify_dcp_result_panel.cc2
24 files changed, 33 insertions, 33 deletions
diff --git a/cscript b/cscript
index ea795b51f..5d4b9ec8d 100644
--- a/cscript
+++ b/cscript
@@ -502,7 +502,7 @@ def build_with_cpp17(target):
def dependencies(target, options):
- deps = [('libdcp', 'd7f52153b4e5', {'c++17': build_with_cpp17(target)})]
+ deps = [('libdcp', '01e7bb0bb80f', {'c++17': build_with_cpp17(target)})]
deps.append(('libsub', 'v1.6.59'))
deps.append(('leqm-nrt', 'd75d0af984d9c14bfefca8f1bdbc215c3bf3a388'))
if target.platform != 'linux' or target.distro != 'arch':
diff --git a/src/wx/po/cs_CZ.po b/src/wx/po/cs_CZ.po
index 4661f7899..afbeb32a8 100644
--- a/src/wx/po/cs_CZ.po
+++ b/src/wx/po/cs_CZ.po
@@ -3421,8 +3421,8 @@ msgstr "<MainPictureActiveArea> buď není násobkem 2, nebo je větší než as
#: 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 má více než jeden asset se stejným ID."
+msgid "The ASSETMAP %asset_map_id has more than one asset with the same ID."
+msgstr "ASSETMAP %asset_map_id má více než jeden asset se stejným ID."
#: src/wx/verify_dcp_result_panel.cc:594
msgid ""
diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index 6639bf51d..cb70aed1a 100644
--- a/src/wx/po/da_DK.po
+++ b/src/wx/po/da_DK.po
@@ -3486,7 +3486,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
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 381b84042..50a584a57 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -3592,7 +3592,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
diff --git a/src/wx/po/el_GR.po b/src/wx/po/el_GR.po
index c7cc06160..df67cd468 100644
--- a/src/wx/po/el_GR.po
+++ b/src/wx/po/el_GR.po
@@ -3324,7 +3324,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
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 2c7c426e0..fd8384956 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -3510,7 +3510,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
diff --git a/src/wx/po/fa_IR.po b/src/wx/po/fa_IR.po
index fc3d9dc92..b61743317 100644
--- a/src/wx/po/fa_IR.po
+++ b/src/wx/po/fa_IR.po
@@ -3433,8 +3433,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 بیش از یک محتوا با شتاسه مشابه وجود دارد."
+msgid "The ASSETMAP %asset_map_id has more than one asset with the same ID."
+msgstr "در فایل ASSETMAP بنام %asset_map_id بیش از یک محتوا با شتاسه مشابه وجود دارد."
#: src/wx/verify_dcp_result_panel.cc:594
msgid ""
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 3e1370879..9d1f20ea0 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -3455,8 +3455,8 @@ msgstr ""
#: src/wx/verify_dcp_result_panel.cc:640
#, c-format
-msgid "The ASSETMAP %n has more than one asset with the same ID."
-msgstr "L'ASSETMAP %n a plusieurs ressources avec un même ID."
+msgid "The ASSETMAP %asset_map_id has more than one asset with the same ID."
+msgstr "L'ASSETMAP %asset_map_id a plusieurs ressources avec un même ID."
#: src/wx/verify_dcp_result_panel.cc:594
msgid ""
diff --git a/src/wx/po/hu_HU.po b/src/wx/po/hu_HU.po
index 6f6897b38..bd26361a9 100644
--- a/src/wx/po/hu_HU.po
+++ b/src/wx/po/hu_HU.po
@@ -3330,7 +3330,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
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index ad72433c8..85671632f 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -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
diff --git a/src/wx/po/ja_JP.po b/src/wx/po/ja_JP.po
index 09b3b63bc..e41c6422d 100644
--- a/src/wx/po/ja_JP.po
+++ b/src/wx/po/ja_JP.po
@@ -3427,8 +3427,8 @@ msgstr ""
#: src/wx/verify_dcp_result_panel.cc:631
#, 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:585
#, fuzzy
diff --git a/src/wx/po/ko_KR.po b/src/wx/po/ko_KR.po
index 0b50a39a1..fc47c8201 100644
--- a/src/wx/po/ko_KR.po
+++ b/src/wx/po/ko_KR.po
@@ -3460,8 +3460,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
#, fuzzy
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index a358de744..62d7937a3 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -3419,8 +3419,8 @@ msgstr ""
#: src/wx/verify_dcp_result_panel.cc:640
#, c-format
-msgid "The ASSETMAP %n has more than one asset with the same ID."
-msgstr "De ASSETMAP %n heeft meer dan één asset met dezelfde ID."
+msgid "The ASSETMAP %asset_map_id has more than one asset with the same ID."
+msgstr "De ASSETMAP %asset_map_id heeft meer dan één asset met dezelfde ID."
#: src/wx/verify_dcp_result_panel.cc:594
msgid ""
diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index 34c790d47..5bb02e98a 100644
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -3520,7 +3520,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
diff --git a/src/wx/po/pt_BR.po b/src/wx/po/pt_BR.po
index 6da8664f5..f3e5675d3 100644
--- a/src/wx/po/pt_BR.po
+++ b/src/wx/po/pt_BR.po
@@ -3513,7 +3513,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
diff --git a/src/wx/po/pt_PT.po b/src/wx/po/pt_PT.po
index c6b4bcd63..6513076bb 100644
--- a/src/wx/po/pt_PT.po
+++ b/src/wx/po/pt_PT.po
@@ -3527,7 +3527,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
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index 4fbef031f..070e21706 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -3461,9 +3461,9 @@ 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 ""
-"В ASSETMAP %n содержится более одного ресурса с одинаковым идентификатором."
+"В ASSETMAP %asset_map_id содержится более одного ресурса с одинаковым идентификатором."
#: src/wx/verify_dcp_result_panel.cc:594
msgid ""
diff --git a/src/wx/po/sk_SK.po b/src/wx/po/sk_SK.po
index 98d9d7f9e..d63f92f5b 100644
--- a/src/wx/po/sk_SK.po
+++ b/src/wx/po/sk_SK.po
@@ -3529,7 +3529,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
diff --git a/src/wx/po/sl_SI.po b/src/wx/po/sl_SI.po
index 4868d1ac7..29ff87d3d 100644
--- a/src/wx/po/sl_SI.po
+++ b/src/wx/po/sl_SI.po
@@ -3457,8 +3457,8 @@ msgstr "<MainPictureActiveArea> ni večkratnik 2 ali pa je večji od sredstva."
#: 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 ima več kot eno sredstvo z istim ID-jem."
+msgid "The ASSETMAP %asset_map_id has more than one asset with the same ID."
+msgstr "ASSETMAP %asset_map_id ima več kot eno sredstvo z istim ID-jem."
#: src/wx/verify_dcp_result_panel.cc:594
msgid ""
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 37b38607a..1afc621f7 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -3510,7 +3510,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
diff --git a/src/wx/po/tr_TR.po b/src/wx/po/tr_TR.po
index c7cc06160..df67cd468 100644
--- a/src/wx/po/tr_TR.po
+++ b/src/wx/po/tr_TR.po
@@ -3324,7 +3324,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
diff --git a/src/wx/po/uk_UA.po b/src/wx/po/uk_UA.po
index eb8b36245..018d3d863 100644
--- a/src/wx/po/uk_UA.po
+++ b/src/wx/po/uk_UA.po
@@ -3504,7 +3504,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
diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index 7caa41cbb..d916cbafb 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -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 ""
diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc
index 7582c6acd..9ffef6ef2 100644
--- a/src/wx/verify_dcp_result_panel.cc
+++ b/src/wx/verify_dcp_result_panel.cc
@@ -636,7 +636,7 @@ VerifyDCPResultPanel::add(shared_ptr<const VerifyDCPJob> job, bool many)
add(i.second, _("The PKL %pkl_id has more than one asset with the same ID."));
break;
case dcp::VerificationNote::Code::DUPLICATE_ASSET_ID_IN_ASSETMAP:
- add(i.second, _("The ASSETMAP %n has more than one asset with the same ID."));
+ add(i.second, _("The ASSETMAP %asset_map_id has more than one asset with the same ID."));
break;
case dcp::VerificationNote::Code::MISSING_SUBTITLE:
add(i.second, _("The subtitle asset %n contains no subtitles."));