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 9f03972f2..712018ab8 100644
--- a/cscript
+++ b/cscript
@@ -502,7 +502,7 @@ def build_with_cpp17(target):
def dependencies(target, options):
- deps = [('libdcp', '7a1a6bb6cd94', {'c++17': build_with_cpp17(target)})]
+ deps = [('libdcp', '613c7287fb3d', {'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 8e157e724..793d09a7b 100644
--- a/src/wx/po/cs_CZ.po
+++ b/src/wx/po/cs_CZ.po
@@ -570,8 +570,8 @@ msgstr "Dílo má v ASSETMAP prázdnou cestu."
#: src/wx/verify_dcp_result_panel.cc:631
#, c-format
-msgid "An invalid <ContentKind> %n has been used."
-msgstr "Byl použit neplatný <ContentKind> %n."
+msgid "An invalid <ContentKind> %content_kind has been used."
+msgstr "Byl použit neplatný <ContentKind> %content_kind."
#: src/wx/dkdm_output_panel.cc:204 src/wx/kdm_output_panel.cc:321
msgid "An unknown exception occurred."
diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index 2d1d68b0d..b0255235d 100644
--- a/src/wx/po/da_DK.po
+++ b/src/wx/po/da_DK.po
@@ -579,7 +579,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
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index e140fe293..a2509cd22 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -589,7 +589,7 @@ msgstr "Eine der Mediendaten ('Asset') hat einen leeren Pfad in der ASSETMAP."
#: 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
diff --git a/src/wx/po/el_GR.po b/src/wx/po/el_GR.po
index 7ccb318e0..97306c994 100644
--- a/src/wx/po/el_GR.po
+++ b/src/wx/po/el_GR.po
@@ -554,7 +554,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
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 5db0a7e0f..1e4813bcf 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -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
diff --git a/src/wx/po/fa_IR.po b/src/wx/po/fa_IR.po
index bece69deb..b59ac8334 100644
--- a/src/wx/po/fa_IR.po
+++ b/src/wx/po/fa_IR.po
@@ -570,8 +570,8 @@ msgstr "یکی از محتواها دارای یک مسیر خالی در فای
#: 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."
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 2e9fed555..d028df137 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -578,8 +578,8 @@ msgstr "Une ressource a un chemin vide dans ASSETMAP."
#: src/wx/verify_dcp_result_panel.cc:631
#, c-format
-msgid "An invalid <ContentKind> %n has been used."
-msgstr "Un <ContentKind> %n invalide a été utilisé."
+msgid "An invalid <ContentKind> %content_kind has been used."
+msgstr "Un <ContentKind> %content_kind invalide a été utilisé."
#: src/wx/dkdm_output_panel.cc:204 src/wx/kdm_output_panel.cc:321
msgid "An unknown exception occurred."
diff --git a/src/wx/po/hu_HU.po b/src/wx/po/hu_HU.po
index 7777f6711..c6e10f0d7 100644
--- a/src/wx/po/hu_HU.po
+++ b/src/wx/po/hu_HU.po
@@ -554,7 +554,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
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 89e58516b..93df002a5 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -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
diff --git a/src/wx/po/ja_JP.po b/src/wx/po/ja_JP.po
index 09651eaab..4286b2f10 100644
--- a/src/wx/po/ja_JP.po
+++ b/src/wx/po/ja_JP.po
@@ -579,8 +579,8 @@ msgstr "ASSETMAP内のデータのパスが空です。"
#: src/wx/verify_dcp_result_panel.cc:622
#, fuzzy, 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
#, fuzzy
diff --git a/src/wx/po/ko_KR.po b/src/wx/po/ko_KR.po
index 8fe906653..e6ec4d8a2 100644
--- a/src/wx/po/ko_KR.po
+++ b/src/wx/po/ko_KR.po
@@ -578,8 +578,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."
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index bd22c765f..34ad674e8 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -572,8 +572,8 @@ msgstr "Een asset heeft een leeg pad in de ASSETMAP."
#: src/wx/verify_dcp_result_panel.cc:631
#, c-format
-msgid "An invalid <ContentKind> %n has been used."
-msgstr "Er is een ongeldige <ContentKind> %n gebruikt."
+msgid "An invalid <ContentKind> %content_kind has been used."
+msgstr "Er is een ongeldige <ContentKind> %content_kind gebruikt."
#: src/wx/dkdm_output_panel.cc:204 src/wx/kdm_output_panel.cc:321
msgid "An unknown exception occurred."
diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index 25e631da7..982917373 100644
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -584,7 +584,7 @@ msgstr "Materiał ma pustą ścieżkę w pliku ASSETMAP."
#: 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
diff --git a/src/wx/po/pt_BR.po b/src/wx/po/pt_BR.po
index f7cb29c02..7200810c9 100644
--- a/src/wx/po/pt_BR.po
+++ b/src/wx/po/pt_BR.po
@@ -579,7 +579,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
diff --git a/src/wx/po/pt_PT.po b/src/wx/po/pt_PT.po
index e2b71b351..cdc32f20b 100644
--- a/src/wx/po/pt_PT.po
+++ b/src/wx/po/pt_PT.po
@@ -577,7 +577,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
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index 8bf478ca3..d29340be6 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -569,8 +569,8 @@ msgstr "Ресурс содержит пустой путь в ASSETMAP."
#: src/wx/verify_dcp_result_panel.cc:631
#, c-format
-msgid "An invalid <ContentKind> %n has been used."
-msgstr "Было использовано недопустимое значение <Content Kind> %n."
+msgid "An invalid <ContentKind> %content_kind has been used."
+msgstr "Было использовано недопустимое значение <Content Kind> %content_kind."
#: src/wx/dkdm_output_panel.cc:204 src/wx/kdm_output_panel.cc:321
msgid "An unknown exception occurred."
diff --git a/src/wx/po/sk_SK.po b/src/wx/po/sk_SK.po
index b5ae2309f..4ccae5873 100644
--- a/src/wx/po/sk_SK.po
+++ b/src/wx/po/sk_SK.po
@@ -582,7 +582,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
diff --git a/src/wx/po/sl_SI.po b/src/wx/po/sl_SI.po
index 8741b50df..ed63e7acf 100644
--- a/src/wx/po/sl_SI.po
+++ b/src/wx/po/sl_SI.po
@@ -573,8 +573,8 @@ msgstr "Sredstvo ima prazno pot v ASSETMAP."
#: src/wx/verify_dcp_result_panel.cc:631
#, c-format
-msgid "An invalid <ContentKind> %n has been used."
-msgstr "Uporabljen je bil neveljaven <ContentKind> %n."
+msgid "An invalid <ContentKind> %content_kind has been used."
+msgstr "Uporabljen je bil neveljaven <ContentKind> %content_kind."
#: src/wx/dkdm_output_panel.cc:204 src/wx/kdm_output_panel.cc:321
msgid "An unknown exception occurred."
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index 74faf9c41..b56518861 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -579,7 +579,7 @@ msgstr "En komponent har tom sökväg i ASSETMAP."
#: 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
diff --git a/src/wx/po/tr_TR.po b/src/wx/po/tr_TR.po
index 7ccb318e0..97306c994 100644
--- a/src/wx/po/tr_TR.po
+++ b/src/wx/po/tr_TR.po
@@ -554,7 +554,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
diff --git a/src/wx/po/uk_UA.po b/src/wx/po/uk_UA.po
index b93f0e5de..383f66874 100644
--- a/src/wx/po/uk_UA.po
+++ b/src/wx/po/uk_UA.po
@@ -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
diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index e0b5f01fb..6394bceb1 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -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."
diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc
index 667ad90e5..a82eab7d3 100644
--- a/src/wx/verify_dcp_result_panel.cc
+++ b/src/wx/verify_dcp_result_panel.cc
@@ -627,7 +627,7 @@ VerifyDCPResultPanel::add(shared_ptr<const VerifyDCPJob> job, bool many)
add(i.second, _("There is a <Duration> tag inside a <MainMarkers>."));
break;
case dcp::VerificationNote::Code::INVALID_CONTENT_KIND:
- add(i.second, _("An invalid <ContentKind> %n has been used."));
+ add(i.second, _("An invalid <ContentKind> %content_kind has been used."));
break;
case dcp::VerificationNote::Code::INVALID_MAIN_PICTURE_ACTIVE_AREA:
add(i.second, _("The <MainPictureActiveArea> is either not a multiple of 2, or is bigger than an asset."));