FAILED_READ: note -> error.

24 files changed, 35 insertions, 32 deletions

diff --git a/cscript b/cscript
index 561fd4869..4c33d6859 100644
--- a/cscript
+++ b/cscript
@@ -502,7 +502,7 @@ def build_with_cpp17(target):
 
 
 def dependencies(target, options):
-    deps = [('libdcp', '5fe14174334968cbe65454f8f7b14512aa6c50ee', {'c++17': build_with_cpp17(target)})]
+    deps = [('libdcp', '2105b40ff184', {'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 cb5a307f7..2ccf05b6e 100644
--- a/src/wx/po/cs_CZ.po
+++ b/src/wx/po/cs_CZ.po
@@ -1007,8 +1007,8 @@ msgstr "Obsah nelze přehrát"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
-msgstr "Nelze načíst DCP (%n)"
+msgid "Could not read DCP (%error)"
+msgstr "Nelze načíst DCP (%error)"
 
 #: src/wx/gl_video_view.cc:131
 #, c-format
diff --git a/src/wx/po/da_DK.po b/src/wx/po/da_DK.po
index ca91be4f1..0ec5d5e16 100644
--- a/src/wx/po/da_DK.po
+++ b/src/wx/po/da_DK.po
@@ -1033,7 +1033,7 @@ msgstr "Kunne ikke indlæse KDM"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Kunne ikke indlæse KDM"
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/de_DE.po b/src/wx/po/de_DE.po
index 843c42b49..cee4a0916 100644
--- a/src/wx/po/de_DE.po
+++ b/src/wx/po/de_DE.po
@@ -1060,7 +1060,7 @@ msgstr "Konnte KDM nicht laden"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Konnte KDM nicht laden"
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/el_GR.po b/src/wx/po/el_GR.po
index 82dca6b59..d891bb2a9 100644
--- a/src/wx/po/el_GR.po
+++ b/src/wx/po/el_GR.po
@@ -987,7 +987,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr ""
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/es_ES.po b/src/wx/po/es_ES.po
index 1449f9229..c700b2deb 100644
--- a/src/wx/po/es_ES.po
+++ b/src/wx/po/es_ES.po
@@ -1036,7 +1036,7 @@ msgstr "No se pudo cargar la KDM."
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "No se pudo cargar la KDM."
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/fa_IR.po b/src/wx/po/fa_IR.po
index 538a902aa..588405e00 100644
--- a/src/wx/po/fa_IR.po
+++ b/src/wx/po/fa_IR.po
@@ -1008,8 +1008,8 @@ msgstr "محتوا پلی نشد"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
-msgstr "نمیتوان دی سی پی (%n) را خواند"
+msgid "Could not read DCP (%error)"
+msgstr "نمیتوان دی سی پی (%error) را خواند"
 
 #: src/wx/gl_video_view.cc:131
 #, c-format
diff --git a/src/wx/po/fr_FR.po b/src/wx/po/fr_FR.po
index 01a1eadc3..3d5e04722 100644
--- a/src/wx/po/fr_FR.po
+++ b/src/wx/po/fr_FR.po
@@ -1018,8 +1018,8 @@ msgstr "Impossible de lire le contenu"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
-msgstr "Impossible de lire le DCP (%n)"
+msgid "Could not read DCP (%error)"
+msgstr "Impossible de lire le DCP (%error)"
 
 #: src/wx/gl_video_view.cc:131
 #, c-format
diff --git a/src/wx/po/hu_HU.po b/src/wx/po/hu_HU.po
index 04813f2ef..6e592081b 100644
--- a/src/wx/po/hu_HU.po
+++ b/src/wx/po/hu_HU.po
@@ -988,7 +988,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr ""
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/it_IT.po b/src/wx/po/it_IT.po
index 95ef86c14..d1416332c 100644
--- a/src/wx/po/it_IT.po
+++ b/src/wx/po/it_IT.po
@@ -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
diff --git a/src/wx/po/ja_JP.po b/src/wx/po/ja_JP.po
index 50c2d3e8f..aa4144b60 100644
--- a/src/wx/po/ja_JP.po
+++ b/src/wx/po/ja_JP.po
@@ -1028,8 +1028,8 @@ msgstr "コンテンツを再生できませんでした"
 
 #: src/wx/verify_dcp_result_panel.cc:262
 #, 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
diff --git a/src/wx/po/ko_KR.po b/src/wx/po/ko_KR.po
index 08bcdea7e..d5d5fa76e 100644
--- a/src/wx/po/ko_KR.po
+++ b/src/wx/po/ko_KR.po
@@ -1022,8 +1022,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
diff --git a/src/wx/po/nl_NL.po b/src/wx/po/nl_NL.po
index 08b7f074c..4801aa01f 100644
--- a/src/wx/po/nl_NL.po
+++ b/src/wx/po/nl_NL.po
@@ -1017,8 +1017,8 @@ msgstr "Kan content niet afspelen"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
-msgstr "Kan DCP niet lezen (%n)"
+msgid "Could not read DCP (%error)"
+msgstr "Kan DCP niet lezen (%error)"
 
 #: src/wx/gl_video_view.cc:131
 #, c-format
diff --git a/src/wx/po/pl_PL.po b/src/wx/po/pl_PL.po
index 60ed0320d..33ca2714b 100644
--- a/src/wx/po/pl_PL.po
+++ b/src/wx/po/pl_PL.po
@@ -1040,7 +1040,7 @@ msgstr "Nie udało się załadować KDM"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Nie udało się odczytać DCP: %s"
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/pt_BR.po b/src/wx/po/pt_BR.po
index 2527dd24d..dc7942ced 100644
--- a/src/wx/po/pt_BR.po
+++ b/src/wx/po/pt_BR.po
@@ -1040,7 +1040,7 @@ msgstr "Não foi possível carregar o KDM."
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Não foi possível carregar o KDM."
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/pt_PT.po b/src/wx/po/pt_PT.po
index ed7868210..74ca514c6 100644
--- a/src/wx/po/pt_PT.po
+++ b/src/wx/po/pt_PT.po
@@ -1036,7 +1036,7 @@ msgstr "Não foi possível carregar a 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 "Não foi possível carregar a KDM (%s)"
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/ru_RU.po b/src/wx/po/ru_RU.po
index 73c4b81af..9172b3d5c 100644
--- a/src/wx/po/ru_RU.po
+++ b/src/wx/po/ru_RU.po
@@ -1010,8 +1010,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
diff --git a/src/wx/po/sk_SK.po b/src/wx/po/sk_SK.po
index 3d9868703..52f310abb 100644
--- a/src/wx/po/sk_SK.po
+++ b/src/wx/po/sk_SK.po
@@ -1041,7 +1041,7 @@ msgstr "Nemôžem načítať 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 "Nemôžem načítať kDM (%s)"
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/sl_SI.po b/src/wx/po/sl_SI.po
index dc28fdeb8..ce9fa9cf4 100644
--- a/src/wx/po/sl_SI.po
+++ b/src/wx/po/sl_SI.po
@@ -1019,7 +1019,7 @@ msgstr "Vsebine ni mogoče predvajati"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Ni bilo mogoče prebrati DCP: %s"
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/sv_SE.po b/src/wx/po/sv_SE.po
index fba154498..a5d407d2f 100644
--- a/src/wx/po/sv_SE.po
+++ b/src/wx/po/sv_SE.po
@@ -1035,7 +1035,7 @@ msgstr "Kunde inte ladda KDM"
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Kunde inte ladda DCP: %s"
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/tr_TR.po b/src/wx/po/tr_TR.po
index 82dca6b59..d891bb2a9 100644
--- a/src/wx/po/tr_TR.po
+++ b/src/wx/po/tr_TR.po
@@ -987,7 +987,7 @@ msgstr ""
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr ""
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/uk_UA.po b/src/wx/po/uk_UA.po
index f09198433..bc0eb0e34 100644
--- a/src/wx/po/uk_UA.po
+++ b/src/wx/po/uk_UA.po
@@ -1038,7 +1038,7 @@ msgstr "Не вдалося завантажити KDM."
 
 #: src/wx/verify_dcp_result_panel.cc:271
 #, fuzzy, c-format
-msgid "Could not read DCP (%n)"
+msgid "Could not read DCP (%error)"
 msgstr "Не вдалося завантажити KDM."
 
 #: src/wx/gl_video_view.cc:131
diff --git a/src/wx/po/zh_CN.po b/src/wx/po/zh_CN.po
index ee6c91f41..faa7d7837 100644
--- a/src/wx/po/zh_CN.po
+++ b/src/wx/po/zh_CN.po
@@ -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
diff --git a/src/wx/verify_dcp_result_panel.cc b/src/wx/verify_dcp_result_panel.cc
index 2485750f6..bc4998e41 100644
--- a/src/wx/verify_dcp_result_panel.cc
+++ b/src/wx/verify_dcp_result_panel.cc
@@ -227,6 +227,9 @@ VerifyDCPResultPanel::add(shared_ptr<const VerifyDCPJob> job, bool many)
 				message.Replace(char_to_wx("%frame_rate"), std_to_wx(fmt::to_string(frame_rate->as_float())));
 			}
 		}
+		if (auto const error = note.error()) {
+			message.Replace(char_to_wx("%error"), std_to_wx(*error));
+		}
 		return message;
 	};
 
@@ -268,7 +271,7 @@ VerifyDCPResultPanel::add(shared_ptr<const VerifyDCPJob> job, bool many)
 	for (auto const& i: notes_by_code) {
 		switch (i.first) {
 		case dcp::VerificationNote::Code::FAILED_READ:
-			add(i.second, _("Could not read DCP (%n)"));
+			add(i.second, _("Could not read DCP (%error)"));
 			break;
 		case dcp::VerificationNote::Code::MISMATCHED_CPL_HASHES:
 			add(i.second, _("The hash (%reference_hash) of the CPL %cpl in the PKL does not agree with the CPL file (%calculated_hash).  This probably means that the CPL file is corrupt."));